diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-23 12:49:36 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-23 12:49:36 -0500 |
| commit | fb605a047aa1c6b293b9546a06ac800c53d109ba (patch) | |
| tree | 0063de5c095672da6ecd4eaf4c8302d238ac0201 /indra/newview/llpanelsnapshot.cpp | |
| parent | d7d779f8aa841b5550d4049dd65c097a3c267f3d (diff) | |
| parent | 4cb3634932fe8175fb878894cce584bfb8bba8c6 (diff) | |
merge changes for vmrg-192
Diffstat (limited to 'indra/newview/llpanelsnapshot.cpp')
| -rw-r--r-- | indra/newview/llpanelsnapshot.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/indra/newview/llpanelsnapshot.cpp b/indra/newview/llpanelsnapshot.cpp index 90e32f973f..2f29e758c6 100644 --- a/indra/newview/llpanelsnapshot.cpp +++ b/indra/newview/llpanelsnapshot.cpp @@ -124,15 +124,11 @@ LLSideTrayPanelContainer* LLPanelSnapshot::getParentContainer() // 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()); - S32 selected_idx = combo->getFirstSelectedIndex(); - const bool enable = selected_idx == (combo->getItemCount() - 1); // Current Window or Custom selected - - getChild<LLUICtrl>(getWidthSpinnerName())->setEnabled(enable); - getChild<LLSpinCtrl>(getWidthSpinnerName())->setAllowEdit(enable); - getChild<LLUICtrl>(getHeightSpinnerName())->setEnabled(enable); - getChild<LLSpinCtrl>(getHeightSpinnerName())->setAllowEdit(enable); - enableAspectRatioCheckbox(enable); + const bool show = combo->getFirstSelectedIndex() == (combo->getItemCount() - 1); + getChild<LLUICtrl>(getImageSizePanelName())->setVisible(show); } void LLPanelSnapshot::updateImageQualityLevel() |