Fixed wind not mixing with other audio. Play no more than 30 world sounds at once (new sounds just muted until channels free up). Add fmod profiler support (SHEnableFMODExProfiler). Use FMOD_UNICODE on windows instead of loading files manually and sending raw data to fmod. Incl other misc cleanup.

2011-12-23 02:29:49 -06:00
parent c73414f1a1
commit b4dad425aa
4 changed files with 73 additions and 104 deletions
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -677,7 +677,7 @@ bool idle_startup()
 #endif // !LL_WINDOWS
 			    )
 			{
-				gAudiop = (LLAudioEngine *) new LLAudioEngine_FMODEX();
+				gAudiop = (LLAudioEngine *) new LLAudioEngine_FMODEX(gSavedSettings.getBOOL("SHEnableFMODExProfiler"));
 			}
 #endif