From e1b9109bee7c2e1dc2a6d9b6385beb56f74a941f Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 29 Nov 2010 00:23:02 +0100
Subject: [PATCH] I hate being unsat when pressing ESC

---
 indra/newview/app_settings/settings.xml           | 15 +++++++++++++--
 indra/newview/llagent.cpp                         | 13 +++++++------
 indra/newview/llpanelinput.cpp                    |  2 ++
 .../default/xui/en-us/panel_preferences_input.xml |  5 +++++
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4e370312a..ffe6f01e9 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10,8 +10,19 @@
 	</array-->
 	
 	<!-- !!! settings_ascent.xml -->
-
-
+		
+		
+		<key>SianaUnsitOnCamReset</key>
+		<map>
+			<key>Comment</key>
+			<string>Make avatar stand up when camera is reset to 3rd Person View</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>Boolean</string>
+			<key>Value</key>
+			<integer>0</integer>
+		</map>
 		<key>PhoenixNameSystem</key>
 		<map>
 		  <key>Comment</key>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index a4318a8e9..c7f0936ef 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4191,15 +4191,16 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
 		return;
 	}
 
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
-	if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) )
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) +SG
+	if ( (!gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) 
+			&& (mAvatarObject.notNull()) 
+			&& (mAvatarObject->mIsSitting) 
+			&& gSavedSettings.getBOOL("SianaUnsitOnCamReset"))
 	{
-		return;
+		setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
 	}
 // [/RLVa:KB]
-
-	setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
-
+	
 	gViewerWindow->getWindow()->resetBusyCount();
 
 	mCameraZoomFraction = INITIAL_ZOOM_FRACTION;
diff --git a/indra/newview/llpanelinput.cpp b/indra/newview/llpanelinput.cpp
index d1666f647..685f9a7fb 100644
--- a/indra/newview/llpanelinput.cpp
+++ b/indra/newview/llpanelinput.cpp
@@ -64,6 +64,7 @@ BOOL LLPanelInput::postBuild()
 	childSetValue("invert_mouse", gSavedSettings.getBOOL("InvertMouse"));
 	childSetValue("edit_camera_movement", gSavedSettings.getBOOL("EditCameraMovement"));
 	childSetValue("appearance_camera_movement", gSavedSettings.getBOOL("AppearanceCameraMovement"));
+	childSetValue("unsit_on_camera_reset", gSavedSettings.getBOOL("SianaUnsitOnCamReset"));
 	childSetValue("first_person_avatar_visible", gSavedSettings.getBOOL("FirstPersonAvatarVisible"));
 
 	LLSliderCtrl* fov_slider = getChild<LLSliderCtrl>("camera_fov");
@@ -91,6 +92,7 @@ void LLPanelInput::apply()
 	gSavedSettings.setBOOL("InvertMouse", childGetValue("invert_mouse"));
 	gSavedSettings.setBOOL("EditCameraMovement", childGetValue("edit_camera_movement"));
 	gSavedSettings.setBOOL("AppearanceCameraMovement", childGetValue("appearance_camera_movement"));
+	gSavedSettings.setBOOL("SianaUnsitOnCamReset", childGetValue("unsit_on_camera_reset"));
 	gSavedSettings.setF32("CameraAngle", mPreAdjustFOV);
 	gSavedSettings.setBOOL("FirstPersonAvatarVisible", childGetValue("first_person_avatar_visible"));
 }
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index 69b74e882..4af729364 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -68,6 +68,11 @@
 	     label="Automatic Appearance Camera Movement" left="148" mouse_opaque="true"
 	     name="appearance_camera_movement" radio_style="false"
 	     tool_tip="Use automatic camera positioning while in edit mode" width="242" />
+	<check_box bottom_delta="-18" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+	     label="Unsit Avatar on Camera Reset" left="148" mouse_opaque="true"
+	     name="unsit_on_camera_reset" radio_style="false"
+	     tool_tip="Stand up automatically when you press Esc and the camera switches to third person mode" width="242" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	     bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"