STORM-1612 WIP Implemented new click-to-walk/teleport preferences design.

1 files changed, 48 insertions, 84 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 5a70acddeb..cb547d7c6b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -201,100 +201,64 @@
    length="1"
    height="10"
    layout="topleft"
-   left="259"
-   name="single_click_lbl"
-   width="100"
-   top_pad="10">
-   Single-Click
+   left="86"
+   name="single_click_action_lbl"
+   width="150"
+   top_pad="20">
+   Single click on land:
   </text>
+  <combo_box
+   height="23"
+   layout="topleft"
+   left_pad="10"
+   top_delta="-6"
+   name="single_click_action_combo"
+   width="200">
+    <combo_box.item
+     label="No action"
+     name="0"
+     value="0"/>
+    <combo_box.item
+     label="Move to clicked point"
+     name="1"
+     value="1"/>
+    <combo_box.commit_callback
+     function="Pref.ClickActionChange"/>
+  </combo_box>
   <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
+   left="86"
+   name="double_click_action_lbl"
+   width="150"
+   top_pad="12">
+   Double click on land:
   </text>
-  <check_box
-   follows="left|top"
-   height="20"
-   label="Walk to Click Point:"
-   layout="topleft"
-   left="83"
-   name="walk_to_chkbox"
-   width="237"
-   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="Teleport to Click Point:"
-   layout="topleft"
-   left="83"
-   name="teleport_to_chkbox"
-   width="237"
-   top_pad="0">
-   <check_box.commit_callback
-    function="Pref.CommitClickToTeleportCheckbox"/>
-  </check_box>
-  <radio_group
-   height="20"
+  <combo_box
+   height="23"
    layout="topleft"
-   left="280"
-   top_delta="3"
-   name="teleport_trigger_radio"
+   left_pad="10"
+   top_delta="-6"
+   name="double_click_action_combo"
    width="200">
-    <radio_item
-     height="16"
-     label=""
-     layout="topleft"
-     left="0"
-     name="teleport_single_click"
-     top_delta="20"
-     width="110" />
-    <radio_item
-     height="16"
-     label=""
-     left_pad="0"
-     layout="topleft"
-     name="teleport_double_click"
-     top_delta="0"
-     width="75" />
-    <radio_group.commit_callback
-	     function="Pref.CommitTeleportTriggerRadio"/>
-  </radio_group>
+    <combo_box.item
+     label="No action"
+     name="0"
+     value="0"/>
+    <combo_box.item
+     label="Move to clicked point"
+     name="1"
+     value="1"/>
+    <combo_box.item
+     label="Teleport to clicked point"
+     name="2"
+     value="2"/>
+    <combo_box.commit_callback
+     function="Pref.ClickActionChange"/>
+  </combo_box>
   <button
    height="23"
    label="Other Devices"