aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelmsgs.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-05-03 18:09:28 -0700
committerMcCabe Maxsted2011-05-04 15:21:09 -0700
commitcc8e7060dfb54900f1600965a78c6f6f9fc564c4 (patch)
tree9b23e53ace5696db2c78867582308f38cba19d71 /linden/indra/newview/llpanelmsgs.cpp
parentBackported crash fix in llhudeffectlookat from gpl'd viewer 2 (diff)
downloadmeta-impy-cc8e7060dfb54900f1600965a78c6f6f9fc564c4.zip
meta-impy-cc8e7060dfb54900f1600965a78c6f6f9fc564c4.tar.gz
meta-impy-cc8e7060dfb54900f1600965a78c6f6f9fc564c4.tar.bz2
meta-impy-cc8e7060dfb54900f1600965a78c6f6f9fc564c4.tar.xz
Besides the numerous label and organizational changes, here are the main points
* Moved numerous options out of the Advanced panel * Moved numerous options out of the General panel * Combined the Network and Web Browser panels * Combined IM, Chat, and Spell checking preferences * Combined 'Show timestamps in IMs' and 'Show timestamps in Local Chat' to one ShowTimestamps setting * Removed UI for 'hide my own group title'. This can still be set in the debug settings * Renamed Popups > Notifications * Renamed Chat Colors > Colors * Renamed 'IMs and Logging' to 'Logging and Privacy' * Moved Colors next to Skins * Added style guide to the top of every preferences panel xui
Diffstat (limited to 'linden/indra/newview/llpanelmsgs.cpp')
-rw-r--r--linden/indra/newview/llpanelmsgs.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index 9e04070..572bcc3 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -70,6 +70,8 @@ BOOL LLPanelMsgs::postBuild()
70 childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange")); 70 childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
71 childSetLabelArg("notify_money_change_checkbox", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol()); 71 childSetLabelArg("notify_money_change_checkbox", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
72 72
73 childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
74
73 return TRUE; 75 return TRUE;
74} 76}
75 77
@@ -166,6 +168,8 @@ void LLPanelMsgs::apply()
166 gSavedSettings.setBOOL("ShowNewInventory", childGetValue("show_new_inventory")); 168 gSavedSettings.setBOOL("ShowNewInventory", childGetValue("show_new_inventory"));
167 gSavedSettings.setBOOL("ShowInInventory", childGetValue("show_in_inventory")); 169 gSavedSettings.setBOOL("ShowInInventory", childGetValue("show_in_inventory"));
168 gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox")); 170 gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
171
172 gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
169} 173}
170 174
171void LLPanelMsgs::cancel() 175void LLPanelMsgs::cancel()