From 36a698fee42ba96aa720d9564947308901f929a3 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Sun, 16 Dec 2012 20:50:40 -0500
Subject: [PATCH] Satisfy Issue 271: Fly after teleport feature.

Add debug setting LiruFlyAfterTeleports
Add Always fly after Teleports to General tab of System preferences.
(Also, fixed tabs where spaces should be in settings.xml)
---
 indra/newview/app_settings/settings.xml       | 25 +++++++++++++------
 indra/newview/ascentprefssys.cpp              |  2 ++
 indra/newview/ascentprefssys.h                |  1 +
 indra/newview/llviewermessage.cpp             |  3 ++-
 .../en-us/panel_preferences_ascent_system.xml |  1 +
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 540eb44c8..340e0dc8e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -692,22 +692,33 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
-	</map>
-    <key>LiruNoTransactionClutter</key>
+    </map>
+    <key>LiruFlyAfterTeleport</key>
     <map>
       <key>Comment</key>
-	  <string>Use notifytips for transactions instead of notifys, this way they do not collect in the top right of the screen.</string>
+      <string>Fly after teleports</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-	  <integer>0</integer>
-	</map>
+      <integer>1</integer>
+    </map>
+    <key>LiruNoTransactionClutter</key>
+    <map>
+      <key>Comment</key>
+      <string>Use notifytips for transactions instead of notifys, this way they do not collect in the top right of the screen.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>LiruSensibleARC</key>
     <map>
       <key>Comment</key>
-	  <string>Use the old-style way to calculate Avatar Render Cost.
+      <string>Use the old-style way to calculate Avatar Render Cost.
 Found in Advanced->Rendering->Info Displays</string>
       <key>Persist</key>
       <integer>1</integer>
@@ -715,7 +726,7 @@ Found in Advanced->Rendering->Info Displays</string>
       <string>Boolean</string>
       <key>Value</key>
       <integer>1</integer>
-	</map>
+    </map>
     <key>MarketImporterUpdateFreq</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index f8eac7fec..72a1fd25a 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -267,6 +267,7 @@ void LLPrefsAscentSys::refreshValues()
     mDoubleClickTeleport		= gSavedSettings.getBOOL("DoubleClickTeleport");
         mResetCameraAfterTP		= gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
         mOffsetTPByUserHeight	= gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
+    mLiruFlyAfterTeleport		= gSavedSettings.getBOOL("LiruFlyAfterTeleport");
     mPreviewAnimInWorld			= gSavedSettings.getBOOL("PreviewAnimInWorld");
     mSaveScriptsAsMono			= gSavedSettings.getBOOL("SaveInventoryScriptsAsMono");
     mAlwaysRezInGroup			= gSavedSettings.getBOOL("AscentAlwaysRezInGroup");
@@ -416,6 +417,7 @@ void LLPrefsAscentSys::cancel()
     gSavedSettings.setBOOL("DoubleClickTeleport", mDoubleClickTeleport);
         gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP);
         gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight);
+    gSavedSettings.setBOOL("LiruFlyAfterTeleport", mLiruFlyAfterTeleport);
     gSavedSettings.setBOOL("PreviewAnimInWorld", mPreviewAnimInWorld);
     gSavedSettings.setBOOL("SaveInventoryScriptsAsMono", mSaveScriptsAsMono);
     gSavedSettings.setBOOL("AscentAlwaysRezInGroup", mAlwaysRezInGroup);
diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h
index 336828999..806325ff8 100644
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -58,6 +58,7 @@ protected:
     BOOL mDoubleClickTeleport;
         BOOL mResetCameraAfterTP;
         BOOL mOffsetTPByUserHeight;
+    bool mLiruFlyAfterTeleport;
     BOOL mPreviewAnimInWorld;
     BOOL mSaveScriptsAsMono;
     BOOL mAlwaysRezInGroup;
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index e5c7dbcb3..c2bffd0aa 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -6844,8 +6844,9 @@ void process_teleport_local(LLMessageSystem *msg,void**)
 		}
 	}
 
+	static LLCachedControl<bool> fly_after_tp(gSavedSettings, "LiruFlyAfterTeleport");
 	// Sim tells us whether the new position is off the ground
-	if (teleport_flags & TELEPORT_FLAGS_IS_FLYING)
+	if (fly_after_tp || (teleport_flags & TELEPORT_FLAGS_IS_FLYING))
 	{
 		gAgent.setFlying(TRUE);
 	}
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index 5412db7df..026e99f8a 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -9,6 +9,7 @@
 		label="Reset camera after teleporting" tool_tip="Centers the camera behind you after a local teleport." name="center_after_teleport_check"/>
       <check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
         label="Offset TP target by half agent height" tool_tip="Tries to aim the TP so that your feet land at the point you're aiming for." name="offset_teleport_check"/>
+      <check_box left="10" follows="top" bottom_delta="-20" control_name="LiruFlyAfterTeleport" name="fly_after_tp" label="Always fly after teleports" tool_tip="Avoid those falls from great heights by automatically flying after teleporting in."/>
       <check_box left="10" bottom_delta="-20" control_name="PreviewAnimInWorld" follows="top" initial_value="false"
         label="Preview animations on the avatar instead on a dummy before uploading" tool_tip="The Animation upload window will play animations on your avatar when previewing them." name="preview_anim_in_world_check"/>
       <check_box bottom_delta="-20" control_name="SaveInventoryScriptsAsMono" follows="left|top" initial_value="true"