diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f9524946b..3b25f4731 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2,104 +2,71 @@
 <llsd>
 <map>
 	<!--Expanded settings from Vanilla SL -->
-  <key>AscentDisplayTotalScriptJumps</key>
-  <map>
-    <key>Comment</key>
-    <string>Shows large changes to the sim script count in chat.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
-  <key>Ascentnumscriptdiff</key>
-  <map>
-    <key>Comment</key>
-    <string>The delta to spam you the script jump difference</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>F32</string>
-    <key>Value</key>
-    <real>100.0</real>
-  </map>
-  <key>AscentAvatarXModifier</key>
-  <map>
-    <key>Comment</key>
-    <string>Avatar position modifier (X)</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>F32</string>
-    <key>Value</key>
-    <real>0.0</real>
-  </map>
-  <key>AscentAvatarYModifier</key>
-  <map>
-    <key>Comment</key>
-    <string>Avatar position modifier (Y)</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>F32</string>
-    <key>Value</key>
-    <real>0.0</real>
-  </map>
-  <key>AscentAvatarZModifier</key>
-  <map>
-    <key>Comment</key>
-    <string>Avatar position modifier (Z)</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>F32</string>
-    <key>Value</key>
-    <real>0.0</real>
-  </map>
-  <key>Ascentnumscripts</key>
-  <map>
-    <key>Comment</key>
-    <string>temp..</string>
-    <key>Persist</key>
-    <integer>0</integer>
-    <key>Type</key>
-    <string>F32</string>
-    <key>Value</key>
-    <real>0.0</real>
-  </map>
+	<key>AscentAvatarXModifier</key>
+	<map>
+		<key>Comment</key>
+		<string>Avatar position modifier (X)</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>F32</string>
+		<key>Value</key>
+		<real>0.0</real>
+	</map>
+	<key>AscentAvatarYModifier</key>
+	<map>
+		<key>Comment</key>
+		<string>Avatar position modifier (Y)</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>F32</string>
+		<key>Value</key>
+		<real>0.0</real>
+	</map>
+	<key>AscentAvatarZModifier</key>
+	<map>
+		
+		<string>Avatar position modifier (Z)</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>F32</string>
+		<key>Value</key>
+		<real>0.0</real>
+	</map>
 	<key>AscentBuildAlwaysEnabled</key>
     <map>
-      <key>Comment</key>
-      <string>Show build option regardless of whether you can (May not mean you can actually build there)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
+		<key>Comment</key>
+		<string>Show build option regardless of whether you can (May not mean you can actually build there)</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>1</integer>
     </map>
 	<key>AscentDisableMinZoomDist</key>
     <map>
-      <key>Comment</key>
-      <string>Allows much closer camera zooming.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
+		<key>Comment</key>
+		<string>Allows much closer camera zooming.</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>1</integer>
     </map>
 	<key>AscentFlyAlwaysEnabled</key>
     <map>
-      <key>Comment</key>
-      <string>Always allow fly (Does actually always allow flight)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
+		<key>Comment</key>
+		<string>Always allow fly (Does actually always allow flight)</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>0</integer>
     </map>
 	<key>AscentDisableMinZoomDist</key>
 	<map>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index aed6d73ee..2d34dd83f 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -889,6 +889,13 @@ void LLAgent::togglePhantom()
 	setPhantom( phan );
 }
 
+void LLAgent::toggleTPosed()
+{
+	BOOL posed = !(mForceTPose);
+
+	setTPosed(posed);
+}
+
 
 //-----------------------------------------------------------------------------
 // setRegion()
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 18f1cbd38..10e9f1a2c 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -414,6 +414,10 @@ public:
 	static void			setPhantom(BOOL phantom);
 	static void			togglePhantom();
 
+	static BOOL			isTPosed() { return mForceTPose; };
+	static void			setTPosed(BOOL TPose) { mForceTPose = TPose };
+	static void			toggleTPosed();
+
 	// Does this parcel allow you to fly?
 	BOOL canFly();
 
@@ -816,7 +820,7 @@ public:
 
 private:
 	static BOOL exlPhantom;
-
+	static BOOL mForceTPose;
 	bool mbTeleportKeepsLookAt; // try to keep look-at after teleport is complete
 	bool mbAlwaysRun; // should the avatar run by default rather than walk
 	bool mbRunning;	// is the avatar trying to run right now