diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-11 20:38:23 -0700 |
| commit | e1c1428569b03bbb20e7597ebec7d707151ce802 (patch) | |
| tree | 69ca6d0fd05300346ddc14664b6d44bd4206a8b4 /indra/llaudio/llstreamingaudio_fmodex.cpp | |
| parent | f356d7eb9fd730f5f6f5a29fb0706e20876ad3bd (diff) | |
| parent | ab4104d2d785199722f93d027e72af40d16f5703 (diff) | |
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
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) { |