diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-15 11:57:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-15 11:57:13 -0400 |
| commit | 81afbd5b293e80248daddb51e7985e474abe9d45 (patch) | |
| tree | 5876324036ffa822e3792ab8c1c83f984349515c /indra/newview/llviewermessage.cpp | |
| parent | 83cb59e45b56cd6b3f42de760bc64a8203913251 (diff) | |
| parent | 0c8b3ea7448a9da069d20fdf3d48a6feec7eb33f (diff) | |
merge changes for storm-787
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 3832be727f..0aada644f3 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4332,6 +4332,9 @@ void process_sound_trigger(LLMessageSystem *msg, void **) { return; } + + // Don't play sounds from gestures if they are not enabled. + if (!gSavedSettings.getBOOL("EnableGestureSounds")) return; gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global); } |