diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-22 17:46:34 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-22 17:46:34 -0800 |
| commit | dcfcf50d40685ccc4c092ee0f15297df059da70f (patch) | |
| tree | 0054fe8e650c11404fc34f9a3f6568982f004414 /indra/newview/llviewermedia.cpp | |
| parent | 615e2a05777d34a2b784a518f42ad5798484ffab (diff) | |
Fix (unposted bug): media "affordance" was not properly being disabled when media was disabled
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 395467dffb..b066db6307 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -993,14 +993,14 @@ bool LLViewerMedia::hasInWorldMedia() // static bool LLViewerMedia::hasParcelMedia() { - return !LLViewerParcelMedia::getURL().empty(); + return gSavedSettings.getBOOL("AudioStreamingMedia") && !LLViewerParcelMedia::getURL().empty(); } ////////////////////////////////////////////////////////////////////////////////////////// // static bool LLViewerMedia::hasParcelAudio() { - return !LLViewerMedia::getParcelAudioURL().empty(); + return gSavedSettings.getBOOL("AudioStreamingMedia") && !LLViewerMedia::getParcelAudioURL().empty(); } ////////////////////////////////////////////////////////////////////////////////////////// |