diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-07 12:43:55 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-07 12:43:55 +0100 |
| commit | 51ad60d19d0795d84ed2754031d2b26551dc6fcc (patch) | |
| tree | c3921e7ae800255c1adab9665548b313a19fb14c /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 2c38be831487fdafe65e3302a8e88a57a48afb7c (diff) | |
| parent | bcd84433717e42ec8675009e1335caf915cc1a41 (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
| -rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 0648d99685..9cc775d427 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -985,6 +985,13 @@ void LLPanelPrimMediaControls::onClickZoom() void LLPanelPrimMediaControls::nextZoomLevel() { + LLViewerObject* objectp = getTargetObject(); + if(objectp && objectp->isHUDAttachment()) + { + // Never allow zooming on HUD attachments. + return; + } + int index = 0; while (index < kNumZoomLevels) { |