diff options
author | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
commit | 038f250caea80e21192372019dca8fdcf269c0d9 (patch) | |
tree | 2d5d0ec8fcc86886c27ffc58166183ce5f96be58 /indra/newview/llpanelnearbymedia.cpp | |
parent | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (diff) | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) |
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/llpanelnearbymedia.cpp')
-rwxr-xr-x | indra/newview/llpanelnearbymedia.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index 74c810ea79..1cdd1b664e 100755 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -876,7 +876,10 @@ void LLPanelNearByMedia::onClickParcelAudioPlay() // playing and updated as they cross to other parcels etc. mParcelAudioAutoStart = true; if (!gAudiop) + { + LL_WARNS("AudioEngine") << "LLAudioEngine instance doesn't exist!" << LL_ENDL; return; + } if (LLAudioEngine::AUDIO_PAUSED == gAudiop->isInternetStreamPlaying()) { @@ -896,7 +899,10 @@ void LLPanelNearByMedia::onClickParcelAudioStop() // they explicitly start it again. mParcelAudioAutoStart = false; if (!gAudiop) + { + LL_WARNS("AudioEngine") << "LLAudioEngine instance doesn't exist!" << LL_ENDL; return; + } LLViewerAudio::getInstance()->stopInternetStreamWithAutoFade(); } @@ -904,7 +910,10 @@ void LLPanelNearByMedia::onClickParcelAudioStop() void LLPanelNearByMedia::onClickParcelAudioPause() { if (!gAudiop) + { + LL_WARNS("AudioEngine") << "LLAudioEngine instance doesn't exist!" << LL_ENDL; return; + } // 'true' means pause gAudiop->pauseInternetStream(true); |