From 69b02defca8bac1133f28cc8b476cbee064dbc95 Mon Sep 17 00:00:00 2001 From: NiranV Date: Sat, 26 Jul 2014 14:09:59 +0200 Subject: STORM-2040: Removed: Unnecessary code for hiding/showing "Constrain proportions" checkbox. It's either shown/hidden internally in each panel or is simply disabled/enabled depending on the resolution choice, it doesn't make any sense having this extra bit of code additionally hiding it. --- indra/newview/llpanelsnapshotinventory.cpp | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'indra/newview/llpanelsnapshotinventory.cpp') diff --git a/indra/newview/llpanelsnapshotinventory.cpp b/indra/newview/llpanelsnapshotinventory.cpp index 47e46a968f..c8a201a5c8 100755 --- a/indra/newview/llpanelsnapshotinventory.cpp +++ b/indra/newview/llpanelsnapshotinventory.cpp @@ -49,7 +49,6 @@ public: /*virtual*/ void onOpen(const LLSD& key); private: - /*virtual*/ void updateCustomResControls(); ///< Show/hide custom resolution controls (spinners and checkbox) /*virtual*/ std::string getWidthSpinnerName() const { return "inventory_snapshot_width"; } /*virtual*/ std::string getHeightSpinnerName() const { return "inventory_snapshot_height"; } /*virtual*/ std::string getAspectRatioCBName() const { return "inventory_keep_aspect_check"; } @@ -73,7 +72,6 @@ BOOL LLPanelSnapshotInventory::postBuild() { getChild(getWidthSpinnerName())->setAllowEdit(FALSE); getChild(getHeightSpinnerName())->setAllowEdit(FALSE); - getChild(getAspectRatioCBName())->setVisible(FALSE); // we don't keep aspect ratio for inventory textures return LLPanelSnapshot::postBuild(); } @@ -84,17 +82,6 @@ void LLPanelSnapshotInventory::onOpen(const LLSD& key) LLPanelSnapshot::onOpen(key); } -// virtual -void LLPanelSnapshotInventory::updateCustomResControls() -{ - LLComboBox* combo = getChild(getImageSizeComboName()); - S32 selected_idx = combo->getFirstSelectedIndex(); - const bool show = selected_idx == (combo->getItemCount() - 1); // Custom selected - - getChild(getWidthSpinnerName())->setVisible(show); - getChild(getHeightSpinnerName())->setVisible(show); -} - // virtual void LLPanelSnapshotInventory::updateControls(const LLSD& info) { -- cgit v1.3