diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-02-25 23:28:25 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-02-25 23:28:52 +0200 |
| commit | 811d2fcb1ea8952b5e06dac0afffb835a952938f (patch) | |
| tree | 5debfb4110d5fceea85517248e540b20433e1a51 | |
| parent | 78b6aa6ffcafce359ed805a480792eb939fb3f90 (diff) | |
SL-14879 "Play sounds from gestures" should not affect own sounds
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 7 |
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; } |