summaryrefslogtreecommitdiff
path: root/indra/llaudio/llstreamingaudio_fmodex.cpp
diff options
context:
space:
mode:
authorsimon_linden <none@none>2013-09-09 16:17:16 -0700
committersimon_linden <none@none>2013-09-09 16:17:16 -0700
commite2019e8a3b5175eb6d7322fbe7c466f213854640 (patch)
tree1e2fbeaeb249e0f3f0f91e94af213c1840438581 /indra/llaudio/llstreamingaudio_fmodex.cpp
parent6dd7e0c9ef587c6c05726d407bef8b51018a7a4b (diff)
parent2c1d89c57ec21e4790eb14066d2291282a1000b4 (diff)
Merge downstream code with viewer-release
Diffstat (limited to 'indra/llaudio/llstreamingaudio_fmodex.cpp')
-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)
{