From 3b26508428539bf65629b3f7b1c9844fec0b6d23 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 18 Feb 2010 22:59:49 -0600
Subject: Fixed #197: Windlight toolbar can't be hidden.

---
 linden/indra/newview/llpaneldisplay.cpp                               | 4 ++--
 .../newview/skins/default/xui/en-us/panel_preferences_graphics1.xml   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index 7d88cf9..cbf6052 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -411,6 +411,8 @@ void LLPanelDisplay::refresh()
 	mLightingDetail = gSavedSettings.getS32("RenderLightingDetail");
 	mTerrainDetail =  gSavedSettings.getS32("RenderTerrainDetail");
 
+	mWLControl = gSavedSettings.getBOOL("EnableWindlightRemote");
+
 	// slider text boxes
 	updateSliderText(mCtrlLODFactor, mLODFactorText);
 	updateSliderText(mCtrlFlexFactor, mFlexFactorText);
@@ -717,8 +719,6 @@ void LLPanelDisplay::apply()
 	{
 		applyWindowSize();
 	}
-
-	gSavedSettings.setBOOL("EnableWindlightRemote", childGetValue("toggle_windlight_control").asBoolean());
 }
 
 void LLPanelDisplay::onChangeQuality(LLUICtrl *ctrl, void *data)
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index c663ae2..e2bc084 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -11,7 +11,8 @@
   <check_box bottom_delta="0" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
        label="Show WindLight toolbar" left="275" mouse_opaque="true"
-	     name="toggle_windlight_control" radio_style="false" width="237" />
+	     name="toggle_windlight_control" radio_style="false" width="237"
+	     control_name="EnableWindlightRemote" />
 	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
 	     embedded_items="false" enabled="false" follows="left|top"
 	     font="SansSerifSmall" height="20" hide_border="true"
-- 
cgit v1.1