diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 1ba6f7d6b..14ba44e30 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -200,7 +200,7 @@ Type Boolean Value - 0 + 1 MediaFilterRect diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp index db981c415..54dee8b52 100644 --- a/indra/newview/lloverlaybar.cpp +++ b/indra/newview/lloverlaybar.cpp @@ -529,6 +529,7 @@ void LLOverlayBar::toggleMediaPlay(void*) LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); if (parcel) { + LLViewerParcelMedia::sIsUserAction = true; LLViewerParcelMedia::play(parcel); } } @@ -554,7 +555,8 @@ void LLOverlayBar::toggleMusicPlay(void*) // stream is stopped, it doesn't return the right thing - commenting out for now. // if ( gAudiop->isInternetStreamPlaying() == 0 ) { - gAudiop->startInternetStream(parcel->getMusicURL()); + LLViewerParcelMedia::sIsUserAction = true; + LLViewerParcelMedia::playStreamingMusic(parcel); } } }