Made the LightShare preference behave like the other preferences.

i.e. it only goes into effect if you press Apply/OK.

2 files changed, 6 insertions, 1 deletions

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 675a87f..7830c29 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -65,6 +65,8 @@ BOOL LLPrefsAdvanced::postBuild()
         childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
         childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
         childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic"));
+        childSetValue("lightshare_combo",
+                      LLSD((S32)gSavedSettings.getU32("LightShareAllowed")));
 
         LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
         crash_behavior_combobox->setCurrentByIndex(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING));
@@ -84,6 +86,9 @@ void LLPrefsAdvanced::apply()
         gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
         gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
         gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
+        gSavedSettings.setU32("LightShareAllowed",
+                              (U32)childGetValue("lightshare_combo").asInteger());
+
 
         // Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
         if (gSavedSettings.getBOOL("ShowMyClientTagToOthers") != (BOOL)childGetValue("client_name_tag_broadcast_check"))
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 1b463a2..de34ebd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -32,7 +32,7 @@
         follows="top|left">
     Allow region Windlight settings (LightShare):
   </text>
-  <combo_box name="lightshare_combo" control_name="LightShareAllowed"
+  <combo_box name="lightshare_combo"
              bottom_delta="-2" left="240" height="18" width="120"
              allow_text_entry="false" follows="left|top">
     <combo_item type="string" name="never" value="0">