diff options
author | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
commit | 4d22c32aa9ac42b4a720200386d68339e8656974 (patch) | |
tree | c84419f0f3ac44d2f64b7082c3c69c1fbec919d2 /indra/llaudio/llstreamingaudio_fmodex.cpp | |
parent | 73e6711268adb93025386ffb766055125f0d849e (diff) | |
parent | 33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff) |
merge changes for 3.5.2-beta4
Diffstat (limited to 'indra/llaudio/llstreamingaudio_fmodex.cpp')
-rw-r--r-- | indra/llaudio/llstreamingaudio_fmodex.cpp | 2 |
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) { |