diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-09 16:41:02 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-09 16:41:02 +0300 |
| commit | b5df08724acf103be44436db8cc5689275ba60d0 (patch) | |
| tree | 0924c4765c72675c42d369715f136ee286f3cb9d /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | ed5212f0e9795f00cbed9e674b58c53059605e64 (diff) | |
| parent | 4db872e11ea5d322c20de9ddde484cb39690c1a2 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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) { |