diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-06-01 19:36:38 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-06-01 19:36:38 -0700 |
| commit | cf3d2a06a13528cca1327becfb9e8dcb5ff4614a (patch) | |
| tree | a58c89cfe474308985b07b3e86f991b886a86114 /indra/llaudio/llaudioengine_fmodex.cpp | |
| parent | e331566dba65b8aa33fceb6d1cec8bf0550bbd7d (diff) | |
BUG-2707 turn off more LL_DEBUGS to narrow down Kat's crashing cuplrit
Diffstat (limited to 'indra/llaudio/llaudioengine_fmodex.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine_fmodex.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp index 6774844444..baa5fa64de 100644 --- a/indra/llaudio/llaudioengine_fmodex.cpp +++ b/indra/llaudio/llaudioengine_fmodex.cpp @@ -75,12 +75,14 @@ void* F_STDCALL decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const cha { if(type & FMOD_MEMORY_STREAM_DECODE) { - LL_DEBUGS("FMODEX") << "Decode buffer size: " << size << llendl; + //LL_DEBUGS("FMODEX") << "Decode buffer size: " << size << llendl; } else if(type & FMOD_MEMORY_STREAM_FILE) { - LL_DEBUGS("FMODEX") << "Strean buffer size: " << size << llendl; + //LL_DEBUGS("FMODEX") << "Strean buffer size: " << size << llendl; } + if (size > (1L << 24)) + return NULL; return new char[size]; } void* F_STDCALL decode_realloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr) @@ -304,16 +306,16 @@ void LLAudioEngine_FMODEX::shutdown() { stopInternetStream(); - LL_DEBUGS("FMODEX") << "About to LLAudioEngine::shutdown()" << llendl; + //LL_DEBUGS("FMODEX") << "About to LLAudioEngine::shutdown()" << llendl; LLAudioEngine::shutdown(); - LL_DEBUGS("FMODEX") << "LLAudioEngine_FMODEX::shutdown() closing FMOD Ex" << llendl; + //LL_DEBUGS("FMODEX") << "LLAudioEngine_FMODEX::shutdown() closing FMOD Ex" << llendl; if ( mSystem ) // speculative fix for MAINT-2657 { mSystem->close(); mSystem->release(); } - LL_DEBUGS("FMODEX") << "LLAudioEngine_FMODEX::shutdown() done closing FMOD Ex" << llendl; + //LL_DEBUGS("FMODEX") << "LLAudioEngine_FMODEX::shutdown() done closing FMOD Ex" << llendl; delete mListenerp; mListenerp = NULL; |