1 files changed, 30 insertions, 14 deletions

diff --git a/linden/indra/newview/llvieweraudio.cpp b/linden/indra/newview/llvieweraudio.cpp
index 1e6c2ca..58ce7a7 100644
--- a/linden/indra/newview/llvieweraudio.cpp
+++ b/linden/indra/newview/llvieweraudio.cpp
@@ -1,17 +1,27 @@
 /** 
  * @file llvieweraudio.cpp
- * @brief Audio functions moved from viewer.cpp
+ * @brief Audio functions that used to be in viewer.cpp
  *
- * $LicenseInfo:firstyear=2000&license=internal$
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2000-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2008, Linden Research, Inc.
  * 
- * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
- * this source code is governed by the Linden Lab Source Code Disclosure
- * Agreement ("Agreement") previously entered between you and Linden
- * Lab. By accessing, using, copying, modifying or distributing this
- * software, you acknowledge that you have been informed of your
- * obligations under the Agreement and agree to abide by those obligations.
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
  * 
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
@@ -136,8 +146,10 @@ void audio_update_volume(bool force_update)
         if (gAudiop) 
         {               
                 F32 music_volume = gSavedSettings.getF32("AudioLevelMusic");
+                BOOL music_muted = gSavedSettings.getBOOL("MuteMusic");
                 music_volume = mute_volume * master_volume * (music_volume*music_volume);
-                gAudiop->setInternetStreamGain ( music_volume );
+                gAudiop->setInternetStreamGain ( music_muted ? 0.f : music_volume );
+        
         }
 
         // Streaming Media
@@ -145,7 +157,8 @@ void audio_update_volume(bool force_update)
         {
                 F32 media_volume = gSavedSettings.getF32("AudioLevelMedia");
                 media_volume = mute_volume * master_volume * (media_volume*media_volume);
-                LLMediaEngine::getInstance()->setVolume(media_volume);
+                BOOL media_muted = gSavedSettings.getBOOL("MuteMedia");
+                LLMediaEngine::getInstance()->setVolume(media_muted ? 0.f : media_volume);
         }
 
         // Voice
@@ -153,8 +166,9 @@ void audio_update_volume(bool force_update)
         {
                 F32 voice_volume = gSavedSettings.getF32("AudioLevelVoice");
                 voice_volume = mute_volume * master_volume * voice_volume;
-                gVoiceClient->setVoiceVolume(voice_volume);
-                gVoiceClient->setMicGain(gSavedSettings.getF32("AudioLevelMic"));
+                BOOL voice_mute = gSavedSettings.getBOOL("MuteVoice");
+                gVoiceClient->setVoiceVolume(voice_mute ? 0.f : voice_volume);
+                gVoiceClient->setMicGain(voice_mute ? 0.f : gSavedSettings.getF32("AudioLevelMic"));
 
                 if (!gViewerWindow->getActive() && (gSavedSettings.getBOOL("MuteWhenMinimized")))
                 {
@@ -221,7 +235,9 @@ void audio_update_wind(bool force_update)
                 // want to screw up the fade-in on startup by setting actual source gain
                 // outside the fade-in.
                 F32 ambient_volume = gSavedSettings.getF32("AudioLevelAmbient");
-                gAudiop->mMaxWindGain = ambient_volume * ambient_volume;
+                gAudiop->mMaxWindGain = gSavedSettings.getBOOL("MuteAmbient") 
+                        ? 0.f 
+                        : ambient_volume * ambient_volume;
                 
                 last_camera_water_height = camera_water_height;
                 gAudiop->updateWind(gRelativeWindVec, camera_water_height);