SL-14224 RelWithDebInfo viewer stops with 'assert' when disabling atmospheric shader

2 files changed, 15 insertions, 1 deletions

diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index c65431d6f6..625543b814 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -143,6 +143,20 @@ static bool handleSetShaderChanged(const LLSD& newvalue)
 	gBumpImageList.destroyGL();
 	gBumpImageList.restoreGL();
 
+    if (gPipeline.isInit())
+    {
+        // ALM depends onto atmospheric shaders, state might have changed
+        bool old_state = LLPipeline::sRenderDeferred;
+        LLPipeline::refreshCachedSettings();
+        gPipeline.updateRenderDeferred();
+        if (old_state != LLPipeline::sRenderDeferred)
+        {
+            gPipeline.releaseGLBuffers();
+            gPipeline.createGLBuffers();
+            gPipeline.resetVertexBuffers();
+        }
+    }
+
 	// else, leave terrain detail as is
 	LLViewerShaderMgr::instance()->setShaders();
 	return true;
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index f108d96320..1a21cfd7db 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -457,8 +457,8 @@ void LLViewerShaderMgr::setShaders()
     bool canRenderDeferred       = LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred");
     bool hasWindLightShaders     = LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders");
     S32 shadow_detail            = gSavedSettings.getS32("RenderShadowDetail");
-    bool useRenderDeferred       = canRenderDeferred && gSavedSettings.getBOOL("RenderDeferred") && gSavedSettings.getBOOL("RenderAvatarVP");
     bool doingWindLight          = hasWindLightShaders && gSavedSettings.getBOOL("WindLightUseAtmosShaders");
+    bool useRenderDeferred       = doingWindLight && canRenderDeferred && gSavedSettings.getBOOL("RenderDeferred") && gSavedSettings.getBOOL("RenderAvatarVP");
 
     //using shaders, disable fixed function
     LLGLSLShader::sNoFixedFunction = true;