diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-06 15:34:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-06 15:34:08 -0400 |
| commit | 129c2db2d258e3618dcff557c89e083e449d74d4 (patch) | |
| tree | 6040ec31e3f8e96be49b43481d83e99d2b9cdc35 /indra/newview/llpanelsnapshot.cpp | |
| parent | 41eb8eabc902788f9c9aece586555adcd43bde5b (diff) | |
| parent | 3dbbc49b4f535ee409c3a7c15b617c2997e80d8c (diff) | |
merge changes for STORM-2040
Diffstat (limited to 'indra/newview/llpanelsnapshot.cpp')
| -rwxr-xr-x | indra/newview/llpanelsnapshot.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/indra/newview/llpanelsnapshot.cpp b/indra/newview/llpanelsnapshot.cpp index 5924448671..56569e3207 100755 --- a/indra/newview/llpanelsnapshot.cpp +++ b/indra/newview/llpanelsnapshot.cpp @@ -65,8 +65,6 @@ void LLPanelSnapshot::onOpen(const LLSD& key) { LLFloaterSnapshot::getInstance()->notify(LLSD().with("image-format-change", true)); } - - updateCustomResControls(); } LLFloaterSnapshot::ESnapshotFormat LLPanelSnapshot::getImageFormat() const @@ -77,11 +75,6 @@ LLFloaterSnapshot::ESnapshotFormat LLPanelSnapshot::getImageFormat() const void LLPanelSnapshot::enableControls(BOOL enable) { setCtrlsEnabled(enable); - if (enable) - { - // Make sure only relevant controls are enabled/shown. - updateCustomResControls(); - } } LLSpinCtrl* LLPanelSnapshot::getWidthSpinner() @@ -121,16 +114,6 @@ LLSideTrayPanelContainer* LLPanelSnapshot::getParentContainer() return parent; } -// virtual -void LLPanelSnapshot::updateCustomResControls() -{ - // Only show width/height spinners and the aspect ratio checkbox - // when a custom resolution is chosen. - LLComboBox* combo = getChild<LLComboBox>(getImageSizeComboName()); - const bool show = combo->getFirstSelectedIndex() == (combo->getItemCount() - 1); - getChild<LLUICtrl>(getImageSizePanelName())->setVisible(show); -} - void LLPanelSnapshot::updateImageQualityLevel() { LLSliderCtrl* quality_slider = getChild<LLSliderCtrl>("image_quality_slider"); @@ -188,8 +171,6 @@ void LLPanelSnapshot::onCustomResolutionCommit() void LLPanelSnapshot::onResolutionComboCommit(LLUICtrl* ctrl) { - updateCustomResControls(); - LLSD info; info["combo-res-change"]["control-name"] = ctrl->getName(); LLFloaterSnapshot::getInstance()->notify(info); |