diff options
| author | Richard Linden <none@none> | 2010-08-12 10:12:52 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-12 10:12:52 -0700 |
| commit | 41fe9750c82605ccfbaf8f9b0f08b9068de702d3 (patch) | |
| tree | d0e6bbffa926edff4d70d87bbf030bf28cd6953a /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 73f1f43b8bd9ae1c3bc7f96d652c30d772da113b (diff) | |
| parent | 73952a37ed7a11331154f2f68050286722ec96da (diff) | |
Automated merge with http://10.1.4.28:8000/
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 81e805974f..583b41aa57 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) { |