diff options
| author | callum_linden <none@none> | 2013-01-18 16:43:19 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2013-01-18 16:43:19 -0800 |
| commit | ba3e89b5c731ed6dc36d4650928be8081b3289f5 (patch) | |
| tree | 69b14979b992e16d86f5c07587d48247548c3806 /indra/newview/llstartup.cpp | |
| parent | cb676675335791d9dacd032c389a0346c725d9d7 (diff) | |
first push - patch from CmdCupCake plus force FMODEX on
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 0e3007724b..6a874d1af5 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -37,6 +37,10 @@ #include "llviewermedia_streamingaudio.h" #include "llaudioengine.h" +#ifdef LL_FMODEX +# include "llaudioengine_fmodex.h" +#endif + #ifdef LL_FMOD # include "llaudioengine_fmod.h" #endif @@ -623,6 +627,17 @@ bool idle_startup() { gAudiop = NULL; +#ifdef LL_FMODEX + if (!gAudiop +#if !LL_WINDOWS + && NULL == getenv("LL_BAD_FMODEX_DRIVER") +#endif // !LL_WINDOWS + ) + { + gAudiop = (LLAudioEngine *) new LLAudioEngine_FMODEX(gSavedSettings.getBOOL("FMODExProfilerEnable")); + } +#endif + #ifdef LL_OPENAL if (!gAudiop #if !LL_WINDOWS |