Grid currency, partial

2011-02-11 19:56:30 +01:00
parent 1919c00f2d
commit d97f87b05f
82 changed files with 1164 additions and 1130 deletions
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -62,6 +62,8 @@
 #include "llviewercontrol.h"
 // </edit>

+#include "hippogridmanager.h"
+
 //static
 S32 LLFloaterImagePreview::sUploadAmount = 10;

@@ -107,7 +109,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)