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/llfloateranimpreview.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 'linden/indra/newview/llfloateranimpreview.cpp')
-rw-r--r-- | linden/indra/newview/llfloateranimpreview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp index 57ee161..a7d880e 100644 --- a/linden/indra/newview/llfloateranimpreview.cpp +++ b/linden/indra/newview/llfloateranimpreview.cpp | |||
@@ -67,6 +67,8 @@ | |||
67 | #include "pipeline.h" | 67 | #include "pipeline.h" |
68 | #include "lluictrlfactory.h" | 68 | #include "lluictrlfactory.h" |
69 | 69 | ||
70 | #include "hippoGridManager.h" | ||
71 | |||
70 | S32 LLFloaterAnimPreview::sUploadAmount = 10; | 72 | S32 LLFloaterAnimPreview::sUploadAmount = 10; |
71 | 73 | ||
72 | const S32 PREVIEW_BORDER_WIDTH = 2; | 74 | const S32 PREVIEW_BORDER_WIDTH = 2; |
@@ -162,7 +164,7 @@ BOOL LLFloaterAnimPreview::postBuild() | |||
162 | 164 | ||
163 | childSetCommitCallback("name_form", onCommitName, this); | 165 | childSetCommitCallback("name_form", onCommitName, this); |
164 | 166 | ||
165 | childSetLabelArg("ok_btn", "[AMOUNT]", llformat("%d",sUploadAmount)); | 167 | childSetLabelArg("ok_btn", "[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee()); |
166 | childSetAction("ok_btn", onBtnOK, this); | 168 | childSetAction("ok_btn", onBtnOK, this); |
167 | setDefaultBtn(); | 169 | setDefaultBtn(); |
168 | 170 | ||