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/llfloateranimpreview.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'linden/indra/newview/llfloateranimpreview.cpp') 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 @@ #include "pipeline.h" #include "lluictrlfactory.h" +#include "hippoGridManager.h" + S32 LLFloaterAnimPreview::sUploadAmount = 10; const S32 PREVIEW_BORDER_WIDTH = 2; @@ -162,7 +164,7 @@ BOOL LLFloaterAnimPreview::postBuild() childSetCommitCallback("name_form", onCommitName, this); - childSetLabelArg("ok_btn", "[AMOUNT]", llformat("%d",sUploadAmount)); + childSetLabelArg("ok_btn", "[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee()); childSetAction("ok_btn", onBtnOK, this); setDefaultBtn(); -- cgit v1.1