From e5d0135158bb2383e2738ed9f1335630715ef8a9 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Thu, 17 Feb 2011 01:07:36 +0100 Subject: [PATCH] Snapshot currency whoopsie --- LICENSES/c-ares.txt | 11 ----------- LICENSES/curl.txt | 21 --------------------- indra/newview/llfloatersnapshot.cpp | 19 ++++++++++++++++++- 3 files changed, 18 insertions(+), 33 deletions(-) delete mode 100644 LICENSES/c-ares.txt delete mode 100644 LICENSES/curl.txt diff --git a/LICENSES/c-ares.txt b/LICENSES/c-ares.txt deleted file mode 100644 index 136107bd6..000000000 --- a/LICENSES/c-ares.txt +++ /dev/null @@ -1,11 +0,0 @@ -Copyright 1998 by the Massachusetts Institute of Technology. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, provided that -the above copyright notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting documentation, and that -the name of M.I.T. not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior permission. -M.I.T. makes no representations about the suitability of this software for any -purpose. It is provided "as is" without express or implied warranty. - diff --git a/LICENSES/curl.txt b/LICENSES/curl.txt deleted file mode 100644 index 163b299ae..000000000 --- a/LICENSES/curl.txt +++ /dev/null @@ -1,21 +0,0 @@ -COPYRIGHT AND PERMISSION NOTICE - -Copyright (c) 1996 - 2010, Daniel Stenberg, . - -All rights reserved. - -Permission to use, copy, modify, and distribute this software for any purpose -with or without fee is hereby granted, provided that the above copyright -notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN -NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE -OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of a copyright holder shall not -be used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization of the copyright holder. diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 99ab752f2..58c8e517f 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1238,7 +1238,24 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater) floater->childSetLabelArg("upload_btn", "[UPLOADFEE]", fee); LLRadioGroup* snapshot_type_radio = floater->getChild("snapshot_type_radio"); - snapshot_type_radio->setSelectedIndex(gSavedSettings.getS32("LastSnapshotType")); + if (snapshot_type_radio) + { + snapshot_type_radio->setSelectedIndex(gSavedSettings.getS32("LastSnapshotType")); + + 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); + } + } + } + } LLSnapshotLivePreview::ESnapshotType shot_type = getTypeIndex(floater); ESnapshotFormat shot_format = (ESnapshotFormat)gSavedSettings.getS32("SnapshotFormat"); //getFormatIndex(floater); LLViewerWindow::ESnapshotType layer_type = getLayerType(floater); LLViewerWindow::ESnapshotType layer_type = getLayerType(floater);