diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-21 15:27:45 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-21 15:27:45 -0500 |
| commit | b17c52d63ee159e071298ac0a8176a57a2e9b6de (patch) | |
| tree | 50ca9729e95773286496ba1d0c52a0a60ef7ab38 /indra/newview/llpanelsnapshotinventory.cpp | |
| parent | 6e2c76221e9cc933eb6f40e71af359c3cf6c2063 (diff) | |
| parent | d145cbf37100d50ac6fc15c6009cb496615ed7fb (diff) | |
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llpanelsnapshotinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelsnapshotinventory.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llpanelsnapshotinventory.cpp b/indra/newview/llpanelsnapshotinventory.cpp index 63ccbc1b02..aca0ee6700 100644 --- a/indra/newview/llpanelsnapshotinventory.cpp +++ b/indra/newview/llpanelsnapshotinventory.cpp @@ -70,6 +70,7 @@ LLPanelSnapshotInventory::LLPanelSnapshotInventory() // virtual BOOL LLPanelSnapshotInventory::postBuild() { + getChild<LLUICtrl>(getAspectRatioCBName())->setVisible(FALSE); // we don't keep aspect ratio for inventory textures return LLPanelSnapshot::postBuild(); } @@ -89,10 +90,10 @@ void LLPanelSnapshotInventory::updateCustomResControls() getChild<LLUICtrl>(getWidthSpinnerName())->setVisible(show); getChild<LLUICtrl>(getHeightSpinnerName())->setVisible(show); - getChild<LLUICtrl>(getAspectRatioCBName())->setVisible(show); - // enable controls if possible - LLPanelSnapshot::updateCustomResControls(); + // Editing gets often enable elsewhere in common snapshot panel code. Override that. + getChild<LLSpinCtrl>(getWidthSpinnerName())->setAllowEdit(FALSE); + getChild<LLSpinCtrl>(getHeightSpinnerName())->setAllowEdit(FALSE); } // virtual |