aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatersnapshot.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloatersnapshot.cpp')
-rw-r--r--linden/indra/newview/llfloatersnapshot.cpp17
1 files changed, 17 insertions, 0 deletions
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 @@
77#include "llvfile.h" 77#include "llvfile.h"
78#include "llvfs.h" 78#include "llvfs.h"
79 79
80#include "hippoGridManager.h"
81
80///---------------------------------------------------------------------------- 82///----------------------------------------------------------------------------
81/// Local function declarations, constants, enums, and typedefs 83/// Local function declarations, constants, enums, and typedefs
82///---------------------------------------------------------------------------- 84///----------------------------------------------------------------------------
@@ -1256,6 +1258,21 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
1256 floater->getChild<LLComboBox>("local_size_combo")->selectNthItem(gSavedSettings.getS32("SnapshotLocalLastResolution")); 1258 floater->getChild<LLComboBox>("local_size_combo")->selectNthItem(gSavedSettings.getS32("SnapshotLocalLastResolution"));
1257 floater->getChild<LLComboBox>("local_format_combo")->selectNthItem(gSavedSettings.getS32("SnapshotFormat")); 1259 floater->getChild<LLComboBox>("local_format_combo")->selectNthItem(gSavedSettings.getS32("SnapshotFormat"));
1258 1260
1261 std::string fee = gHippoGridManager->getConnectedGrid()->getUploadFee();
1262 floater->childSetLabelArg("upload_btn", "[UPLOADFEE]", fee);
1263
1264 if (snapshot_type_radio) {
1265 const child_list_t *childs = snapshot_type_radio->getChildList();
1266 if (childs) {
1267 child_list_t::const_iterator it, end=childs->end();
1268 for (it=childs->begin(); it!=end; ++it) {
1269 LLRadioCtrl *ctrl = dynamic_cast<LLRadioCtrl*>(*it);
1270 if (ctrl && (ctrl->getName() == "texture"))
1271 ctrl->setLabelArg("[UPLOADFEE]", fee);
1272 }
1273 }
1274 }
1275
1259 floater->childSetVisible("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE); 1276 floater->childSetVisible("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE);
1260 floater->childSetVisible("send_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD); 1277 floater->childSetVisible("send_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD);
1261 floater->childSetVisible("save_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL); 1278 floater->childSetVisible("save_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL);