livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-359 WIP Disable MOAP 

fixed AudioStreamingMusic and AudioStreamingMedia so they are independent
this way we can keep audio on but disable html content
meow-7.2.2
Richard Linden 2010-10-29 16:50:09 -07:00
parent 7a74e2c0cb
commit de11ebefe9
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llviewerparcelmgr.cpp
View File

@ -1784,8 +1784,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
void optionally_start_music(const std::string& music_url)
{
if (gSavedSettings.getBOOL("AudioStreamingMusic") &&
gSavedSettings.getBOOL("AudioStreamingMedia"))
if (gSavedSettings.getBOOL("AudioStreamingMusic"))
{
// only play music when you enter a new parcel if the UI control for this
// was not *explicitly* stopped by the user. (part of SL-4878)