diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index d3936298a1..0438af1fe2 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -832,7 +832,9 @@ F64 LLAudioEngine::mapWindVecToPan(LLVector3 wind_vec)
 
 
 void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_id, const F32 gain,
-								 const S32 type, const LLVector3d &pos_global, const LLUUID& source_object, const LLUUID& audio_source_id)
+                                 // / <FS:Testy> Optional parameter for setting the audio source UUID
+								 // const S32 type, const LLVector3d &pos_global, const LLUUID& source_object)
+                                 const S32 type, const LLVector3d &pos_global, const LLUUID& source_object, const LLUUID& audio_source_id)
 {
 	// Create a new source (since this can't be associated with an existing source.
 	//LL_INFOS() << "Localized: " << audio_uuid << LL_ENDL;
@@ -843,6 +845,9 @@ void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_i
 		return;
 	}
 
+    // <FS:Testy> Only generate the id if one wasn't passed to the method
+    //LLUUID source_id;
+    //source_id.generate();
     LLUUID source_id = audio_source_id;
     if (source_id.isNull())
     {
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h
index 245bf3c6ad..8f00822cd7 100644
--- a/indra/llaudio/llaudioengine.h
+++ b/indra/llaudio/llaudioengine.h
@@ -150,8 +150,11 @@ public:
 	void triggerSound(const LLUUID &sound_id, const LLUUID& owner_id, const F32 gain,
 					  const S32 type = LLAudioEngine::AUDIO_TYPE_NONE,
 					  const LLVector3d &pos_global = LLVector3d::zero,
-							  const LLUUID& source_object = LLUUID::null,
+                              // <FS:Testy> Optional parameter for setting the audio source UUID
+							  // const LLUUID& source_object = LLUUID::null);
+                              const LLUUID& source_object = LLUUID::null,
                               const LLUUID& audio_source_id = LLUUID::null);
+
 	// NaCl End
 	void triggerSound(SoundData& soundData);