diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp index 4a16e3e454..27eb7d518d 100644 --- a/indra/llaudio/llaudioengine_fmodex.cpp +++ b/indra/llaudio/llaudioengine_fmodex.cpp @@ -102,11 +102,15 @@ LLAudioEngine_FMODEX::~LLAudioEngine_FMODEX() } +static // Make this file scope so it doesn't collide with the same function in llstreamingaudio_fmodex.cpp inline bool Check_FMOD_Error(FMOD_RESULT result, const char *string) { if(result == FMOD_OK) return false; - LL_DEBUGS() << string << " Error: " << FMOD_ErrorString(result) << LL_ENDL; + // Always print out error + //LL_DEBUGS() << string << " Error: " << FMOD_ErrorString(result) << LL_ENDL; + LL_WARNS() << string << " Error: " << FMOD_ErrorString(result) << LL_ENDL; + // return true; } diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp index b96dbc242c..1ceea44b66 100644 --- a/indra/llaudio/llstreamingaudio_fmodex.cpp +++ b/indra/llaudio/llstreamingaudio_fmodex.cpp @@ -34,7 +34,7 @@ #include "llstreamingaudio_fmodex.h" // FMOD fixes -inline bool Check_FMOD_Error(FMOD_RESULT result, const char *string) +static inline bool Check_FMOD_Error(FMOD_RESULT result, const char *string) { if (result == FMOD_OK) return false;