diff options
| author | Richard Linden <none@none> | 2010-10-29 16:50:09 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-10-29 16:50:09 -0700 |
| commit | de11ebefe905f011b4e8f38f8f9ed8832bdb87e8 (patch) | |
| tree | 9ea7104c70a3b8377a9dedf6319c15117dc68b5b /indra/newview/llviewerparcelmgr.cpp | |
| parent | 7a74e2c0cb93be6481205a4747824fd2e7dd6640 (diff) | |
EXP-359 WIP Disable MOAP
fixed AudioStreamingMusic and AudioStreamingMedia so they are independent
this way we can keep audio on but disable html content
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 3c9e351ca1..a2f6f67b4d 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -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) |