diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-08-06 20:06:16 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-06 20:06:16 -0700 |
| commit | bcd84433717e42ec8675009e1335caf915cc1a41 (patch) | |
| tree | 4151e4b1864d0ccf9a80f00fd6bfb1e88b1d0a44 /indra/newview/llpanelprimmediacontrols.cpp | |
| parent | 4277bfbba6696d47d9db5a3aa145891701c7d45f (diff) | |
Fixes for EXT-8563 "VWR-20156: Prim Media on HUDs has no Audio or Interactivity"
Backed out changeset 1b65d0d42c67 (the fix for EXT-5205), and replaced it with a check in LLPanelPrimMediaControls::nextZoomLevel().
Made LLViewerMediaImpl::calculateInterest() not attempt to calculate distances to HUD attachments, since their global positions are invalid.
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) { |