From 258d39e43290da946c9af56abd9d768fe236ec73 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Thu, 27 Jun 2013 05:55:05 -0400
Subject: [PATCH] Coffee time.

---
 indra/newview/ascentprefssys.cpp                 | 16 ++++++++--------
 indra/newview/ascentprefssys.h                   |  8 ++++----
 .../en-us/panel_preferences_ascent_system.xml    | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index aac95de2b..e0ec4a745 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -223,8 +223,8 @@ void LLPrefsAscentSys::refreshValues()
 {
     //General -----------------------------------------------------------------------------
     mDoubleClickTeleport		= gSavedSettings.getBOOL("DoubleClickTeleport");
-    mResetCameraAfterTP		= gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
-    mOffsetTPByUserHeight	= gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
+        mResetCameraAfterTP		= gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
+        mOffsetTPByUserHeight	= gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
 	mClearBeaconAfterTeleport	= gSavedSettings.getBOOL("ClearBeaconAfterTeleport");
     mLiruFlyAfterTeleport		= gSavedSettings.getBOOL("LiruFlyAfterTeleport");
     mLiruContinueFlying			= gSavedSettings.getBOOL("LiruContinueFlyingOnUnsit");
@@ -238,9 +238,9 @@ void LLPrefsAscentSys::refreshValues()
     mFetchInventoryOnLogin		= gSavedSettings.getBOOL("FetchInventoryOnLogin");
     mEnableLLWind				= gSavedSettings.getBOOL("WindEnabled");
     mEnableClouds				= gSavedSettings.getBOOL("CloudsEnabled");
-    mEnableClassicClouds		= gSavedSettings.getBOOL("SkyUseClassicClouds");
+        mEnableClassicClouds		= gSavedSettings.getBOOL("SkyUseClassicClouds");
     mSpeedRez					= gSavedSettings.getBOOL("SpeedRez");
-    mSpeedRezInterval			= gSavedSettings.getU32("SpeedRezInterval");
+        mSpeedRezInterval			= gSavedSettings.getU32("SpeedRezInterval");
 
     //Command Line ------------------------------------------------------------------------
     mCmdLine                    = gSavedSettings.getBOOL("AscentCmdLine");
@@ -374,8 +374,8 @@ void LLPrefsAscentSys::cancel()
 {
     //General -----------------------------------------------------------------------------
     gSavedSettings.setBOOL("DoubleClickTeleport", mDoubleClickTeleport);
-    gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP);
-    gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight);
+        gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP);
+        gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight);
 	gSavedSettings.setBOOL("ClearBeaconAfterTeleport", mClearBeaconAfterTeleport);
     gSavedSettings.setBOOL("LiruFlyAfterTeleport", mLiruFlyAfterTeleport);
     gSavedSettings.setBOOL("LiruContinueFlyingOnUnsit", mLiruContinueFlying);
@@ -388,9 +388,9 @@ void LLPrefsAscentSys::cancel()
     gSavedSettings.setBOOL("FetchInventoryOnLogin", mFetchInventoryOnLogin);
     gSavedSettings.setBOOL("WindEnabled", mEnableLLWind);
     gSavedSettings.setBOOL("CloudsEnabled", mEnableClouds);
-    gSavedSettings.setBOOL("SkyUseClassicClouds", mEnableClassicClouds);
+        gSavedSettings.setBOOL("SkyUseClassicClouds", mEnableClassicClouds);
     gSavedSettings.setBOOL("SpeedRez", mSpeedRez);
-    gSavedSettings.setU32("SpeedRezInterval", mSpeedRezInterval);
+        gSavedSettings.setU32("SpeedRezInterval", mSpeedRezInterval);
 
     //Command Line ------------------------------------------------------------------------
     gSavedSettings.setBOOL("AscentCmdLine",                 mCmdLine);
diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h
index e449f89b8..9dbd3f78b 100644
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -54,8 +54,8 @@ protected:
 
     //General -----------------------------------------------------------------------------
     BOOL mDoubleClickTeleport;
-    BOOL mResetCameraAfterTP;
-    BOOL mOffsetTPByUserHeight;
+        BOOL mResetCameraAfterTP;
+        BOOL mOffsetTPByUserHeight;
     bool mClearBeaconAfterTeleport;
     bool mLiruFlyAfterTeleport;
     bool mLiruContinueFlying;
