summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorcallum_linden <callum@lindenlab.com>2013-09-04 10:44:26 -0700
committercallum_linden <callum@lindenlab.com>2013-09-04 10:44:26 -0700
commit5ffdeb4e0c560bbc3469cf9119509f71c3cf1231 (patch)
tree5aec8e13abdf46c101635cf4208dd04139991f22 /indra
parent4bd87bb45f1c6aa2251c01311befa0975d596c3f (diff)
MAINT-3016 FIX Viewer freeze... by reverting fix for MAINT-2849 (certain streams do not play) - freeze more important than no play
Diffstat (limited to 'indra')
-rw-r--r--indra/llaudio/llstreamingaudio_fmodex.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp
index 266fa2f57b..42f30aa1c4 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -310,7 +310,7 @@ LLAudioStreamManagerFMODEX::LLAudioStreamManagerFMODEX(FMOD::System *system, con
{
mInternetStreamURL = url;
- FMOD_RESULT result = mSystem->createStream(url.c_str(), FMOD_2D | FMOD_NONBLOCKING | FMOD_MPEGSEARCH | FMOD_IGNORETAGS, 0, &mInternetStream);
+ FMOD_RESULT result = mSystem->createStream(url.c_str(), FMOD_2D | FMOD_NONBLOCKING | FMOD_IGNORETAGS, 0, &mInternetStream);
if (result!= FMOD_OK)
{