diff options
| author | Jiao Li <angela@lindenlab.com> | 2009-07-07 10:27:50 +0000 |
|---|---|---|
| committer | Jiao Li <angela@lindenlab.com> | 2009-07-07 10:27:50 +0000 |
| commit | 9eeda70f1244230078c565392223c252c9c76e7b (patch) | |
| tree | cf271a9637f83ecd7d084edaa7ce87914142d3ce /indra/newview/llviewerparcelmgr.cpp | |
| parent | 541e0b1dfce8ecffdaaf444f0e0ae02ca28c9323 (diff) | |
DEV-34720 Mute all
DEV-34721 "Streaming Media" checkbox
DEV-34723 Mouse sensitivity slider
Reviewed by James
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index bcb3853106..dc9b26eedc 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1710,7 +1710,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use void optionally_start_music(const std::string& music_url) { - if (gSavedSettings.getBOOL("AudioStreamingMusic")) + if (gSavedSettings.getBOOL("AudioStreamingMusic") && gSavedSettings.getBOOL("AudioStreaming")) { // Make the user click the start button on the overlay bar. JC // llinfos << "Starting parcel music " << music_url << llendl; |