diff options
author | McCabe Maxsted | 2010-04-26 20:06:23 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-04-26 20:06:23 -0700 |
commit | e563e2c2cc66fa9f3b47c4814d70f9800d957026 (patch) | |
tree | a2a9ca5bfeaf747b76b744f007da061ad15110c2 /linden/indra/newview/llpanelaudioprefs.cpp | |
parent | Merge commit 'jacek/next' into next (diff) | |
download | meta-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/llpanelaudioprefs.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp index 86ece1d..7ad8712 100644 --- a/linden/indra/newview/llpanelaudioprefs.cpp +++ b/linden/indra/newview/llpanelaudioprefs.cpp | |||
@@ -62,6 +62,8 @@ | |||
62 | #include "llviewerwindow.h" | 62 | #include "llviewerwindow.h" |
63 | #include "llviewercontrol.h" | 63 | #include "llviewercontrol.h" |
64 | 64 | ||
65 | #include "hippoGridManager.h" | ||
66 | |||
65 | // | 67 | // |
66 | // Static functions | 68 | // Static functions |
67 | // | 69 | // |
@@ -88,6 +90,8 @@ LLPanelAudioPrefs::~LLPanelAudioPrefs() | |||
88 | BOOL LLPanelAudioPrefs::postBuild() | 90 | BOOL LLPanelAudioPrefs::postBuild() |
89 | { | 91 | { |
90 | refreshValues(); // initialize member data from saved settings | 92 | refreshValues(); // initialize member data from saved settings |
93 | childSetLabelArg("L$ Change Threshold", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol()); | ||
94 | |||
91 | return TRUE; | 95 | return TRUE; |
92 | } | 96 | } |
93 | 97 | ||