@@ -69,9 +69,9 @@ protected:
     BOOL mFetchInventoryOnLogin;
     BOOL mEnableLLWind;
     BOOL mEnableClouds;
-    BOOL mEnableClassicClouds;
+        BOOL mEnableClassicClouds;
     BOOL mSpeedRez;
-    U32 mSpeedRezInterval;
+        U32 mSpeedRezInterval;
 
     //Command Line ------------------------------------------------------------------------
     BOOL mCmdLine;
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 ae33505e5..33614f1b8 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
@@ -5,8 +5,8 @@
     <panel border="true" left="1" bottom="-408" height="408" width="500" label="General" name="User Interface">
       <check_box left="10" bottom_delta="-25" control_name="DoubleClickTeleport" follows="top" initial_value="false"
         label="Enable teleporting via double-click in-world" tool_tip="Double-clicking on an object/person will teleport you to that location." name="double_click_teleport_check"/>
-      <check_box left="20" bottom_delta="-18" control_name="OptionRotateCamAfterLocalTP" follows="top" initial_value="false"
-        label="Reset camera after teleporting" tool_tip="Centers the camera behind you after a local teleport." name="center_after_teleport_check"/>
+	<check_box left="20" bottom_delta="-18" control_name="OptionRotateCamAfterLocalTP" follows="top" initial_value="false"
+		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="-18" 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="-18" control_name="ClearBeaconAfterTeleport" name="clear_beacon_after_tp" label="Clear red destination beacon after teleporting"/>
@@ -113,9 +113,9 @@
         <combo_item name="Rubber" value="Rubber">Rubber</combo_item>
       </combo_box>
       <text bottom="-19" left_delta="85" name="text_box7" halign="center" width="115">Next Owner Perms</text>
-      <check_box follows="top" height="16" initial_value="false" label="Copy permission" tool_tip="Next owner can make copies of creations" name="next_owner_copy" control_name="NextOwnerCopy"/>
-      <check_box follows="top" height="16" initial_value="false" label="Modify permission" tool_tip="Next owner can edit creations" name="next_owner_modify" control_name="NextOwnerModify"/>
-      <check_box follows="top" height="16" initial_value="true" label="Transfer permission" tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
+        <check_box follows="top" height="16" initial_value="false" label="Copy permission" tool_tip="Next owner can make copies of creations" name="next_owner_copy" control_name="NextOwnerCopy"/>
+        <check_box follows="top" height="16" initial_value="false" label="Modify permission" tool_tip="Next owner can edit creations" name="next_owner_modify" control_name="NextOwnerModify"/>
+        <check_box follows="top" height="16" initial_value="true" label="Transfer permission" tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
       <check_box bottom="-131" left="5" follows="top" height="16" label="Phantom" name="EmPhantomToggle" control_name="EmeraldBuildPrefs_Phantom"/>
       <check_box follows="top" height="16" label="Physical" name="EmPhysicalToggle" control_name="EmeraldBuildPrefs_Physical"/>
       <check_box follows="top" height="16" label="Temporary" name="EmTemporaryToggle" control_name="EmeraldBuildPrefs_Temporary"/>
@@ -132,7 +132,7 @@
         <combo_item name="High" value="High">High</combo_item>
       </combo_box>
       <check_box name="EmeraldBuildPrefsEmbedItem" left="5" bottom_delta="-20" follows="top" initial_value="false" label="Put an item into new objects" control_name="EmeraldBuildPrefs_EmbedItem"/>
-      <drop_target control_name="EmeraldBuildPrefs_Item" bottom_delta="-5" left="10" height="15" name="build_item_add_disp_rect" width="270"/>
+       <drop_target control_name="EmeraldBuildPrefs_Item" bottom_delta="-5" left="10" height="15" name="build_item_add_disp_rect" width="270"/>
       <check_box bottom_delta="4" follows="top" left_delta="274" label="Highlight selected prims" name="EmBuildPrefsRenderHighlight_toggle" control_name="RenderHighlightSelections"/>
       <check_box bottom_delta="-20" follows="top" initial_value="false" label="Axis arrow on root prim position" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"/>
     </panel>