diff options
author | Dave Houlton <euclid@lindenlab.com> | 2019-11-13 16:46:27 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2019-11-13 16:46:27 -0700 |
commit | dc1453af9c474c67749aded576c11dff3afdd444 (patch) | |
tree | bff4d5bfca6eb036339c30429ef08704d0bb68cb /indra/newview/llpanelprimmediacontrols.cpp | |
parent | 3dfdb2f6e8be4fb2a08102847520585dc1d8fd7d (diff) | |
parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) |
Merge in from viewer-release 6.3.5
Diffstat (limited to 'indra/newview/llpanelprimmediacontrols.cpp')
-rw-r--r-- | indra/newview/llpanelprimmediacontrols.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 3d3dccee0b..02a300392b 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -267,7 +267,7 @@ void LLPanelPrimMediaControls::focusOnTarget() LLViewerMediaImpl* LLPanelPrimMediaControls::getTargetMediaImpl() { - return LLViewerMedia::getMediaImplFromTextureID(mTargetImplID); + return LLViewerMedia::getInstance()->getMediaImplFromTextureID(mTargetImplID); } LLViewerObject* LLPanelPrimMediaControls::getTargetObject() |