summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelsnapshot.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-11-21 15:27:45 -0500
committerOz Linden <oz@lindenlab.com>2011-11-21 15:27:45 -0500
commitb17c52d63ee159e071298ac0a8176a57a2e9b6de (patch)
tree50ca9729e95773286496ba1d0c52a0a60ef7ab38 /indra/newview/llpanelsnapshot.cpp
parent6e2c76221e9cc933eb6f40e71af359c3cf6c2063 (diff)
parentd145cbf37100d50ac6fc15c6009cb496615ed7fb (diff)
merge up to latest viewer-development
Diffstat (limited to 'indra/newview/llpanelsnapshot.cpp')
-rw-r--r--indra/newview/llpanelsnapshot.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llpanelsnapshot.cpp b/indra/newview/llpanelsnapshot.cpp
index fdae521ac5..90e32f973f 100644
--- a/indra/newview/llpanelsnapshot.cpp
+++ b/indra/newview/llpanelsnapshot.cpp
@@ -74,6 +74,16 @@ LLFloaterSnapshot::ESnapshotFormat LLPanelSnapshot::getImageFormat() const
return LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG;
}
+void LLPanelSnapshot::enableControls(BOOL enable)
+{
+ setCtrlsEnabled(enable);
+ if (enable)
+ {
+ // Make sure only relevant controls are enabled/shown.
+ updateCustomResControls();
+ }
+}
+
LLSpinCtrl* LLPanelSnapshot::getWidthSpinner()
{
return getChild<LLSpinCtrl>(getWidthSpinnerName());