Merge remote branch 'mccabe/1.2.0-next' into next

1 files changed, 11 insertions, 0 deletions

diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index 591b413..510e1df 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -41,6 +41,9 @@
 #include "llwlparammanager.h"
 #include "llviewercontrol.h"
 
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 class LLWindlightRemoteObserver : public LLWLPresetsObserver
 {
@@ -85,6 +88,14 @@ void LLWindlightRemoteCtrl::draw()
                 }
         }
 
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+        if (rlv_handler_t::isEnabled())
+        {
+                childSetEnabled("Environment", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
+                mPresetsCombo->setEnabled(!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
+        }
+// [/RLVA:KB]
+
         LLPanel::draw();
 }