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/llfloaterimagepreview.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/llfloaterimagepreview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp index 87d577d..9827a31 100644 --- a/linden/indra/newview/llfloaterimagepreview.cpp +++ b/linden/indra/newview/llfloaterimagepreview.cpp | |||
@@ -60,6 +60,8 @@ | |||
60 | #include "llstring.h" | 60 | #include "llstring.h" |
61 | #include "llviewercontrol.h" | 61 | #include "llviewercontrol.h" |
62 | 62 | ||
63 | #include "hippoGridManager.h" | ||
64 | |||
63 | //static | 65 | //static |
64 | S32 LLFloaterImagePreview::sUploadAmount = 10; | 66 | S32 LLFloaterImagePreview::sUploadAmount = 10; |
65 | 67 | ||
@@ -94,7 +96,7 @@ BOOL LLFloaterImagePreview::postBuild() | |||
94 | return FALSE; | 96 | return FALSE; |
95 | } | 97 | } |
96 | 98 | ||
97 | childSetLabelArg("ok_btn", "[AMOUNT]", llformat("%d",sUploadAmount)); | 99 | childSetLabelArg("ok_btn", "[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee()); |
98 | 100 | ||
99 | LLCtrlSelectionInterface* iface = childGetSelectionInterface("clothing_type_combo"); | 101 | LLCtrlSelectionInterface* iface = childGetSelectionInterface("clothing_type_combo"); |
100 | if (iface) | 102 | if (iface) |