diff options
| author | McCabe Maxsted | 2009-02-15 03:19:29 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-02-15 03:19:29 -0700 |
| commit | 22ee7bc628ddc6e5aa4b8f9a5eaa6dd9e69c7125 (patch) | |
| tree | 25d13fead2d0a7a8ac731947b3e951e22faa36c8 /linden | |
| parent | Removed useless music pause button (diff) | |
| parent | Gestures now muted with sounds (diff) | |
| download | meta-impy-22ee7bc628ddc6e5aa4b8f9a5eaa6dd9e69c7125.zip meta-impy-22ee7bc628ddc6e5aa4b8f9a5eaa6dd9e69c7125.tar.gz meta-impy-22ee7bc628ddc6e5aa4b8f9a5eaa6dd9e69c7125.tar.bz2 meta-impy-22ee7bc628ddc6e5aa4b8f9a5eaa6dd9e69c7125.tar.xz | |
Merge branch '1.1.0-RC1-fixes' into next
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llviewergesture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 |
| 51 | LLViewerGestureList gGestureList; | 52 | LLViewerGestureList gGestureList; |
| 52 | 53 | ||
| 53 | const F32 LLViewerGesture::SOUND_VOLUME = 1.f; | 54 | const F32 LLViewerGesture::SOUND_VOLUME = gSavedSettings.getBOOL("MuteSounds") ? 0.f : 1.f; |
| 54 | 55 | ||
| 55 | LLViewerGesture::LLViewerGesture() | 56 | LLViewerGesture::LLViewerGesture() |
| 56 | : LLGesture() | 57 | : LLGesture() |