From ad425c4e96aaf964e81397ac156672ee54d24393 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 11 Aug 2010 15:00:58 -0700
Subject: Fixed gestures audio slider not being muted by the master mute

---
 linden/indra/newview/llpanelaudiovolume.cpp                  | 7 +++++++
 linden/indra/newview/skins/default/xui/en-us/panel_audio.xml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llpanelaudiovolume.cpp b/linden/indra/newview/llpanelaudiovolume.cpp
index e23fc28..5045e8f 100644
--- a/linden/indra/newview/llpanelaudiovolume.cpp
+++ b/linden/indra/newview/llpanelaudiovolume.cpp
@@ -54,6 +54,7 @@ BOOL LLPanelAudioVolume::postBuild()
 	childSetCommitCallback("SFX Volume", onCommitVolumeChange);
 	childSetCommitCallback("UI Volume", onCommitVolumeChange);
 	childSetCommitCallback("Wind Volume", onCommitVolumeChange);
+	childSetCommitCallback("Gestures Volume", onCommitVolumeChange);
 	return TRUE;
 }
 
@@ -74,6 +75,7 @@ void LLPanelAudioVolume::draw()
 	childSetEnabled("SFX Volume", enable);
 	childSetEnabled("UI Volume", enable);
 	childSetEnabled("Wind Volume", enable);
+	childSetEnabled("Gestures Volume", enable);
 
 	childSetEnabled("mute_music", enable);
 	childSetEnabled("mute_media", enable);
@@ -81,6 +83,7 @@ void LLPanelAudioVolume::draw()
 	childSetEnabled("mute_sfx", enable);
 	childSetEnabled("mute_wind", enable);
 	childSetEnabled("mute_ui", enable);
+	childSetEnabled("mute_gestures", enable);
 
 	LLPanel::draw();
 }
@@ -118,6 +121,10 @@ void LLPanelAudioVolume::onCommitVolumeChange(LLUICtrl* ctrl, void* user_data)
 	{
 		gSavedSettings.setBOOL("MuteVoice", FALSE);
 	}
+	else if (control_name == "AudioLevelGestures")
+	{
+		gSavedSettings.setBOOL("MuteGestures", FALSE);
+	}
 }
 
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
index c6e75fc..1cac60a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -51,7 +51,7 @@
 	     left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" />
   <slider bottom_delta="-20" control_name="AudioLevelGestures" follows="left|top|right"
        height="15" increment="0.05" initial_val="0.5" label="Gestures:"
-       label_width="55" left="10" max_val="1" min_val="0" name="Gestures"
+       label_width="55" left="10" max_val="1" min_val="0" name="Gestures Volume"
        show_text="false" volume="true" width="180" />
   <button bottom_delta="0" control_name="MuteGestures" follows="top|right" height="16"
 	     image_selected="icn_speaker-muted_dark.tga"
-- 
cgit v1.1