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/llfloatersnapshot.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'linden/indra/newview/llfloatersnapshot.cpp') diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp index b4f2cc2..f67340e 100644 --- a/linden/indra/newview/llfloatersnapshot.cpp +++ b/linden/indra/newview/llfloatersnapshot.cpp @@ -77,6 +77,8 @@ #include "llvfile.h" #include "llvfs.h" +#include "hippoGridManager.h" + ///---------------------------------------------------------------------------- /// Local function declarations, constants, enums, and typedefs ///---------------------------------------------------------------------------- @@ -1256,6 +1258,21 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater) floater->getChild("local_size_combo")->selectNthItem(gSavedSettings.getS32("SnapshotLocalLastResolution")); floater->getChild("local_format_combo")->selectNthItem(gSavedSettings.getS32("SnapshotFormat")); + std::string fee = gHippoGridManager->getConnectedGrid()->getUploadFee(); + floater->childSetLabelArg("upload_btn", "[UPLOADFEE]", fee); + + if (snapshot_type_radio) { + const child_list_t *childs = snapshot_type_radio->getChildList(); + if (childs) { + child_list_t::const_iterator it, end=childs->end(); + for (it=childs->begin(); it!=end; ++it) { + LLRadioCtrl *ctrl = dynamic_cast(*it); + if (ctrl && (ctrl->getName() == "texture")) + ctrl->setLabelArg("[UPLOADFEE]", fee); + } + } + } + floater->childSetVisible("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE); floater->childSetVisible("send_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD); floater->childSetVisible("save_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL); -- cgit v1.1