summaryrefslogtreecommitdiff
path: root/indra/llaudio
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-05-29 11:44:22 -0700
committerdolphin <dolphin@lindenlab.com>2013-05-29 11:44:22 -0700
commitebc604fa8d12fb08fda1ac55aae817ad0135bb6b (patch)
tree2487b5bd256188a0c49a1d46265d75f3190dd53c /indra/llaudio
parent85dde8d591aabe03b01720a22f91e54fc3d04552 (diff)
parentdcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff)
Merge with 3.5.4 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;