Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.

Made a few non-functional changes to help it apply.

1 files changed, 12 insertions, 2 deletions

diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index d510775..14e295c 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -475,7 +475,12 @@ void LLPanelDisplay::refreshEnabledState()
         }
 
         // Vertex Shaders
-        mCtrlShaderEnable->setEnabled(LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"));
+//      mCtrlShaderEnable->setEnabled(LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"));
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0a
+        // "Basic Shaders" can't be disabled - but can be enabled - under @setenv=n
+        bool fCtrlShaderEnable = LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable");
+        mCtrlShaderEnable->setEnabled(fCtrlShaderEnable && (!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV) || !mShaderEnable));
+// [/RLVa:KB]
 
         BOOL shaders = mCtrlShaderEnable->get();
         if (shaders)
@@ -490,7 +495,12 @@ void LLPanelDisplay::refreshEnabledState()
 
         // *HACK just checks to see if we can use shaders... 
         // maybe some cards that use shaders, but don't support windlight
-        mCtrlWindLight->setEnabled(mCtrlShaderEnable->getEnabled() && shaders);
+//      mCtrlWindLight->setEnabled(mCtrlShaderEnable->getEnabled() && shaders);
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0a
+        // "Atmospheric Shaders" can't be disabled - but can be enabled - under @setenv=n
+        bool fCtrlWindLightEnable = fCtrlShaderEnable && shaders;
+        mCtrlWindLight->setEnabled(fCtrlWindLightEnable && (!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV) || !mWindLight));
+// [/RLVa:KB]
 
         // turn off sky detail if atmostpherics isn't on
         mCtrlSkyFactor->setEnabled(gSavedSettings.getBOOL("WindLightUseAtmosShaders"));