summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llviewermessage.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 458fc3b13d..1d79261cff 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3852,7 +3852,12 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
}
// Don't play sounds from gestures if they are not enabled.
- if (object_id == owner_id && !gSavedSettings.getBOOL("EnableGestureSounds"))
+ // Do play sounds triggered by avatar, since muting your own
+ // gesture sounds and your own sounds played inworld from
+ // Inventory can cause confusion.
+ if (object_id == owner_id
+ && owner_id != gAgentID
+ && !gSavedSettings.getBOOL("EnableGestureSounds"))
{
return;
}