summaryrefslogtreecommitdiff
path: root/indra/llaudio
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-06 16:46:31 -0400
committerOz Linden <oz@lindenlab.com>2013-06-06 16:46:31 -0400
commita2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (patch)
tree5f2e8de9027fc924947b304c20e1aaf81ce1234a /indra/llaudio
parent72e7269da376d660385f3c66ac2a25a5e50871ea (diff)
parentdcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff)
merge changes for 3.5.3-release
Diffstat (limited to 'indra/llaudio')
-rw-r--r--indra/llaudio/llaudioengine_fmodex.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index fe6dedcd03..45fc3186f4 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -104,6 +104,9 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
//if(Check_FMOD_Error(result, "FMOD::Memory_Initialize"))
// return false;
+ // turn off non-error log spam to fmod.log (TODO: why do we even have an fmod.log if we don't link against log lib?)
+ FMOD::Debug_SetLevel(FMOD_DEBUG_LEVEL_ERROR);
+
result = FMOD::System_Create(&mSystem);
if(Check_FMOD_Error(result, "FMOD::System_Create"))
return false;