diff options
| author | Rye <rye@lindenlab.com> | 2024-10-31 21:37:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-31 21:37:47 -0400 |
| commit | 6aa18dc532f6b56dd9b6872553fa9ecb3bf0ca55 (patch) | |
| tree | faad43b153a40ef0a4429883b235ce189604e773 /indra/newview/llviewershadermgr.cpp | |
| parent | af671c5ce8b8d9c02f8acb9137ff99e8867ec66e (diff) | |
| parent | 20fc24d66564674c74b5d4ac30887af10cf9a8cd (diff) | |
Merge pull request #2983 from secondlife/rye/minor-fixes
Various minor crash and correctness fixes
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index a6d397c039..c219b0575e 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -985,7 +985,10 @@ bool LLViewerShaderMgr::loadShadersWater() return loadShadersWater(); } - LLWorld::getInstance()->updateWaterObjects(); + if (LLWorld::instanceExists()) + { + LLWorld::getInstance()->updateWaterObjects(); + } return true; } |