From 009449126a350f60dd90da9879247ceacb99936f Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 31 Jan 2014 12:08:23 -0800
Subject: [PATCH] ACME-1296 : Remove Filters from Advanced Snapshot panel
---
indra/newview/llfloatersnapshot.cpp | 18 +++++++++---------
.../skins/default/xui/en/floater_snapshot.xml | 14 ++++++++++++++
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 1a569e41cd9..1d52ac5a693 100755
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -479,8 +479,8 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
previewp->setSnapshotFormat(shot_format);
previewp->setSnapshotBufferType(layer_type);
// Filters
- const std::string& filter_name = floater->getChild<LLComboBox>("filters_combobox")->getSimple();
- previewp->setFilter(filter_name);
+ //const std::string& filter_name = floater->getChild<LLComboBox>("filters_combobox")->getSimple();
+ //previewp->setFilter(filter_name);
}
LLPanelSnapshot* current_panel = Impl::getActivePanel(floater);
@@ -1079,13 +1079,13 @@ BOOL LLFloaterSnapshot::postBuild()
childSetCommitCallback("auto_snapshot_check", Impl::onClickAutoSnap, this);
// Update filter list
- std::vector<std::string> filter_list = LLImageFiltersManager::getInstance()->getFiltersList();
- LLComboBox* filterbox = getChild<LLComboBox>("filters_combobox");
- for (U32 i = 0; i < filter_list.size(); i++)
- {
- filterbox->add(filter_list[i]);
- }
- childSetCommitCallback("filters_combobox", Impl::onClickFilter, this);
+ //std::vector<std::string> filter_list = LLImageFiltersManager::getInstance()->getFiltersList();
+ //LLComboBox* filterbox = getChild<LLComboBox>("filters_combobox");
+ //for (U32 i = 0; i < filter_list.size(); i++)
+ //{
+ // filterbox->add(filter_list[i]);
+ //}
+ //childSetCommitCallback("filters_combobox", Impl::onClickFilter, this);
LLWebProfile::setImageUploadResultCallback(boost::bind(&LLFloaterSnapshot::Impl::onSnapshotUploadFinished, _1));
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index 705225b839f..5e3c7d4e3d7 100755
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -381,6 +381,19 @@
top_pad="8"
width="180"
name="auto_snapshot_check" />
+ <!-- If we ever want to add filters to the snapshot panel...
+ <text
+ type="string"
+ length="1"
+ follows="left|top"
+ height="13"
+ layout="topleft"
+ left="10"
+ name="layer_type_label"
+ top_pad="10"
+ width="50">
+ Filter:
+ </text>
<combo_box
control_name="PhotoFilters"
follows="left|right|top"
@@ -395,5 +408,6 @@
name="NoFilter"
value="NoFilter" />
</combo_box>
+ -->
</panel>
</floater>
--
GitLab