diff options
| author | James Cook <james@lindenlab.com> | 2010-02-03 14:13:56 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-03 14:13:56 -0800 |
| commit | 88350edbcbec615f3b15fc82bd5ce4005621ac6f (patch) | |
| tree | c244f41159cf32f3e03c6c311e1453bbd383bad5 /indra/newview/llviewerparcelmedia.cpp | |
| parent | d489216b6ef41f0d22f3a9062ba6daacc67bc038 (diff) | |
| parent | 0bee31de32cb5999e7ec06d74f55d34ce0ac052b (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index e87dbe5c07..c4fc2e5cab 100644 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -179,7 +179,7 @@ void LLViewerParcelMedia::play(LLParcel* parcel) if (!parcel) return; - if (!gSavedSettings.getBOOL("AudioStreamingMedia") || !gSavedSettings.getBOOL("AudioStreamingVideo")) + if (!gSavedSettings.getBOOL("AudioStreamingMedia")) return; std::string media_url = parcel->getMediaURL(); |