Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

2012-05-30 21:16:27 -04:00
parent c6120cd283 b15f2d1a56
commit 20f138b31f
16 changed files with 1044 additions and 1172 deletions
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -285,7 +285,7 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 		/*
 		... and re-init.
 		*/
-		result = mSystem->init(100, FMOD_INIT_NORMAL, 0);
+		result = mSystem->init( num_channels + 2, fmod_flags, 0);
 	}
 	if(Check_FMOD_Error(result, "Error initializing FMOD Ex"))
 		return false;