diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index 278084f6e..a2c577d0d 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -144,6 +144,7 @@ void LLPrefsAscentSys::refreshValues()
 {
     //General -----------------------------------------------------------------------------
     mDoubleClickTeleport		= gSavedSettings.getBOOL("DoubleClickTeleport");
+    mDoubleClickAutoPilot		= gSavedSettings.getBOOL("DoubleClickAutoPilot");
         mResetCameraAfterTP		= gSavedSettings.getBOOL("OptionRotateCamAfterLocalTP");
         mOffsetTPByUserHeight	= gSavedSettings.getBOOL("OptionOffsetTPByAgentHeight");
 	mClearBeaconAfterTeleport	= gSavedSettings.getBOOL("ClearBeaconAfterTeleport");
@@ -293,6 +294,7 @@ void LLPrefsAscentSys::cancel()
 {
     //General -----------------------------------------------------------------------------
     gSavedSettings.setBOOL("DoubleClickTeleport", mDoubleClickTeleport);
+    gSavedSettings.setBOOL("DoubleClickAutoPilot", mDoubleClickAutoPilot);
         gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP);
         gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight);
 	gSavedSettings.setBOOL("ClearBeaconAfterTeleport", mClearBeaconAfterTeleport);
diff --git a/indra/newview/ascentprefssys.h b/indra/newview/ascentprefssys.h
index c23023447..ae7a07cab 100644
--- a/indra/newview/ascentprefssys.h
+++ b/indra/newview/ascentprefssys.h
@@ -54,6 +54,7 @@ protected:
 private:
 	//General -----------------------------------------------------------------------------
 	bool mDoubleClickTeleport;
+	bool mDoubleClickAutoPilot;
 	bool mResetCameraAfterTP;
 	bool mOffsetTPByUserHeight;
 	bool mClearBeaconAfterTeleport;
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 475211660..84c37dd54 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
@@ -6,7 +6,7 @@
       <text left="12" bottom_delta="-20" follows="top" name="double_click_text" value="Enable double-click"/>
       <check_box left_delta="105" bottom_delta="-5" control_name="DoubleClickTeleport" follows="top"
         label="teleport" tool_tip="Double-clicking on an object/person will teleport you to that location." name="double_click_teleport_check"/>
-      <check_box left_delta="67" bottom_delta="0" control_name="DoubleClickAutopilot" follows="top" label="autopilot" tool_tip="Double-clicking on something will make you walk to that location." name="double_click_autopilot_check"/>
+      <check_box left_delta="67" bottom_delta="0" control_name="DoubleClickAutoPilot" follows="top" label="autopilot" tool_tip="Double-clicking on something will make you walk to that location." name="double_click_autopilot_check"/>
       <check_box enabled_control="DoubleClickTeleport" 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 enabled_control="DoubleClickTeleport" bottom_delta="-18" control_name="OptionOffsetTPByAgentHeight" follows="left|top" font="SansSerifSmall" height="16" initial_value="false"