diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-26 12:32:38 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-26 12:32:38 +0200 |
| commit | a3215a0f09542b513ca06b133631d5b074a308a4 (patch) | |
| tree | f137af067c5f13191485be1c4f6f79e70d9a23c7 /indra/newview/llviewerparcelmedia.cpp | |
| parent | a402b2975fdb88781efa340d186c9ace449f9521 (diff) | |
| parent | b15bebb34853cb839100c48f5b28d52e60660c13 (diff) | |
merge
--HG--
branch : product-engine
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(); |