Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 19 insertions, 2 deletions

diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index 035b43f..7d88cf9 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -319,6 +319,9 @@ BOOL LLPanelDisplay::postBuild()
         mLightingText = getChild<LLTextBox>("LightingDetailText");
         mMeshDetailText = getChild<LLTextBox>("MeshDetailText");
 
+        childSetValue("toggle_windlight_control", gSavedSettings.getBOOL("EnableWindlightRemote"));
+        mWLControl = gSavedSettings.getBOOL("EnableWindlightRemote");
+
         refresh();
 
         return TRUE;
@@ -476,7 +479,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)
@@ -491,7 +499,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"));
@@ -691,6 +704,8 @@ void LLPanelDisplay::cancel()
         gSavedSettings.setU32("WLSkyDetail", mSkyLOD);
         gSavedSettings.setS32("RenderMaxPartCount", mParticleCount);
         gSavedSettings.setS32("RenderGlowResolutionPow", mPostProcess);
+
+        gSavedSettings.setBOOL("EnableWindlightRemote", mWLControl);
 }
 
 void LLPanelDisplay::apply()
@@ -702,6 +717,8 @@ void LLPanelDisplay::apply()
         {
                 applyWindowSize();
         }
+
+        gSavedSettings.setBOOL("EnableWindlightRemote", childGetValue("toggle_windlight_control").asBoolean());
 }
 
 void LLPanelDisplay::onChangeQuality(LLUICtrl *ctrl, void *data)