Remove FMOD Ex

2016-01-16 13:07:51 -05:00
parent e8ec5d750c
commit 1d2995666f
14 changed files with 11 additions and 2243 deletions
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -49,10 +49,6 @@
 # include "llaudioengine_fmodstudio.h"
 #endif

-#if LL_FMODEX
-# include "llaudioengine_fmodex.h"
-#endif
-
 #ifdef LL_OPENAL
 #include "llaudioengine_openal.h"
 #endif
@@ -434,17 +430,6 @@ void init_audio()
 		}
 #endif

-#ifdef LL_FMODEX		
-		if (!gAudiop
-#if !LL_WINDOWS
-		    && NULL == getenv("LL_BAD_FMODEX_DRIVER")
-#endif // !LL_WINDOWS
-		)
-		{
-			gAudiop = (LLAudioEngine *) new LLAudioEngine_FMODEX(gSavedSettings.getBOOL("SHEnableFMODExProfiler"),gSavedSettings.getBOOL("SHEnableFMODEXVerboseDebugging"));
-		}
-#endif
-
 #ifdef LL_OPENAL
 		if (!gAudiop
 #if !LL_WINDOWS