From b1d9487556ab904da12757454dd7c5bf56a8a822 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 13 Mar 2018 18:31:27 +0200 Subject: =?UTF-8?q?MAINT-8382=20FIXED=20=E2=80=9CZoom=20back=E2=80=9D=20bu?= =?UTF-8?q?tton=20is=20displayed=20after=20selecting=20other=20nearby=20me?= =?UTF-8?q?dia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/newview/llpanelnearbymedia.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelnearbymedia.cpp') diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index 737ae2e32d..4d37d8ea4f 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -1047,7 +1047,7 @@ void LLPanelNearByMedia::updateControls() else { showBasicControls(!impl->isMediaDisabled(), ! impl->isParcelMedia(), // include_zoom - LLViewerMediaFocus::getInstance()->isZoomed(), + LLViewerMediaFocus::getInstance()->isZoomedOnMedia(impl->getMediaTextureID()), impl->getVolume() == 0.0, impl->getVolume()); } -- cgit v1.2.3