diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-11-21 11:19:56 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-11-21 11:19:56 +0200 |
| commit | f72015980d8238ad0837365c782866a3af52f01d (patch) | |
| tree | c2382d26d9e5f45f7c2bcaa3273438af97f17da3 /indra | |
| parent | 3bf1e4cb46676fe230732c47b57a646d956b036e (diff) | |
MAINT-8007 Music do not start playing after disabling
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 01b0dd0077..7c6cce5c58 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -791,6 +791,14 @@ void LLViewerMedia::updateMedia(void *dummy_arg) LLViewerAudio::getInstance()->stopInternetStreamWithAutoFade(); } } + else + { + if(gAudiop && LLViewerMedia::hasParcelAudio() && gSavedSettings.getBOOL("MediaTentativeAutoPlay")) + { + LLViewerAudio::getInstance()->startInternetStreamWithAutoFade(LLViewerMedia::getParcelAudioURL()); + } + } + pimpl->setPriority(new_priority); if(pimpl->getUsedInUI()) |