diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2019-11-20 17:10:22 -0800 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2019-11-20 17:10:22 -0800 |
| commit | 4b205db468fd371dfe1bb30bb887e2ccbd7044ec (patch) | |
| tree | 6d83efd5ebc0c2a462f33f1b385c5b415a93cb49 /indra/newview/llprogressview.cpp | |
| parent | 18eb8ac90ce409ba620f6fe8ff487e6195d9c3eb (diff) | |
| parent | 24920de799c8e2dd26854923c7a10fc4a551dd5d (diff) | |
Merged lindenlab/viewer-eep into default
Diffstat (limited to 'indra/newview/llprogressview.cpp')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index c17b86783d..083a913ef8 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -86,7 +86,7 @@ BOOL LLProgressView::postBuild() mMediaCtrl->setVisible( false ); // hidden initially mMediaCtrl->addObserver( this ); // watch events - LLViewerMedia::setOnlyAudibleMediaTextureID(mMediaCtrl->getTextureID()); + LLViewerMedia::getInstance()->setOnlyAudibleMediaTextureID(mMediaCtrl->getTextureID()); mCancelBtn = getChild<LLButton>("cancel_btn"); mCancelBtn->setClickedCallback( LLProgressView::onCancelButtonClicked, NULL ); @@ -263,7 +263,7 @@ void LLProgressView::draw() { mFadeToWorldTimer.stop(); - LLViewerMedia::setOnlyAudibleMediaTextureID(LLUUID::null); + LLViewerMedia::getInstance()->setOnlyAudibleMediaTextureID(LLUUID::null); // Fade is complete, release focus gFocusMgr.releaseFocusIfNeeded( this ); |