aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelmsgs.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-04-26 20:06:23 -0700
committerMcCabe Maxsted2010-04-26 20:06:23 -0700
commite563e2c2cc66fa9f3b47c4814d70f9800d957026 (patch)
treea2a9ca5bfeaf747b76b744f007da061ad15110c2 /linden/indra/newview/llpanelmsgs.cpp
parentMerge commit 'jacek/next' into next (diff)
downloadmeta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.zip
meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.gz
meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.bz2
meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.xz
Ported currency changes from Hippo (#237) and fixed some labels Hippo missed (also fixed #200 in the process)
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpanelmsgs.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index 42af550..3ea7aa5 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -40,6 +40,8 @@
40#include "lluictrlfactory.h" 40#include "lluictrlfactory.h"
41#include "llfirstuse.h" 41#include "llfirstuse.h"
42 42
43#include "hippoGridManager.h"
44
43//----------------------------------------------------------------------------- 45//-----------------------------------------------------------------------------
44LLPanelMsgs::LLPanelMsgs() : 46LLPanelMsgs::LLPanelMsgs() :
45 LLPanel("Messages Panel") 47 LLPanel("Messages Panel")
@@ -66,6 +68,7 @@ BOOL LLPanelMsgs::postBuild()
66 childSetValue("show_in_inventory", gSavedSettings.getBOOL("ShowInInventory")); 68 childSetValue("show_in_inventory", gSavedSettings.getBOOL("ShowInInventory"));
67 69
68 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());
69 72
70 return TRUE; 73 return TRUE;
71} 74}