Avatar sounds now don't disable when from a region above current maturity

1 files changed, 6 insertions, 6 deletions

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index bc1aedb..140b517 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3931,8 +3931,10 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
         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)
+        if (gSavedSettings.getBOOL("MuteSounds") || gain == 0.0)
+        {
                 return;
+        }
 
         // adjust sound location to true global coords
         LLVector3d      pos_global = from_region_handle(region_handle);
@@ -3940,9 +3942,6 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
         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;
@@ -3961,10 +3960,11 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
         }
 
         // Don't play sounds from a region with maturity above current agent maturity
-        if( !gAgent.canAccessMaturityInRegion( region_handle ) )
+        // Actually, let's -- MC
+        /*if( !gAgent.canAccessMaturityInRegion( region_handle ) )
         {
                 return;
-        }
+        }*/
                 
         gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
 }