Added AllowLargeSounds setting to disable v2 sound-decode strictness

Conflicts:

	indra/newview/app_settings/settings.xml

indra/llaudio/llaudiodecodemgr.cpp

@@ -249,7 +249,7 @@ BOOL LLVorbisDecodeState::initDecode()
 		llwarns << "Bad sound caught by zmagic" << llendl;
 		abort_decode = true;
 	}
-	else
+	else if(!gAudiop->getAllowLargeSounds())
 	{
 	// </edit> 
 	//Much more restrictive than zmagic. Perhaps make toggleable.

indra/llaudio/llaudioengine.cpp

@@ -115,6 +115,8 @@ void LLAudioEngine::setDefaults()
 
 	for (U32 i = 0; i < LLAudioEngine::AUDIO_TYPE_COUNT; i++)
 		mSecondaryGain[i] = 1.0f;
+
+	mAllowLargeSounds = false;
 }
 
 

indra/llaudio/llaudioengine.h

@@ -187,6 +187,8 @@ public:
 
 	bool updateBufferForData(LLAudioData *adp, const LLUUID &audio_uuid = LLUUID::null);
 
+	void setAllowLargeSounds(bool allow) { mAllowLargeSounds = allow ;}
+	bool getAllowLargeSounds() const {return mAllowLargeSounds;}
 
 	// Asset callback when we're retrieved a sound from the asset server.
 	void startNextTransfer();
@@ -260,6 +262,8 @@ protected:
 private:
 	void setDefaults();
 	LLStreamingAudioInterface *mStreamingAudioImpl;
+
+	bool mAllowLargeSounds;
 };
 
 

indra/llaudio/llaudioengine_fmod.cpp

@@ -107,6 +107,7 @@ bool LLAudioEngine_FMOD::init(const S32 num_channels, void* userdata)
 	// This means we also try to play audio when minimized,
 	// so we manually handle muting in that case. JC
 	fmod_flags |= FSOUND_INIT_GLOBALFOCUS;
+	fmod_flags |= FSOUND_INIT_DSOUND_HRTF_FULL;
 #endif
 
 #if LL_LINUX