Merge remote-tracking branch 'secondlife/release/2024.08-DeltaFPS' into 2024.08-DeltaFPS

1 files changed, 8 insertions, 1 deletions

diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index c98bd9b7e2..6b0fc4f5e8 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -2993,7 +2993,14 @@ bool LLViewerShaderMgr::loadShadersInterface()
         const U32 value_range = (1 << bit_depth) - 1;
         shader->addPermutation("TERRAIN_PAINT_PRECISION", llformat("%d", value_range));
         success = success && shader->createShader();
-        llassert(success);
+        //llassert(success);
+        if (!success)
+        {
+            LL_WARNS() << "Failed to create shader '" << shader->mName << "', disabling!" << LL_ENDL;
+            gSavedSettings.setBOOL("RenderCanUseTerrainBakeShaders", false);
+            // continue as if this shader never happened
+            success = true;
+        }
     }
 
     if (success)