Fix crash observed during early startup during feature table resets on linux due to LLWorld simpleton not being initialized yet

RyeMutt · RyeMutt · commit 60a4033f13e5 · 2025-10-24T01:38:58.000-04:00
Signed-off-by: Rye &lt;rye@alchemyviewer.org&gt;
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
@@ -1002,7 +1002,10 @@ bool LLViewerShaderMgr::loadShadersWater()
         return loadShadersWater();
     }
 
-    LLWorld::getInstance()->updateWaterObjects();
+    if (LLWorld::instanceExists())
+    {
+        LLWorld::getInstance()->updateWaterObjects();
+    }
 
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -1002,7 +1002,10 @@ bool LLViewerShaderMgr::loadShadersWater()`
`1002`	`1002`	`return loadShadersWater();`
`1003`	`1003`	`}`
`1004`	`1004`
`1005`		`- LLWorld::getInstance()->updateWaterObjects();`
	`1005`	`+ if (LLWorld::instanceExists())`
	`1006`	`+ {`
	`1007`	`+ LLWorld::getInstance()->updateWaterObjects();`
	`1008`	`+ }`
`1006`	`1009`
`1007`	`1010`	`return true;`
`1008`	`1011`	`}`