From e563e2c2cc66fa9f3b47c4814d70f9800d957026 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 26 Apr 2010 20:06:23 -0700 Subject: Ported currency changes from Hippo (#237) and fixed some labels Hippo missed (also fixed #200 in the process) --- linden/indra/newview/llfloaterimagepreview.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'linden/indra/newview/llfloaterimagepreview.cpp') 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 @@ #include "llstring.h" #include "llviewercontrol.h" +#include "hippoGridManager.h" + //static S32 LLFloaterImagePreview::sUploadAmount = 10; @@ -94,7 +96,7 @@ BOOL LLFloaterImagePreview::postBuild() return FALSE; } - childSetLabelArg("ok_btn", "[AMOUNT]", llformat("%d",sUploadAmount)); + childSetLabelArg("ok_btn", "[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee()); LLCtrlSelectionInterface* iface = childGetSelectionInterface("clothing_type_combo"); if (iface) -- cgit v1.1