diff options
| author | Jonathan Yap <none@none> | 2011-06-19 07:07:31 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-06-19 07:07:31 -0400 |
| commit | 173ef3b2c03bbb55cebd5cf70ce231944d427999 (patch) | |
| tree | 4cf00bf817fd6ebd9fce62deddebf27fb83997a8 /indra/newview | |
| parent | 7f6d49df43c660b9f5632ffb8a30f90ee718cac0 (diff) | |
STORM-1396 Storm-787 (mute gestures) also mutes sounds from objects
Diffstat (limited to 'indra/newview')
| -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 7ab335314a..c3665f8128 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); } |