From 4ca50ce9bffc9a95a1c52a4fdcb8818df769bb11 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 9 Jun 2010 07:58:03 -0700
Subject: Moved 'Mute wind' into Preferences > Audio, rearranged the audio
preferences a little
---
linden/indra/newview/llpanelaudioprefs.cpp | 8 +++++
linden/indra/newview/llpanelaudioprefs.h | 2 +-
linden/indra/newview/llprefsadvanced.cpp | 2 --
.../xui/en-us/panel_preferences_advanced.xml | 4 ---
.../default/xui/en-us/panel_preferences_audio.xml | 42 +++++++++++++---------
5 files changed, 35 insertions(+), 23 deletions(-)
(limited to 'linden')
diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp
index 7ad8712..2bb3ab4 100644
--- a/linden/indra/newview/llpanelaudioprefs.cpp
+++ b/linden/indra/newview/llpanelaudioprefs.cpp
@@ -91,6 +91,7 @@ BOOL LLPanelAudioPrefs::postBuild()
{
refreshValues(); // initialize member data from saved settings
childSetLabelArg("L$ Change Threshold", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+ childSetValue("mute_wind_check", !gSavedSettings.getBOOL("MuteWind"));
return TRUE;
}
@@ -117,6 +118,13 @@ void LLPanelAudioPrefs::refreshValues()
mPreviousMuteWhenMinimized = gSavedSettings.getBOOL("MuteWhenMinimized");
}
+void LLPanelAudioPrefs::apply()
+{
+ refreshValues();
+
+ gSavedSettings.setBOOL("MuteWind", !(BOOL)(childGetValue("mute_wind_check").asBoolean()));
+}
+
void LLPanelAudioPrefs::cancel()
{
gSavedSettings.setF32("AudioLevelMaster", mPreviousVolume );
diff --git a/linden/indra/newview/llpanelaudioprefs.h b/linden/indra/newview/llpanelaudioprefs.h
index 08009c9..21d2f59 100644
--- a/linden/indra/newview/llpanelaudioprefs.h
+++ b/linden/indra/newview/llpanelaudioprefs.h
@@ -48,7 +48,7 @@ public:
LLPanelAudioPrefs();
virtual ~LLPanelAudioPrefs();
- void apply() { refreshValues(); }
+ void apply();
void cancel(); // Cancel the changed values.
virtual BOOL postBuild();
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index a4c0dc2..d96f97e 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -61,7 +61,6 @@ BOOL LLPrefsAdvanced::postBuild()
childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval"));
childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
- childSetValue("mute_wind_check", !gSavedSettings.getBOOL("MuteWind"));
refresh();
@@ -77,7 +76,6 @@ void LLPrefsAdvanced::apply()
gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
- gSavedSettings.setBOOL("MuteWind", !(BOOL)(childGetValue("mute_wind_check").asBoolean()));
gSavedSettings.setBOOL("UseServersideWindlightSettings", childGetValue("windlight_check"));
// Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index d1a7489..6766cf3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -52,10 +52,6 @@
tool_tip="Toggle editing animation and standing up when entering appearance mode"
label="Animate avatar when editing appearance" left="12" mouse_opaque="true"
name="appearance_anim_check" radio_style="false" width="217" />
-