From 27ebee0c5d5fa735bb1f011e8967e5736ecd6f43 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 15 Feb 2009 03:17:41 -0700 Subject: Gestures now muted with sounds --- ChangeLog.txt | 4 +++- linden/indra/newview/llviewergesture.cpp | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 028e4bb..6e76ce0 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -2,7 +2,6 @@ =- 1.1.0 RC1 -= =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -======= 2009-02-14 McCabe Maxsted * linden/indra/newview/app_settings/settings.xml: @@ -26,6 +25,9 @@ * linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml: Ditto. + * linden/indra/newview/llviewergesture.cpp: + Gestures now muted with sounds. + 2009-02-13 McCabe Maxsted diff --git a/linden/indra/newview/llviewergesture.cpp b/linden/indra/newview/llviewergesture.cpp index a080663..d99a3a8 100644 --- a/linden/indra/newview/llviewergesture.cpp +++ b/linden/indra/newview/llviewergesture.cpp @@ -43,6 +43,7 @@ #include "llinventorymodel.h" #include "llvoavatar.h" #include "llxfermanager.h" +#include "llviewercontrol.h" #include "llviewermessage.h" // send_guid_sound_trigger #include "llviewernetwork.h" #include "llagent.h" @@ -50,7 +51,7 @@ // Globals LLViewerGestureList gGestureList; -const F32 LLViewerGesture::SOUND_VOLUME = 1.f; +const F32 LLViewerGesture::SOUND_VOLUME = gSavedSettings.getBOOL("MuteSounds") ? 0.f : 1.f; LLViewerGesture::LLViewerGesture() : LLGesture() -- cgit v1.1