From bcd84433717e42ec8675009e1335caf915cc1a41 Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Fri, 6 Aug 2010 20:06:16 -0700 Subject: 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. --- indra/newview/llpanelprimmediacontrols.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/llpanelprimmediacontrols.cpp') 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) { -- cgit v1.2.3