1 files changed, 12 insertions, 1 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index b20695c..5d83065 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -112,6 +112,7 @@
 #include "llui.h"                       // for make_ui_sound
 #include "lluploaddialog.h"
 #include "llviewercamera.h"
+#include "llviewercontrol.h"
 #include "llviewergenericmessage.h"
 #include "llviewerinventory.h"
 #include "llviewermenu.h"
@@ -3362,12 +3363,19 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
         msg->getVector3Fast(_PREHASH_SoundData, _PREHASH_Position, pos_local);
         msg->getF32Fast(_PREHASH_SoundData, _PREHASH_Gain, gain);
 
+        //If we have sounds muted, don't even try to load or trigger the sound.
+        if(gSavedSettings.getBOOL("MuteSounds") || gain == 0.0)
+                return;
+
         // adjust sound location to true global coords
         LLVector3d      pos_global = from_region_handle(region_handle);
         pos_global.mdV[VX] += pos_local.mV[VX];
         pos_global.mdV[VY] += pos_local.mV[VY];
         pos_global.mdV[VZ] += pos_local.mV[VZ];
 
+        // Don't play sounds if sound settings are muted.
+        if (gSavedSettings.getBOOL("MuteSounds")) return;
+
         // Don't play a trigger sound if you can't hear it due
         // to parcel "local audio only" settings.
         if (!LLViewerParcelMgr::getInstance()->canHearSound(pos_global)) return;
@@ -3396,7 +3404,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 
 void process_preload_sound(LLMessageSystem *msg, void **user_data)
 {
-        if (!gAudiop)
+        if (!gAudiop || gSavedSettings.getBOOL("MuteSounds"))
         {
                 return;
         }
@@ -3449,6 +3457,9 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
         msg->getF32Fast(_PREHASH_DataBlock, _PREHASH_Gain, gain);
         msg->getU8Fast(_PREHASH_DataBlock, _PREHASH_Flags, flags);
 
+        if(gSavedSettings.getBOOL("MuteSounds") || gain == 0.0)
+                return;
+
         LLViewerObject *objectp = gObjectList.findObject(object_id);
         if (!objectp)
         {