From d98f95c5178747d947b19403da379e49911abfdc Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 25 May 2010 17:57:53 -0700
Subject: Changed AppearanceForceStand to AppearanceAnimate, made it toggle
 both standing up and animating the avatar when editing appearance

---
 linden/indra/newview/app_settings/settings.xml                      | 4 ++--
 linden/indra/newview/llagent.cpp                                    | 6 +++---
 linden/indra/newview/llprefsadvanced.cpp                            | 4 ++--
 .../newview/skins/default/xui/en-us/panel_preferences_advanced.xml  | 5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 333c8b5..5043264 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4,10 +4,10 @@
   
   <!-- Imprudence-specific settings -->
 
-  <key>AppearanceForceStand</key>
+  <key>AppearanceAnimate</key>
   <map>
     <key>Comment</key>
-    <string>Unsit avatar when entering appearance mode?</string>
+    <string>Play appearance anim and unsit avatar when entering appearance mode?</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 1a65cb1..859f7f6 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -4299,14 +4299,14 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
 	}
 
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
-	if(gSavedSettings.getBOOL("AppearanceForceStand"))
+	if(gSavedSettings.getBOOL("AppearanceAnimate"))
 	if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) )
 	{
 		return;
 	}
 // [/RLVa:KB]
 
-	if(gSavedSettings.getBOOL("AppearanceForceStand"))
+	if(gSavedSettings.getBOOL("AppearanceAnimate"))
 		setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
 	gViewerWindow->getWindow()->resetBusyCount();
 
@@ -4350,7 +4350,7 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
 
 	if (mAvatarObject.notNull())
 	{
-		if(avatar_animate)
+		if(avatar_animate && gSavedSettings.getBOOL("AppearanceAnimate"))
 		{
 				// Remove any pitch from the avatar
 			LLVector3 at = mFrameAgent.getAtAxis();
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index e109818..070422b 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -59,7 +59,7 @@ BOOL LLPrefsAdvanced::postBuild()
 	childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
 	childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
 	childSetValue("speed_rez_interval_spinner", (F32)gSavedSettings.getU32("SpeedRezInterval"));
-	childSetValue("appearance_stand_check", gSavedSettings.getBOOL("AppearanceForceStand"));
+	childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
 	childSetValue("mute_wind_check", !gSavedSettings.getBOOL("MuteWind"));
 
 	refresh();
@@ -75,7 +75,7 @@ void LLPrefsAdvanced::apply()
 	gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check"));
 	gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
 	gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
-	gSavedSettings.setBOOL("AppearanceForceStand", childGetValue("appearance_stand_check"));
+	gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
 	gSavedSettings.setBOOL("MuteWind", !(BOOL)(childGetValue("mute_wind_check").asBoolean()));
 
 	// 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 9c769de..640385a 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
@@ -45,8 +45,9 @@
   </text>
   <check_box bottom_delta="-25" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="Stand when editing appearance" left="12" mouse_opaque="true"
-       name="appearance_stand_check" radio_style="false" width="217" />
+       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" />
   <check_box bottom_delta="-25" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
        label="Enable Wind" left="12" mouse_opaque="true"
-- 
cgit v1.1