Fixed #1011: chat range options aren't saved in prefs > notifications

2 files changed, 6 insertions, 5 deletions

diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index ac957ed..9c5e993 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -99,9 +99,6 @@ BOOL LLPanelGeneral::postBuild()
         childSetValue("afk_timeout_checkbox", gSavedSettings.getBOOL("AllowIdleAFK"));
         childSetCommitCallback("afk_timeout_checkbox", onCommitAFKCheckbox, this);
 
-        childSetValue("mini_map_notify_chat", gSavedSettings.getBOOL("MiniMapNotifyChatRange"));
-        childSetValue("mini_map_notify_sim", gSavedSettings.getBOOL("MiniMapNotifySimRange"));
-
 //      mDisplayNamesUsage =  gSavedSettings.getU32("DisplayNamesUsage");
 //      mLegacyNamesForFriends =  gSavedSettings.getBOOL("LegacyNamesForFriends");
 
@@ -168,8 +165,6 @@ void LLPanelGeneral::apply()
         //gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox")); -- MC
         gSavedSettings.setF32("AFKTimeout", 60 * childGetValue("afk_timeout_spinner").asReal()); // User enters minutes, we store as seconds -- MC
         gSavedSettings.setBOOL("AllowIdleAFK", childGetValue("afk_timeout_checkbox"));
-        gSavedSettings.setBOOL("MiniMapNotifyChatRange", childGetValue("mini_map_notify_chat"));
-        gSavedSettings.setBOOL("MiniMapNotifySimRange", childGetValue("mini_map_notify_sim"));
         gSavedSettings.setString("Language", childGetValue("language_combobox"));
 
         /*
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index 572bcc3..ad8de87 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -72,6 +72,9 @@ BOOL LLPanelMsgs::postBuild()
 
         childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
 
+        childSetValue("mini_map_notify_chat", gSavedSettings.getBOOL("MiniMapNotifyChatRange"));
+        childSetValue("mini_map_notify_sim", gSavedSettings.getBOOL("MiniMapNotifySimRange"));
+
         return TRUE;
 }
 
@@ -170,6 +173,9 @@ void LLPanelMsgs::apply()
         gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
 
         gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
+
+        gSavedSettings.setBOOL("MiniMapNotifyChatRange", childGetValue("mini_map_notify_chat"));
+        gSavedSettings.setBOOL("MiniMapNotifySimRange", childGetValue("mini_map_notify_sim"));
 }
 
 void LLPanelMsgs::cancel()