1 files changed, 118 insertions, 30 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 1a8aae7f91..5a70acddeb 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -105,16 +105,61 @@
 	 mouse_opaque="false"
 	 visible="true"
 	 width="18"
-   top_pad="2"
+   top_pad="10"
    left="30" />
+  <text
+   follows="left|top"
+   type="string"
+   length="1"
+   height="10"
+   layout="topleft"
+   left="78"
+   name="keyboard_lbl"
+   width="270"
+   top_delta="2">
+   Keyboard:
+  </text>
+  <check_box
+   control_name="ArrowKeysAlwaysMove"
+   follows="left|top"
+   height="20"
+   label="Arrow keys always move me"
+   layout="topleft"
+   left_delta="5"
+   name="arrow_keys_move_avatar_check"
+   width="237"
+   top_pad="5"/>
+  <check_box
+   control_name="AllowTapTapHoldRun"
+   follows="left|top"
+   height="20"
+   label="Tap-tap-hold to run"
+   layout="topleft"
+   left_delta="0"
+   name="tap_tap_hold_to_run"
+   width="237"
+   top_pad="0"/>
+  <text
+   follows="left|top"
+   type="string"
+   length="1"
+   height="10"
+   layout="topleft"
+   left="78"
+   name="mouse_lbl"
+   width="270"
+   top_pad="15">
+   Mouse:
+  </text>
   <check_box
    control_name="FirstPersonAvatarVisible"
    follows="left|top"
    height="20"
    label="Show me in Mouselook"
    layout="topleft"
-   left_pad="30"
+   left_delta="5"
    name="first_person_avatar_visible"
+   top_pad="5"
    width="256" />
   <text
    type="string"
@@ -136,7 +181,7 @@
    initial_value="2"
    layout="topleft"
    show_text="false"
-   left_pad="5"
+   left_pad="0"
    max_val="15"
    name="mouse_sensitivity"
    top_delta="-1"
@@ -150,62 +195,105 @@
    name="invert_mouse"
    top_delta="0"
    width="128" />
-  <check_box
-   control_name="ArrowKeysAlwaysMove"
+  <text
    follows="left|top"
-   height="20"
-   label="Arrow keys always move me"
+   type="string"
+   length="1"
+   height="10"
    layout="topleft"
-   left="78"
-   name="arrow_keys_move_avatar_check"
-   width="237"
-   top_pad="10"/>
+   left="259"
+   name="single_click_lbl"
+   width="100"
+   top_pad="10">
+   Single-Click
+  </text>
+  <text
+   follows="left|top"
+   type="string"
+   length="1"
+   height="10"
+   layout="topleft"
+   left="368"
+   name="double_click_lbl"
+   width="100"
+   top_delta="0">
+   Double-Click
+  </text>
   <check_box
-   control_name="AllowTapTapHoldRun"
    follows="left|top"
    height="20"
-   label="Tap-tap-hold to run"
+   label="Walk to Click Point:"
    layout="topleft"
-   left_delta="0"
-   name="tap_tap_hold_to_run"
+   left="83"
+   name="walk_to_chkbox"
    width="237"
-   top_pad="0"/>
+   top_pad="7">
+   <check_box.commit_callback
+    function="Pref.CommitClickToWalkCheckbox"/>
+  </check_box>
+  <radio_group
+   height="20"
+   layout="topleft"
+   left="280"
+   top_delta="3"
+   name="walk_trigger_radio"
+   width="200">
+    <radio_item
+     height="16"
+     label=""
+     layout="topleft"
+     left="0"
+     name="walk_single_click"
+     top_delta="20"
+     width="110" />
+    <radio_item
+     height="16"
+     label=""
+     left_pad="0"
+     layout="topleft"
+     name="walk_double_click"
+     top_delta="0"
+     width="75" />
+    <radio_group.commit_callback
+	     function="Pref.CommitWalkTriggerRadio"/>
+  </radio_group>
   <check_box
    follows="left|top"
    height="20"
-   label="Double-Click to:"
+   label="Teleport to Click Point:"
    layout="topleft"
-   left_delta="0"
-   name="double_click_chkbox"
+   left="83"
+   name="teleport_to_chkbox"
    width="237"
    top_pad="0">
    <check_box.commit_callback
-    function="Pref.CommitDoubleClickChekbox"/>
+    function="Pref.CommitClickToTeleportCheckbox"/>
   </check_box>
   <radio_group
-     height="20"
-     layout="topleft"
-     left_delta="17"
-     top_pad="2"
-     name="double_click_action">
+   height="20"
+   layout="topleft"
+   left="280"
+   top_delta="3"
+   name="teleport_trigger_radio"
+   width="200">
     <radio_item
      height="16"
-     label="Teleport"
+     label=""
      layout="topleft"
      left="0"
-     name="radio_teleport"
+     name="teleport_single_click"
      top_delta="20"
      width="110" />
     <radio_item
      height="16"
-     label="Auto-pilot"
+     label=""
      left_pad="0"
      layout="topleft"
-     name="radio_autopilot"
+     name="teleport_double_click"
      top_delta="0"
      width="75" />
     <radio_group.commit_callback
-	     function="Pref.CommitRadioDoubleClick"/>
+	     function="Pref.CommitTeleportTriggerRadio"/>
   </radio_group>
   <button
    height="23"