diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-30 06:37:25 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-30 06:37:25 -0400 |
| commit | ce93fc7fd5175716161aa85cfc75e1be76d0e317 (patch) | |
| tree | e1420320fb484746c5e4431ed78def48f7d7121b /indra | |
| parent | a80c79097d24133a9ff9ce6288a2ace506ef0946 (diff) | |
| parent | 173ef3b2c03bbb55cebd5cf70ce231944d427999 (diff) | |
merge changes for storm-1396
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index fc0e6da7a0..f6b01e92cb 100644 --- a/indra/newview/llviewermessage.cpp +++ b/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); } |