merge changes for storm-1396

doc/contributions.txt

@@ -450,6 +450,7 @@ Jonathan Yap
 	STORM-899
 	STORM-1273
 	STORM-457
+	STORM-1396
 	STORM-1292
 	STORM-1392
 	STORM-1302

indra/newview/llviewermessage.cpp

@@ -4326,8 +4326,11 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 	}
 
 	// Don't play sounds from gestures if they are not enabled.
-	if (!gSavedSettings.getBOOL("EnableGestureSounds")) return;
-		
+	if (object_id == owner_id && !gSavedSettings.getBOOL("EnableGestureSounds"))
+	{
+		return;
+	}
+
 	gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
 }