diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-09-08 14:36:08 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-09-08 14:36:08 -0700 |
| commit | 873a72fdbad8bca29cf8129b318719c1af5f8e9d (patch) | |
| tree | cf4138d025faf4c697de287a4c9a441432c11e6c /indra/newview/llpanelsnapshotinventory.cpp | |
| parent | 4e84aa4ecfe3351463ca9c54df4477528f65e41f (diff) | |
| parent | eef4acc5367a486b0c52c6ce5e1aba995fefd99c (diff) | |
Merge with 3.7.15-release
Diffstat (limited to 'indra/newview/llpanelsnapshotinventory.cpp')
| -rwxr-xr-x | indra/newview/llpanelsnapshotinventory.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
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<LLSpinCtrl>(getWidthSpinnerName())->setAllowEdit(FALSE); getChild<LLSpinCtrl>(getHeightSpinnerName())->setAllowEdit(FALSE); - getChild<LLUICtrl>(getAspectRatioCBName())->setVisible(FALSE); // we don't keep aspect ratio for inventory textures return LLPanelSnapshot::postBuild(); } @@ -85,17 +83,6 @@ void LLPanelSnapshotInventory::onOpen(const LLSD& key) } // virtual -void LLPanelSnapshotInventory::updateCustomResControls() -{ - LLComboBox* combo = getChild<LLComboBox>(getImageSizeComboName()); - S32 selected_idx = combo->getFirstSelectedIndex(); - const bool show = selected_idx == (combo->getItemCount() - 1); // Custom selected - - getChild<LLUICtrl>(getWidthSpinnerName())->setVisible(show); - getChild<LLUICtrl>(getHeightSpinnerName())->setVisible(show); -} - -// virtual void LLPanelSnapshotInventory::updateControls(const LLSD& info) { const bool have_snapshot = info.has("have-snapshot") ? info["have-snapshot"].asBoolean() : true; |