Moved notify when L$ spent from Preferences > General to Preferences > Popups

5 files changed, 23 insertions, 14 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b4a480d..357710f 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,13 @@
 2009-12-31 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Moved notify when L$ spent from Preferences > General to Preferences > Popups.
+          
+          modified:   linden/indra/newview/llpanelgeneral.cpp
+          modified:   linden/indra/newview/llpanelmsgs.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
+
+
         * Added preferences option to use legacy pie menu layout.
         
           new file:   linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_attachment.xml
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 5664f03..3e2a048 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -67,7 +67,6 @@ BOOL LLPanelGeneral::postBuild()
         childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
         childSetValue("mini_map_notify_chat", gSavedSettings.getBOOL("MiniMapNotifyChatRange"));
         childSetValue("mini_map_notify_sim", gSavedSettings.getBOOL("MiniMapNotifySimRange"));
-        childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
 
         getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor"));
 
@@ -132,7 +131,6 @@ void LLPanelGeneral::apply()
         gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
         gSavedSettings.setBOOL("MiniMapNotifyChatRange", childGetValue("mini_map_notify_chat"));
         gSavedSettings.setBOOL("MiniMapNotifySimRange", childGetValue("mini_map_notify_sim"));
-        gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
         gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
         gSavedSettings.setF32("UIScaleFactor", childGetValue("ui_scale_slider").asReal());
         gSavedSettings.setBOOL("UIAutoScale", childGetValue("ui_auto_scale"));
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index e0b1052..006f536 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -65,6 +65,8 @@ BOOL LLPanelMsgs::postBuild()
         childSetValue("show_new_inventory", gSavedSettings.getBOOL("ShowNewInventory"));
         childSetValue("show_in_inventory", gSavedSettings.getBOOL("ShowInInventory"));
 
+        childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
+
         return TRUE;
 }
 
@@ -154,6 +156,7 @@ void LLPanelMsgs::apply()
         gSavedSettings.setBOOL("AutoAcceptNewInventory", childGetValue("accept_new_inventory"));
         gSavedSettings.setBOOL("ShowNewInventory", childGetValue("show_new_inventory"));
         gSavedSettings.setBOOL("ShowInInventory", childGetValue("show_in_inventory"));
+        gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
 }
 
 void LLPanelMsgs::cancel()
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index dba8007..263a9e9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -88,7 +88,7 @@
              label="Away Timeout:" label_width="141" left="10" max_val="600"
              min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+       bottom_delta="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
        font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
        mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
     Mini-map notify:
@@ -103,24 +103,19 @@
        label="Entering sim" left="330"
        mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
        width="256" />
-        <check_box bottom="-304" enabled="true"
-             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-             label="Notify when Linden dollars (L$) spent or received" left="151"
-             mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
-             width="256" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-322" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
              mouse_opaque="true" name="maturity_desired_label" v_pad="0" width="394">
                  Rating:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-322" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="151"
              mouse_opaque="true" name="maturity_desired_prompt" v_pad="0" width="394">
                  I want to access content rated:
         </text>
-        <combo_box bottom="-328" follows="left|top" height="18" left="315"
+        <combo_box bottom="-318" follows="left|top" height="18" left="315"
              mouse_opaque="true" name="maturity_desired_combobox" width="150" control_name="PreferredMaturity">
                 <combo_item name="Desired_Adult" value="42">
                         PG, Mature and Adult
@@ -133,7 +128,7 @@
                 </combo_item>
         </combo_box>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-322" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-312" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="315"
              mouse_opaque="true" name="maturity_desired_textbox" v_pad="0" width="150">
                  PG only
@@ -163,7 +158,7 @@
                 seconds
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-362" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="18" left="10"
              mouse_opaque="true" name="crash_report_textbox" v_pad="0" width="394">
                 Crash reports:
@@ -184,7 +179,7 @@
         <string name="region_name_prompt">
                 &lt;Type region name&gt;
         </string>
-        <combo_box allow_text_entry="false" bottom="-362" enabled="true" follows="left|top"
+        <combo_box allow_text_entry="false" bottom="-352" enabled="true" follows="left|top"
              height="18" left="153" max_chars="20" mouse_opaque="true"
              name="crash_behavior_combobox" width="146">
                 <combo_item type="string" length="1" enabled="true" name="Askbeforesending" value="Ask before sending">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
index cd98623..d724256 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
@@ -39,4 +39,9 @@
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Automatically show newly accepted objects in inventory" left="18" mouse_opaque="true"
              name="show_in_inventory" radio_style="false" width="270" />
+  <check_box bottom_delta="-30" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       label="Notify when Linden dollars (L$) spent or received" left="15"
+       mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
+       width="256" />
 </panel>