aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/newview/llviewergesture.cpp3
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 @@
2=- 1.1.0 RC1 -= 2=- 1.1.0 RC1 -=
3=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- 3=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
4 4
5=======
62009-02-14 McCabe Maxsted <hakushakukun@gmail.com> 52009-02-14 McCabe Maxsted <hakushakukun@gmail.com>
7 6
8 * linden/indra/newview/app_settings/settings.xml: 7 * linden/indra/newview/app_settings/settings.xml:
@@ -26,6 +25,9 @@
26 * linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml: 25 * linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml:
27 Ditto. 26 Ditto.
28 27
28 * linden/indra/newview/llviewergesture.cpp:
29 Gestures now muted with sounds.
30
29 31
302009-02-13 McCabe Maxsted <hakushakukun@gmail.com> 322009-02-13 McCabe Maxsted <hakushakukun@gmail.com>
31 33
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 @@
43#include "llinventorymodel.h" 43#include "llinventorymodel.h"
44#include "llvoavatar.h" 44#include "llvoavatar.h"
45#include "llxfermanager.h" 45#include "llxfermanager.h"
46#include "llviewercontrol.h"
46#include "llviewermessage.h" // send_guid_sound_trigger 47#include "llviewermessage.h" // send_guid_sound_trigger
47#include "llviewernetwork.h" 48#include "llviewernetwork.h"
48#include "llagent.h" 49#include "llagent.h"
@@ -50,7 +51,7 @@
50// Globals 51// Globals
51LLViewerGestureList gGestureList; 52LLViewerGestureList gGestureList;
52 53
53const F32 LLViewerGesture::SOUND_VOLUME = 1.f; 54const F32 LLViewerGesture::SOUND_VOLUME = gSavedSettings.getBOOL("MuteSounds") ? 0.f : 1.f;
54 55
55LLViewerGesture::LLViewerGesture() 56LLViewerGesture::LLViewerGesture()
56: LLGesture() 57: LLGesture()