From c8390cbef5170142a81b91d503c6ce6688e5209c Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 31 Dec 2009 02:20:30 -0700 Subject: Moved notify when L$ spent from Preferences > General to Preferences > Popups --- ChangeLog.txt | 8 ++++++++ linden/indra/newview/llpanelgeneral.cpp | 2 -- linden/indra/newview/llpanelmsgs.cpp | 3 +++ .../default/xui/en-us/panel_preferences_general.xml | 19 +++++++------------ .../default/xui/en-us/panel_preferences_popups.xml | 5 +++++ 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 + * 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("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" /> 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" /> - Rating: I want to access content rated: - PG, Mature and Adult @@ -133,7 +128,7 @@ PG only @@ -163,7 +158,7 @@ seconds Crash reports: @@ -184,7 +179,7 @@ <Type region name> - 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" /> + -- cgit v1.1