From 3633ccf1a1077d3e53e7f125d1dd5ed2aaa98906 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 19 Aug 2019 23:16:29 +0300
Subject: SL_6109 Rebinding

---
 .../skins/default/xui/en/floater_preferences.xml   |   7 +
 .../default/xui/en/panel_preferences_controls.xml  | 196 +++++++++++++++++++++
 2 files changed, 203 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_preferences_controls.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 0e62d50072..ee730dcb01 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -169,6 +169,13 @@ https://accounts.secondlife.com/change_email/
          layout="topleft"
          help_topic="preferences_uploads_tab"
          name="uploads" />
+        <panel
+         class="panel_preference_controls"
+         filename="panel_preferences_controls.xml"
+         label="Controls"
+         layout="topleft"
+         help_topic="preferences_controls_tab"
+         name="controls" />
     </tab_container>
 
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
new file mode 100644
index 0000000000..a1a2fd0598
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<panel
+ border="true"
+ follows="all"
+ height="408"
+ label="Controls"
+ layout="topleft"
+ left="102"
+ name="controls"
+ top="1"
+ width="517">
+  <panel.string
+   name="control_view_actions">
+    View Actions
+  </panel.string>
+  <panel.string
+   name="control_about">
+    About/Profile
+  </panel.string>
+  <panel.string
+   name="control_orbit">
+    Orbit
+  </panel.string>
+  <panel.string
+   name="control_pan">
+    Pan
+  </panel.string>
+  <panel.string
+   name="control_world_map">
+    World Map
+  </panel.string>
+  <panel.string
+   name="control_zoom">
+    Zoom
+  </panel.string>
+  <panel.string
+   name="control_interactions">
+    Interactions
+  </panel.string>
+  <panel.string
+   name="control_build">
+    Build
+  </panel.string>
+  <panel.string
+   name="control_drag">
+    Drag
+  </panel.string>
+  <panel.string
+   name="control_edit">
+    Edit
+  </panel.string>
+  <panel.string
+   name="control_menu">
+    Menu
+  </panel.string>
+  <panel.string
+   name="control_open">
+    Open
+  </panel.string>
+  <panel.string
+   name="control_touch">
+    Touch
+  </panel.string>
+  <panel.string
+   name="control_wear">
+    Wear
+  </panel.string>
+  <panel.string
+   name="control_movements">
+    Move Actions
+  </panel.string>
+  <panel.string
+   name="control_moveto">
+    Move To
+  </panel.string>
+  <panel.string
+   name="control_sit">
+    Sit/Stand
+  </panel.string>
+  <panel.string
+   name="control_teleportto">
+    Teleport To
+  </panel.string>
+  <panel.string
+   name="control_forward">
+    Move Forward
+  </panel.string>
+  <panel.string
+   name="control_backward">
+    Move Backward
+  </panel.string>
+  <panel.string
+   name="control_left">
+    Left
+  </panel.string>
+  <panel.string
+   name="control_right">
+    Right
+  </panel.string>
+  <!--(check with move floater)-->
+  <panel.string
+   name="control_lstrafe">
+    Strafe left
+  </panel.string>
+  <panel.string
+   name="control_rstrafe">
+    Strafe right
+  </panel.string>
+  <panel.string
+   name="control_jump">
+    Strafe right
+  </panel.string>
+  <panel.string
+   name="control_down">
+    Strafe right
+  </panel.string>
+  <panel.string
+   name="control_run">
+    Run
+  </panel.string>
+  <panel.string
+   name="control_toggle_run">
+    Toggle Run
+  </panel.string>
+  <panel.string
+   name="control_fly">
+    Fly/Stop flying
+  </panel.string>
+  <panel.string
+   name="control_mediacontent">
+    Sound and Media
+  </panel.string>
+  <panel.string
+   name="control_parcel">
+    Play/Pause Parcel Media
+  </panel.string>
+  <panel.string
+   name="control_media">
+    Play/Stop All Media
+  </panel.string>
+  <panel.string
+   name="control_voice">
+    Voice
+  </panel.string>
+  <panel.string
+   name="control_toggle_voice">
+    Toggle Voice
+  </panel.string>
+  <panel.string
+   name="control_reserved">
+    Reserved Controls
+  </panel.string>
+  <!--
+   name="control_menu" not needed
+   -->
+  <panel.string
+   name="control_reserved_select">
+    Select
+  </panel.string>
+  <panel.string
+   name="control_shift_select">
+    Multi-Select
+  </panel.string>
+  <panel.string
+   name="control_cntrl_select">
+    Add to Selection
+  </panel.string>
+
+  <scroll_list
+   draw_heading="true"
+   follows="all"
+   layout="topleft"
+   column_padding="0"
+   top="3"
+   left="3"
+   bottom="-3"
+   right="-3"
+   multi_select="false"
+   name="controls_list">
+    <scroll_list.columns
+     relative_width="0.34"
+     label="Action"
+     name="lst_action" />
+    <scroll_list.columns
+     relative_width="0.33"
+     label="Primary Control Method"
+     name="lst_ctrl1" />
+    <scroll_list.columns
+     relative_width="0.33"
+     label="Secondary Control Method"
+     name="lst_ctrl2" />
+    <scroll_list.commit_callback
+      function="Pref.CommitControl" />
+  </scroll_list>
+
+</panel>
-- 
cgit v1.2.3


From 4df05c5a8995158922c7b7aacfef442ac8ae6fdd Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 17 Sep 2019 21:36:59 +0300
Subject: SL-6109 Keyaboard support ready

---
 .../skins/default/xui/en/floater_select_key.xml    |  40 ++++-
 .../default/xui/en/panel_preferences_controls.xml  | 161 +++++++++++++++++++--
 2 files changed, 177 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 4e89df5a73..c00b805954 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -7,7 +7,15 @@
  height="90"
  layout="topleft"
  name="modal container"
- width="240">
+ width="272">
+  <floater.string
+   name="keyboard">
+    Keyboard
+  </floater.string>
+  <floater.string
+   name="mouse">
+    Mouse Buttons
+  </floater.string>
     <text
      type="string"
      halign="center"
@@ -16,19 +24,35 @@
      height="30"
      layout="topleft"
      left="30"
-     name="Save item as:"
+     name="descritption"
      top="25"
      word_wrap="true"
-     width="180">
-        Press a key to set your Speak button trigger.
+     width="212">
+Press a key to set your trigger.
+Allowed input: [INPUT].
     </text>
+    <button
+     height="23"
+     label="Set Empty"
+     layout="topleft"
+     left="8"
+     name="SetEmpty"
+     top_pad="8"
+     width="80" />
+    <button
+     height="23"
+     label="Default"
+     layout="topleft"
+     left_pad="8"
+     name="Default"
+     top_delta="0"
+     width="80" />
     <button
      height="23"
      label="Cancel"
-     label_selected="Cancel"
      layout="topleft"
-     right="-10"
+     left_pad="8"
      name="Cancel"
-     top_pad="8"
-     width="100" />
+     top_delta="0"
+     width="80" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index a1a2fd0598..1bfee20c81 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -82,37 +82,37 @@
     Teleport To
   </panel.string>
   <panel.string
-   name="control_forward">
+   name="push_forward">
     Move Forward
   </panel.string>
   <panel.string
-   name="control_backward">
+   name="push_backward">
     Move Backward
   </panel.string>
   <panel.string
-   name="control_left">
+   name="turn_left">
     Left
   </panel.string>
   <panel.string
-   name="control_right">
+   name="turn_right">
     Right
   </panel.string>
   <!--(check with move floater)-->
   <panel.string
-   name="control_lstrafe">
+   name="slide_left">
     Strafe left
   </panel.string>
   <panel.string
-   name="control_rstrafe">
+   name="slide_right">
     Strafe right
   </panel.string>
   <panel.string
-   name="control_jump">
-    Strafe right
+   name="jump">
+    Jump/Up
   </panel.string>
   <panel.string
-   name="control_down">
-    Strafe right
+   name="push_down">
+    Down
   </panel.string>
   <panel.string
    name="control_run">
@@ -123,9 +123,85 @@
     Toggle Run
   </panel.string>
   <panel.string
-   name="control_fly">
+   name="toggle_fly">
     Fly/Stop flying
   </panel.string>
+  <panel.string
+   name="control_camera">
+    Camera
+  </panel.string>
+  <panel.string
+   name="look_up">
+    Look Up
+  </panel.string>
+  <panel.string
+   name="look_down">
+    Look Down
+  </panel.string>
+  <panel.string
+   name="move_forward">
+    Camera Forward
+  </panel.string>
+  <panel.string
+   name="move_backward">
+    Camera Backward
+  </panel.string>
+  <panel.string
+   name="move_forward_fast">
+    Camera Forward Fast
+  </panel.string>
+  <panel.string
+   name="move_backward_fast">
+    Camera Backward Fast
+  </panel.string>
+  <panel.string
+   name="move_forward_sitting">
+    Camera Forward Sitting
+  </panel.string>
+  <panel.string
+   name="move_backward_sitting">
+    Camera Backward Sitting
+  </panel.string>
+  <panel.string
+   name="spin_over">
+    Camera Spin Over
+  </panel.string>
+  <panel.string
+   name="spin_under">
+    Camera Spin Under
+  </panel.string>
+  <panel.string
+   name="spin_over_sitting">
+    Camera Spin Over
+  </panel.string>
+  <panel.string
+   name="spin_under_sitting">
+    Camera Spin Under
+  </panel.string>
+  <panel.string
+   name="pan_up">
+    Camera Pan Up
+  </panel.string>
+  <panel.string
+   name="pan_down">
+    Camera Pan Down
+  </panel.string>
+  <panel.string
+   name="pan_left">
+    Camera Pan Left
+  </panel.string>
+  <panel.string
+   name="pan_right">
+    Camera Pan Right
+  </panel.string>
+  <panel.string
+   name="pan_left">
+    Camera Pan In
+  </panel.string>
+  <panel.string
+   name="pan_right">
+    Camera Pan Out
+  </panel.string>
   <panel.string
    name="control_mediacontent">
     Sound and Media
@@ -150,6 +226,10 @@
    name="control_reserved">
     Reserved Controls
   </panel.string>
+  <panel.string
+   name="control_delete">
+    Delete
+  </panel.string>
   <!--
    name="control_menu" not needed
    -->
@@ -166,15 +246,60 @@
     Add to Selection
   </panel.string>
 
+  <combo_box
+   follows="top|left"
+   layout="topleft"
+   top="6"
+   left="10"
+   height="23"
+   width="110"
+   name="key_mode">
+    <combo_box.item
+     label="First Person "
+     name="first_person"
+     value="0"/>
+    <combo_box.item
+     label="Third Person "
+     name="third_person"
+     value="1"/>
+    <combo_box.item
+     label="Edit"
+     name="edit"
+     value="2"/>
+    <combo_box.item
+     label="Edit Avatar"
+     name="edit_avatar"
+     value="3"/>
+    <combo_box.item
+     label="Sitting"
+     name="sitting"
+     value="4"/>
+    <combo_box.item
+     label="General"
+     name="general"
+     value="5"/>
+  </combo_box>
+
+  <button
+   follows="top|left"
+   layout="topleft"
+   top="6"
+   right="-10"
+   height="23"
+   width="110"
+   label="Restore Default"
+   name="restore_defaults"/>
+  
   <scroll_list
    draw_heading="true"
    follows="all"
    layout="topleft"
    column_padding="0"
-   top="3"
+   top="31"
    left="3"
    bottom="-3"
    right="-3"
+   can_sort="false"
    multi_select="false"
    name="controls_list">
     <scroll_list.columns
@@ -182,13 +307,17 @@
      label="Action"
      name="lst_action" />
     <scroll_list.columns
-     relative_width="0.33"
-     label="Primary Control Method"
+     relative_width="0.22"
+     label="Control Method 1"
      name="lst_ctrl1" />
     <scroll_list.columns
-     relative_width="0.33"
-     label="Secondary Control Method"
+     relative_width="0.22"
+     label="Control Method 2"
      name="lst_ctrl2" />
+    <scroll_list.columns
+     relative_width="0.22"
+     label="Control Method 3"
+     name="lst_ctrl3" />
     <scroll_list.commit_callback
       function="Pref.CommitControl" />
   </scroll_list>
-- 
cgit v1.2.3


From c60b929fbb615f8d73f7bf42849b5628bf0f8f7a Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 25 Sep 2019 17:54:36 +0300
Subject: SL-6109 Mouse support ready

---
 .../newview/skins/default/xui/en/floater_select_key.xml  | 16 ++++++++++++++--
 .../skins/default/xui/en/panel_preferences_controls.xml  | 10 +++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index c00b805954..32f091938e 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -4,7 +4,7 @@
  border="false"
  can_close="false"
  can_minimize="false"
- height="90"
+ height="116"
  layout="topleft"
  name="modal container"
  width="272">
@@ -31,13 +31,25 @@
 Press a key to set your trigger.
 Allowed input: [INPUT].
     </text>
+    <check_box
+     follows="top|left"
+     height="20"
+     initial_value="false"
+     label="Ignore accelerator keys"
+     layout="topleft"
+     left="8"
+     name="ignore_masks"
+     tool_tip="Ignore Shift, Alt and Ctrl keys. Example: This allows to hold W (forward, ignores shift) and Shift+A (slide left) simultaneously and agent will both move forward and slide left."
+     top_pad="8"
+     width="160" />
+  
     <button
      height="23"
      label="Set Empty"
      layout="topleft"
      left="8"
      name="SetEmpty"
-     top_pad="8"
+     top_pad="6"
      width="80" />
     <button
      height="23"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index 1bfee20c81..0c652845f0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -74,7 +74,7 @@
     Move To
   </panel.string>
   <panel.string
-   name="control_sit">
+   name="toggle_sit">
     Sit/Stand
   </panel.string>
   <panel.string
@@ -119,7 +119,7 @@
     Run
   </panel.string>
   <panel.string
-   name="control_toggle_run">
+   name="toggle_run">
     Toggle Run
   </panel.string>
   <panel.string
@@ -207,11 +207,11 @@
     Sound and Media
   </panel.string>
   <panel.string
-   name="control_parcel">
-    Play/Pause Parcel Media
+   name="toggle_pause_media">
+    Play/Pause Media
   </panel.string>
   <panel.string
-   name="control_media">
+   name="toggle_enable_media">
     Play/Stop All Media
   </panel.string>
   <panel.string
-- 
cgit v1.2.3


From 2532a2ee9ee9003e2c6b72f8da19979a9e3dd2f6 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 26 Sep 2019 22:28:18 +0300
Subject: SL-6109 Conflict resolution

---
 indra/newview/skins/default/xui/en/panel_preferences_controls.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index 0c652845f0..ac4be34be2 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -274,10 +274,6 @@
      label="Sitting"
      name="sitting"
      value="4"/>
-    <combo_box.item
-     label="General"
-     name="general"
-     value="5"/>
   </combo_box>
 
   <button
@@ -301,6 +297,7 @@
    right="-3"
    can_sort="false"
    multi_select="false"
+   bg_selected_color="Transparent"
    name="controls_list">
     <scroll_list.columns
      relative_width="0.34"
-- 
cgit v1.2.3


From b12cf6696348520556cf70f96e0562776479fe70 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 27 Sep 2019 15:25:47 +0300
Subject: SL-6109 Small reorganisation

---
 indra/newview/skins/default/xui/en/panel_preferences_controls.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index ac4be34be2..62267dce8a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -285,7 +285,7 @@
    width="110"
    label="Restore Default"
    name="restore_defaults"/>
-  
+
   <scroll_list
    draw_heading="true"
    follows="all"
@@ -315,8 +315,5 @@
      relative_width="0.22"
      label="Control Method 3"
      name="lst_ctrl3" />
-    <scroll_list.commit_callback
-      function="Pref.CommitControl" />
   </scroll_list>
-
 </panel>
-- 
cgit v1.2.3


From 0b8021870335ff9b9684fb193c6e0fe2f02b4091 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 27 Sep 2019 19:53:33 +0300
Subject: SL-6109 Cleanup, run commands, and preparation for tooltip support

---
 .../default/xui/en/panel_preferences_controls.xml  | 55 +++++++++++-----------
 1 file changed, 28 insertions(+), 27 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index 62267dce8a..385d4796a0 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -9,6 +9,10 @@
  name="controls"
  top="1"
  width="517">
+  <panel.string
+   name="walk_to">
+    Walk to
+  </panel.string>
   <panel.string
    name="control_view_actions">
     View Actions
@@ -70,8 +74,8 @@
     Move Actions
   </panel.string>
   <panel.string
-   name="control_moveto">
-    Move To
+   name="teleport_to">
+    Teleport to
   </panel.string>
   <panel.string
    name="toggle_sit">
@@ -118,6 +122,22 @@
    name="control_run">
     Run
   </panel.string>
+  <panel.string
+   name="run_forward">
+    Run Forward
+  </panel.string>
+  <panel.string
+   name="run_backward">
+    Run Backward
+  </panel.string>
+  <panel.string
+   name="run_left">
+    Run Left
+  </panel.string>
+  <panel.string
+   name="run_right">
+    Run Right
+  </panel.string>
   <panel.string
    name="toggle_run">
     Toggle Run
@@ -126,6 +146,10 @@
    name="toggle_fly">
     Fly/Stop flying
   </panel.string>
+  <panel.string
+   name="stop_moving">
+    Stop Moving
+  </panel.string>
   <panel.string
    name="control_camera">
     Camera
@@ -215,36 +239,13 @@
     Play/Stop All Media
   </panel.string>
   <panel.string
-   name="control_voice">
+   name="voice_follow_key">
     Voice
   </panel.string>
   <panel.string
-   name="control_toggle_voice">
+   name="toggle_voice">
     Toggle Voice
   </panel.string>
-  <panel.string
-   name="control_reserved">
-    Reserved Controls
-  </panel.string>
-  <panel.string
-   name="control_delete">
-    Delete
-  </panel.string>
-  <!--
-   name="control_menu" not needed
-   -->
-  <panel.string
-   name="control_reserved_select">
-    Select
-  </panel.string>
-  <panel.string
-   name="control_shift_select">
-    Multi-Select
-  </panel.string>
-  <panel.string
-   name="control_cntrl_select">
-    Add to Selection
-  </panel.string>
 
   <combo_box
    follows="top|left"
-- 
cgit v1.2.3


From 04081c0bc882cecb7647648eb035f0f2334bf983 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 1 Oct 2019 22:23:49 +0300
Subject: SL-6109 Better hover and docking of keybinder

---
 .../skins/default/xui/en/panel_preferences_controls.xml        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index 385d4796a0..b7b5280825 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -255,14 +255,14 @@
    height="23"
    width="110"
    name="key_mode">
-    <combo_box.item
-     label="First Person "
-     name="first_person"
-     value="0"/>
     <combo_box.item
      label="Third Person "
      name="third_person"
      value="1"/>
+    <combo_box.item
+     label="First Person "
+     name="first_person"
+     value="0"/>
     <combo_box.item
      label="Edit"
      name="edit"
@@ -292,13 +292,13 @@
    follows="all"
    layout="topleft"
    column_padding="0"
+   selection_type="header"
    top="31"
    left="3"
    bottom="-3"
    right="-3"
    can_sort="false"
    multi_select="false"
-   bg_selected_color="Transparent"
    name="controls_list">
     <scroll_list.columns
      relative_width="0.34"
-- 
cgit v1.2.3


From 2e656ed358af28f56c8b900345956d431f8c7b4d Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Wed, 2 Oct 2019 20:51:47 +0300
Subject: SL-6109 Removed obsolete control, moved table init to xml, cleanup

---
 .../default/xui/en/control_table_contents.xml      | 569 +++++++++++++++++++++
 .../default/xui/en/panel_preferences_controls.xml  | 258 +---------
 .../default/xui/en/panel_preferences_move.xml      |  64 ---
 .../default/xui/en/panel_preferences_sound.xml     |  26 +-
 4 files changed, 572 insertions(+), 345 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/control_table_contents.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
new file mode 100644
index 0000000000..00c2d27124
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/control_table_contents.xml
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+    <columns
+     relative_width="0.34"
+     label="Action"
+     name="lst_action" />
+    <columns
+     relative_width="0.22"
+     label="Prymary Control"
+     name="lst_ctrl1" />
+    <columns
+     relative_width="0.22"
+     label="Alternate 1"
+     name="lst_ctrl2" />
+    <columns
+     relative_width="0.22"
+     label="Alternate 2"
+     name="lst_ctrl3" />
+    <rows
+     enabled="false"
+     value="">
+        <columns
+         cell_type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Move Actions"
+         name="lst_action"
+         value="Move_Walk_Off" />
+    </rows>
+    <rows
+     value="walk_to">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Walk to location mouse cursor points to"
+         value="Walk to" />
+    </rows>
+    <rows
+     value="teleport_to">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Teleport to location mouse cursor points to, but not all locations allow direct teleportation so you might be teleported closer to destination instead"
+         value="Teleport to" />
+    </rows>
+    <rows
+     value="push_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Move Forward" />
+    </rows>
+    <rows
+     value="push_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Move Backward" />
+    </rows>
+    <rows
+     value="turn_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Left" />
+    </rows>
+    <rows
+     value="turn_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Right" />
+    </rows>
+    <rows
+     value="slide_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Strafe left" />
+    </rows>
+    <rows
+     value="slide_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Strafe right" />
+    </rows>
+    <rows
+     value="jump">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Jump/Up" />
+    </rows>
+    <rows
+     value="push_down">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Down" />
+    </rows>
+    <rows
+     value="run_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Forward" />
+    </rows>
+    <rows
+     value="run_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Backward" />
+    </rows>
+    <rows
+     value="run_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Left" />
+    </rows>
+    <rows
+     value="run_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Right" />
+    </rows>
+    <rows
+     value="toggle_run">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Toggle Run" />
+    </rows>
+    <rows
+     value="toggle_fly">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Fly/Stop flying" />
+    </rows>
+    <rows
+     value="toggle_sit">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Sit/Stand" />
+    </rows>
+    <rows
+     value="stop_moving">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Stop Moving" />
+    </rows>
+    <rows
+     enabled="false">
+        <columns
+         cell_type="icon"
+         color="0 0 0 0.7"
+         halign="center"
+         value="menu_separator" />
+    </rows>
+    <rows
+     enabled="false"
+     value="">
+        <columns
+         cell_type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Camera"
+         name="lst_action"
+         value="Cam_FreeCam_Off" />
+    </rows>
+    <rows
+     value="look_up">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Look Up" />
+    </rows>
+    <rows
+     value="look_down">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Look Down" />
+    </rows>
+    <rows
+     value="move_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward" />
+    </rows>
+    <rows
+     value="move_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward" />
+    </rows>
+    <rows
+     value="move_forward_fast">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward Fast" />
+    </rows>
+    <rows
+     value="move_backward_fast">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward Fast" />
+    </rows>
+    <rows
+     value="move_forward_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward Sitting" />
+    </rows>
+    <rows
+     value="move_backward_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward Sitting" />
+    </rows>
+    <rows
+     value="spin_over">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Over" />
+    </rows>
+    <rows
+     value="spin_under">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Under" />
+    </rows>
+    <rows
+     value="spin_over_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Over" />
+    </rows>
+    <rows
+     value="spin_under_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Under" />
+    </rows>
+    <rows
+     value="pan_up">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Up" />
+    </rows>
+    <rows
+     value="pan_down">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Down" />
+    </rows>
+    <rows
+     value="pan_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Left" />
+    </rows>
+    <rows
+     value="pan_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Right" />
+    </rows>
+    <rows
+     value="pan_in">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan In" />
+    </rows>
+    <rows
+     value="pan_out">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Out" />
+    </rows>
+    <rows
+     value="spin_around_ccw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around counterclockwise"
+         value="Counterclockwise" />
+    </rows>
+    <rows
+     value="spin_around_cw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around clockwise"
+         value="Clockwise" />
+    </rows>
+    <rows
+     value="spin_around_ccw_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around counterclockwise sitting"
+         value="Counterclockwise Sitting" />
+    </rows>
+    <rows
+     value="spin_around_cw_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around clockwise sitting"
+         value="Clockwise Sitting" />
+    </rows>
+    <rows
+     enabled="false">
+        <columns
+         cell_type="icon"
+         color="0 0 0 0.7"
+         halign="center"
+         value="menu_separator" />
+    </rows>
+    <rows
+     enabled="false"
+     value="">
+        <columns
+         cell_type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Editing"
+         name="lst_action"
+         value="Tool_Dozer" />
+    </rows>
+    <rows
+     value="edit_avatar_spin_ccw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around avatar counterclockwise"
+         value="Counterclockwise" />
+    </rows>
+    <rows
+     value="edit_avatar_spin_cw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around avatar clockwise"
+         value="Clockwise" />
+    </rows>
+    <rows
+     value="edit_avatar_spin_over">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin over avatar"
+         value="Camera Spin Over" />
+    </rows>
+    <rows
+     value="edit_avatar_spin_under">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin under avatar"
+         value="Camera Spin Under" />
+    </rows>
+    <rows
+     value="edit_avatar_move_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward" />
+    </rows>
+    <rows
+     value="edit_avatar_move_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward" />
+    </rows>
+    <rows
+     enabled="false">
+        <columns
+         cell_type="icon"
+         color="0 0 0 0.7"
+         halign="center"
+         value="menu_separator" />
+    </rows>
+    <rows
+     enabled="false"
+     value="">
+        <columns
+         cell_type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Sound and Media"
+         name="lst_action"
+         value="Audio_Press" />
+    </rows>
+    <rows
+     value="toggle_pause_media">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Play/Pause Media" />
+    </rows>
+    <rows
+     value="toggle_enable_media">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Play/Stop All Media" />
+    </rows>
+    <rows
+     value="voice_follow_key">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Voice" />
+    </rows>
+    <rows
+     value="toggle_voice">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Toggle Voice" />
+    </rows>
+    <rows
+     value="start_chat">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Start Chat" />
+    </rows>
+    <rows
+     value="start_gesture">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Start Gesture" />
+    </rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index b7b5280825..eca3c550d5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -9,244 +9,6 @@
  name="controls"
  top="1"
  width="517">
-  <panel.string
-   name="walk_to">
-    Walk to
-  </panel.string>
-  <panel.string
-   name="control_view_actions">
-    View Actions
-  </panel.string>
-  <panel.string
-   name="control_about">
-    About/Profile
-  </panel.string>
-  <panel.string
-   name="control_orbit">
-    Orbit
-  </panel.string>
-  <panel.string
-   name="control_pan">
-    Pan
-  </panel.string>
-  <panel.string
-   name="control_world_map">
-    World Map
-  </panel.string>
-  <panel.string
-   name="control_zoom">
-    Zoom
-  </panel.string>
-  <panel.string
-   name="control_interactions">
-    Interactions
-  </panel.string>
-  <panel.string
-   name="control_build">
-    Build
-  </panel.string>
-  <panel.string
-   name="control_drag">
-    Drag
-  </panel.string>
-  <panel.string
-   name="control_edit">
-    Edit
-  </panel.string>
-  <panel.string
-   name="control_menu">
-    Menu
-  </panel.string>
-  <panel.string
-   name="control_open">
-    Open
-  </panel.string>
-  <panel.string
-   name="control_touch">
-    Touch
-  </panel.string>
-  <panel.string
-   name="control_wear">
-    Wear
-  </panel.string>
-  <panel.string
-   name="control_movements">
-    Move Actions
-  </panel.string>
-  <panel.string
-   name="teleport_to">
-    Teleport to
-  </panel.string>
-  <panel.string
-   name="toggle_sit">
-    Sit/Stand
-  </panel.string>
-  <panel.string
-   name="control_teleportto">
-    Teleport To
-  </panel.string>
-  <panel.string
-   name="push_forward">
-    Move Forward
-  </panel.string>
-  <panel.string
-   name="push_backward">
-    Move Backward
-  </panel.string>
-  <panel.string
-   name="turn_left">
-    Left
-  </panel.string>
-  <panel.string
-   name="turn_right">
-    Right
-  </panel.string>
-  <!--(check with move floater)-->
-  <panel.string
-   name="slide_left">
-    Strafe left
-  </panel.string>
-  <panel.string
-   name="slide_right">
-    Strafe right
-  </panel.string>
-  <panel.string
-   name="jump">
-    Jump/Up
-  </panel.string>
-  <panel.string
-   name="push_down">
-    Down
-  </panel.string>
-  <panel.string
-   name="control_run">
-    Run
-  </panel.string>
-  <panel.string
-   name="run_forward">
-    Run Forward
-  </panel.string>
-  <panel.string
-   name="run_backward">
-    Run Backward
-  </panel.string>
-  <panel.string
-   name="run_left">
-    Run Left
-  </panel.string>
-  <panel.string
-   name="run_right">
-    Run Right
-  </panel.string>
-  <panel.string
-   name="toggle_run">
-    Toggle Run
-  </panel.string>
-  <panel.string
-   name="toggle_fly">
-    Fly/Stop flying
-  </panel.string>
-  <panel.string
-   name="stop_moving">
-    Stop Moving
-  </panel.string>
-  <panel.string
-   name="control_camera">
-    Camera
-  </panel.string>
-  <panel.string
-   name="look_up">
-    Look Up
-  </panel.string>
-  <panel.string
-   name="look_down">
-    Look Down
-  </panel.string>
-  <panel.string
-   name="move_forward">
-    Camera Forward
-  </panel.string>
-  <panel.string
-   name="move_backward">
-    Camera Backward
-  </panel.string>
-  <panel.string
-   name="move_forward_fast">
-    Camera Forward Fast
-  </panel.string>
-  <panel.string
-   name="move_backward_fast">
-    Camera Backward Fast
-  </panel.string>
-  <panel.string
-   name="move_forward_sitting">
-    Camera Forward Sitting
-  </panel.string>
-  <panel.string
-   name="move_backward_sitting">
-    Camera Backward Sitting
-  </panel.string>
-  <panel.string
-   name="spin_over">
-    Camera Spin Over
-  </panel.string>
-  <panel.string
-   name="spin_under">
-    Camera Spin Under
-  </panel.string>
-  <panel.string
-   name="spin_over_sitting">
-    Camera Spin Over
-  </panel.string>
-  <panel.string
-   name="spin_under_sitting">
-    Camera Spin Under
-  </panel.string>
-  <panel.string
-   name="pan_up">
-    Camera Pan Up
-  </panel.string>
-  <panel.string
-   name="pan_down">
-    Camera Pan Down
-  </panel.string>
-  <panel.string
-   name="pan_left">
-    Camera Pan Left
-  </panel.string>
-  <panel.string
-   name="pan_right">
-    Camera Pan Right
-  </panel.string>
-  <panel.string
-   name="pan_left">
-    Camera Pan In
-  </panel.string>
-  <panel.string
-   name="pan_right">
-    Camera Pan Out
-  </panel.string>
-  <panel.string
-   name="control_mediacontent">
-    Sound and Media
-  </panel.string>
-  <panel.string
-   name="toggle_pause_media">
-    Play/Pause Media
-  </panel.string>
-  <panel.string
-   name="toggle_enable_media">
-    Play/Stop All Media
-  </panel.string>
-  <panel.string
-   name="voice_follow_key">
-    Voice
-  </panel.string>
-  <panel.string
-   name="toggle_voice">
-    Toggle Voice
-  </panel.string>
-
   <combo_box
    follows="top|left"
    layout="topleft"
@@ -299,22 +61,6 @@
    right="-3"
    can_sort="false"
    multi_select="false"
-   name="controls_list">
-    <scroll_list.columns
-     relative_width="0.34"
-     label="Action"
-     name="lst_action" />
-    <scroll_list.columns
-     relative_width="0.22"
-     label="Control Method 1"
-     name="lst_ctrl1" />
-    <scroll_list.columns
-     relative_width="0.22"
-     label="Control Method 2"
-     name="lst_ctrl2" />
-    <scroll_list.columns
-     relative_width="0.22"
-     label="Control Method 3"
-     name="lst_ctrl3" />
-  </scroll_list>
+   name="controls_list"
+   fg_disable_color="ScrollUnselectedColor"/>
 </panel>
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 8794e3bf95..d106456b31 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -195,70 +195,6 @@
    name="invert_mouse"
    top_delta="0"
    width="128" />
-  <text
-   follows="left|top"
-   type="string"
-   length="1"
-   height="10"
-   layout="topleft"
-   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="86"
-   name="double_click_action_lbl"
-   width="150"
-   top_pad="12">
-    Double click on land:
-  </text>
-  <combo_box
-   height="23"
-   layout="topleft"
-   left_pad="10"
-   top_delta="-6"
-   name="double_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.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"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index c2defdd772..db88798d6b 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -463,37 +463,13 @@
   enabled_control="EnableVoiceChat"
   control_name="PushToTalkToggle"
   height="15"
-  label="Toggle speak on/off when I press:"
+  label="Toggle speak on/off when I press button in toolbar"
   layout="topleft"
   left="44"
   name="push_to_talk_toggle_check"
   width="237"
   tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."
   top_pad="3"/>
-  <line_editor
-   follows="top|left"
-   control_name="PushToTalkButton"
-   enabled="false"
-   enabled_control="EnableVoiceChat"
-   height="23"
-   left="80"
-   max_length_bytes="200"
-   name="modifier_combo"
-   label="Push-to-Speak trigger"
-   top_pad="3"
-   width="200" />
-  <button
-   layout="topleft"
-   follows="top|left"
-   enabled_control="EnableVoiceChat"
-   height="23"
-   label="Set Key"
-   left_pad="5"
-   name="set_voice_hotkey_button"
-   width="100">
-    <button.commit_callback
-    function="Pref.VoiceSetKey" />
-  </button>
   <button
      enabled_control="EnableVoiceChat"
      follows="top|left"
-- 
cgit v1.2.3


From e211372923bed31e632bc9825913d3d57cdc2d52 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 3 Oct 2019 22:45:29 +0300
Subject: SL-6109 Remade 'ignore' list processing, renamed and reformed
 keybindings

---
 .../skins/default/xui/en/control_table_contents.xml       | 14 +++++++-------
 indra/newview/skins/default/xui/en/floater_select_key.xml | 15 ++++++++++++---
 2 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
index 00c2d27124..7d4b9be894 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents.xml
@@ -20,7 +20,7 @@
      enabled="false"
      value="">
         <columns
-         cell_type="icontext"
+         type="icontext"
          column="lst_action"
          font="SansSerif"
          halign="left"
@@ -195,7 +195,7 @@
     <rows
      enabled="false">
         <columns
-         cell_type="icon"
+         type="icon"
          color="0 0 0 0.7"
          halign="center"
          value="menu_separator" />
@@ -204,7 +204,7 @@
      enabled="false"
      value="">
         <columns
-         cell_type="icontext"
+         type="icontext"
          column="lst_action"
          font="SansSerif"
          halign="left"
@@ -417,7 +417,7 @@
     <rows
      enabled="false">
         <columns
-         cell_type="icon"
+         type="icon"
          color="0 0 0 0.7"
          halign="center"
          value="menu_separator" />
@@ -426,7 +426,7 @@
      enabled="false"
      value="">
         <columns
-         cell_type="icontext"
+         type="icontext"
          column="lst_action"
          font="SansSerif"
          halign="left"
@@ -495,7 +495,7 @@
     <rows
      enabled="false">
         <columns
-         cell_type="icon"
+         type="icon"
          color="0 0 0 0.7"
          halign="center"
          value="menu_separator" />
@@ -504,7 +504,7 @@
      enabled="false"
      value="">
         <columns
-         cell_type="icontext"
+         type="icontext"
          column="lst_action"
          font="SansSerif"
          halign="left"
diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 32f091938e..255de60d00 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -15,6 +15,15 @@
   <floater.string
    name="mouse">
     Mouse Buttons
+  </floater.string>
+  <floater.string
+   name="basic_description">
+Press a key to set your trigger.
+Allowed input: [INPUT].
+  </floater.string>
+  <floater.string
+   name="reserved_by_menu">
+Combination [KEYSTR] is reserved by menu.
   </floater.string>
     <text
      type="string"
@@ -35,11 +44,11 @@ Allowed input: [INPUT].
      follows="top|left"
      height="20"
      initial_value="false"
-     label="Ignore accelerator keys"
+     label="Ignore extra accelerator keys"
      layout="topleft"
-     left="8"
+     left="28"
      name="ignore_masks"
-     tool_tip="Ignore Shift, Alt and Ctrl keys. Example: This allows to hold W (forward, ignores shift) and Shift+A (slide left) simultaneously and agent will both move forward and slide left."
+     tool_tip="Ignore extra Shift, Alt and Ctrl keys. Example: This allows to hold W (forward, ignores shift) and Shift+A (slide left) simultaneously and agent will both move forward and slide left."
      top_pad="8"
      width="160" />
   
-- 
cgit v1.2.3


From 6597c7696783ce56f89b34a4b6440363635be6a6 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 28 Oct 2019 17:52:31 +0200
Subject: SL-6109 - Fixed line endings in xml file - Removed obsolete UI
 element and it's code - Fixed issue with return value caused by rebase

---
 .../default/xui/en/control_table_contents.xml      | 1138 ++++++++++----------
 .../default/xui/en/panel_preferences_sound.xml     |   15 -
 2 files changed, 569 insertions(+), 584 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
index 7d4b9be894..f078e80dff 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents.xml
@@ -1,569 +1,569 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<contents>
-    <columns
-     relative_width="0.34"
-     label="Action"
-     name="lst_action" />
-    <columns
-     relative_width="0.22"
-     label="Prymary Control"
-     name="lst_ctrl1" />
-    <columns
-     relative_width="0.22"
-     label="Alternate 1"
-     name="lst_ctrl2" />
-    <columns
-     relative_width="0.22"
-     label="Alternate 2"
-     name="lst_ctrl3" />
-    <rows
-     enabled="false"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Move Actions"
-         name="lst_action"
-         value="Move_Walk_Off" />
-    </rows>
-    <rows
-     value="walk_to">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Walk to location mouse cursor points to"
-         value="Walk to" />
-    </rows>
-    <rows
-     value="teleport_to">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Teleport to location mouse cursor points to, but not all locations allow direct teleportation so you might be teleported closer to destination instead"
-         value="Teleport to" />
-    </rows>
-    <rows
-     value="push_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Move Forward" />
-    </rows>
-    <rows
-     value="push_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Move Backward" />
-    </rows>
-    <rows
-     value="turn_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Left" />
-    </rows>
-    <rows
-     value="turn_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Right" />
-    </rows>
-    <rows
-     value="slide_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Strafe left" />
-    </rows>
-    <rows
-     value="slide_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Strafe right" />
-    </rows>
-    <rows
-     value="jump">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Jump/Up" />
-    </rows>
-    <rows
-     value="push_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Down" />
-    </rows>
-    <rows
-     value="run_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Forward" />
-    </rows>
-    <rows
-     value="run_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Backward" />
-    </rows>
-    <rows
-     value="run_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Left" />
-    </rows>
-    <rows
-     value="run_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Right" />
-    </rows>
-    <rows
-     value="toggle_run">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Toggle Run" />
-    </rows>
-    <rows
-     value="toggle_fly">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Fly/Stop flying" />
-    </rows>
-    <rows
-     value="toggle_sit">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Sit/Stand" />
-    </rows>
-    <rows
-     value="stop_moving">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Stop Moving" />
-    </rows>
-    <rows
-     enabled="false">
-        <columns
-         type="icon"
-         color="0 0 0 0.7"
-         halign="center"
-         value="menu_separator" />
-    </rows>
-    <rows
-     enabled="false"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Camera"
-         name="lst_action"
-         value="Cam_FreeCam_Off" />
-    </rows>
-    <rows
-     value="look_up">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Look Up" />
-    </rows>
-    <rows
-     value="look_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Look Down" />
-    </rows>
-    <rows
-     value="move_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward" />
-    </rows>
-    <rows
-     value="move_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward" />
-    </rows>
-    <rows
-     value="move_forward_fast">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward Fast" />
-    </rows>
-    <rows
-     value="move_backward_fast">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward Fast" />
-    </rows>
-    <rows
-     value="move_forward_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward Sitting" />
-    </rows>
-    <rows
-     value="move_backward_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward Sitting" />
-    </rows>
-    <rows
-     value="spin_over">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Over" />
-    </rows>
-    <rows
-     value="spin_under">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Under" />
-    </rows>
-    <rows
-     value="spin_over_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Over" />
-    </rows>
-    <rows
-     value="spin_under_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Under" />
-    </rows>
-    <rows
-     value="pan_up">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Up" />
-    </rows>
-    <rows
-     value="pan_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Down" />
-    </rows>
-    <rows
-     value="pan_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Left" />
-    </rows>
-    <rows
-     value="pan_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Right" />
-    </rows>
-    <rows
-     value="pan_in">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan In" />
-    </rows>
-    <rows
-     value="pan_out">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Out" />
-    </rows>
-    <rows
-     value="spin_around_ccw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around counterclockwise"
-         value="Counterclockwise" />
-    </rows>
-    <rows
-     value="spin_around_cw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around clockwise"
-         value="Clockwise" />
-    </rows>
-    <rows
-     value="spin_around_ccw_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around counterclockwise sitting"
-         value="Counterclockwise Sitting" />
-    </rows>
-    <rows
-     value="spin_around_cw_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around clockwise sitting"
-         value="Clockwise Sitting" />
-    </rows>
-    <rows
-     enabled="false">
-        <columns
-         type="icon"
-         color="0 0 0 0.7"
-         halign="center"
-         value="menu_separator" />
-    </rows>
-    <rows
-     enabled="false"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Editing"
-         name="lst_action"
-         value="Tool_Dozer" />
-    </rows>
-    <rows
-     value="edit_avatar_spin_ccw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around avatar counterclockwise"
-         value="Counterclockwise" />
-    </rows>
-    <rows
-     value="edit_avatar_spin_cw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around avatar clockwise"
-         value="Clockwise" />
-    </rows>
-    <rows
-     value="edit_avatar_spin_over">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin over avatar"
-         value="Camera Spin Over" />
-    </rows>
-    <rows
-     value="edit_avatar_spin_under">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin under avatar"
-         value="Camera Spin Under" />
-    </rows>
-    <rows
-     value="edit_avatar_move_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward" />
-    </rows>
-    <rows
-     value="edit_avatar_move_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward" />
-    </rows>
-    <rows
-     enabled="false">
-        <columns
-         type="icon"
-         color="0 0 0 0.7"
-         halign="center"
-         value="menu_separator" />
-    </rows>
-    <rows
-     enabled="false"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Sound and Media"
-         name="lst_action"
-         value="Audio_Press" />
-    </rows>
-    <rows
-     value="toggle_pause_media">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Play/Pause Media" />
-    </rows>
-    <rows
-     value="toggle_enable_media">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Play/Stop All Media" />
-    </rows>
-    <rows
-     value="voice_follow_key">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Voice" />
-    </rows>
-    <rows
-     value="toggle_voice">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Toggle Voice" />
-    </rows>
-    <rows
-     value="start_chat">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Start Chat" />
-    </rows>
-    <rows
-     value="start_gesture">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Start Gesture" />
-    </rows>
-</contents>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+    <columns
+     relative_width="0.34"
+     label="Action"
+     name="lst_action" />
+    <columns
+     relative_width="0.22"
+     label="Prymary Control"
+     name="lst_ctrl1" />
+    <columns
+     relative_width="0.22"
+     label="Alternate 1"
+     name="lst_ctrl2" />
+    <columns
+     relative_width="0.22"
+     label="Alternate 2"
+     name="lst_ctrl3" />
+    <rows
+     enabled="false"
+     value="">
+        <columns
+         type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Move Actions"
+         name="lst_action"
+         value="Move_Walk_Off" />
+    </rows>
+    <rows
+     value="walk_to">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Walk to location mouse cursor points to"
+         value="Walk to" />
+    </rows>
+    <rows
+     value="teleport_to">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Teleport to location mouse cursor points to, but not all locations allow direct teleportation so you might be teleported closer to destination instead"
+         value="Teleport to" />
+    </rows>
+    <rows
+     value="push_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Move Forward" />
+    </rows>
+    <rows
+     value="push_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Move Backward" />
+    </rows>
+    <rows
+     value="turn_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Left" />
+    </rows>
+    <rows
+     value="turn_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Right" />
+    </rows>
+    <rows
+     value="slide_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Strafe left" />
+    </rows>
+    <rows
+     value="slide_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Strafe right" />
+    </rows>
+    <rows
+     value="jump">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Jump/Up" />
+    </rows>
+    <rows
+     value="push_down">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Down" />
+    </rows>
+    <rows
+     value="run_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Forward" />
+    </rows>
+    <rows
+     value="run_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Backward" />
+    </rows>
+    <rows
+     value="run_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Left" />
+    </rows>
+    <rows
+     value="run_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Right" />
+    </rows>
+    <rows
+     value="toggle_run">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Toggle Run" />
+    </rows>
+    <rows
+     value="toggle_fly">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Fly/Stop flying" />
+    </rows>
+    <rows
+     value="toggle_sit">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Sit/Stand" />
+    </rows>
+    <rows
+     value="stop_moving">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Stop Moving" />
+    </rows>
+    <rows
+     enabled="false">
+        <columns
+         type="icon"
+         color="0 0 0 0.7"
+         halign="center"
+         value="menu_separator" />
+    </rows>
+    <rows
+     enabled="false"
+     value="">
+        <columns
+         type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Camera"
+         name="lst_action"
+         value="Cam_FreeCam_Off" />
+    </rows>
+    <rows
+     value="look_up">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Look Up" />
+    </rows>
+    <rows
+     value="look_down">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Look Down" />
+    </rows>
+    <rows
+     value="move_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward" />
+    </rows>
+    <rows
+     value="move_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward" />
+    </rows>
+    <rows
+     value="move_forward_fast">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward Fast" />
+    </rows>
+    <rows
+     value="move_backward_fast">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward Fast" />
+    </rows>
+    <rows
+     value="move_forward_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward Sitting" />
+    </rows>
+    <rows
+     value="move_backward_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward Sitting" />
+    </rows>
+    <rows
+     value="spin_over">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Over" />
+    </rows>
+    <rows
+     value="spin_under">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Under" />
+    </rows>
+    <rows
+     value="spin_over_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Over" />
+    </rows>
+    <rows
+     value="spin_under_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Under" />
+    </rows>
+    <rows
+     value="pan_up">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Up" />
+    </rows>
+    <rows
+     value="pan_down">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Down" />
+    </rows>
+    <rows
+     value="pan_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Left" />
+    </rows>
+    <rows
+     value="pan_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Right" />
+    </rows>
+    <rows
+     value="pan_in">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan In" />
+    </rows>
+    <rows
+     value="pan_out">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Out" />
+    </rows>
+    <rows
+     value="spin_around_ccw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around counterclockwise"
+         value="Counterclockwise" />
+    </rows>
+    <rows
+     value="spin_around_cw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around clockwise"
+         value="Clockwise" />
+    </rows>
+    <rows
+     value="spin_around_ccw_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around counterclockwise sitting"
+         value="Counterclockwise Sitting" />
+    </rows>
+    <rows
+     value="spin_around_cw_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around clockwise sitting"
+         value="Clockwise Sitting" />
+    </rows>
+    <rows
+     enabled="false">
+        <columns
+         type="icon"
+         color="0 0 0 0.7"
+         halign="center"
+         value="menu_separator" />
+    </rows>
+    <rows
+     enabled="false"
+     value="">
+        <columns
+         type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Editing"
+         name="lst_action"
+         value="Tool_Dozer" />
+    </rows>
+    <rows
+     value="edit_avatar_spin_ccw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around avatar counterclockwise"
+         value="Counterclockwise" />
+    </rows>
+    <rows
+     value="edit_avatar_spin_cw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around avatar clockwise"
+         value="Clockwise" />
+    </rows>
+    <rows
+     value="edit_avatar_spin_over">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin over avatar"
+         value="Camera Spin Over" />
+    </rows>
+    <rows
+     value="edit_avatar_spin_under">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin under avatar"
+         value="Camera Spin Under" />
+    </rows>
+    <rows
+     value="edit_avatar_move_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward" />
+    </rows>
+    <rows
+     value="edit_avatar_move_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward" />
+    </rows>
+    <rows
+     enabled="false">
+        <columns
+         type="icon"
+         color="0 0 0 0.7"
+         halign="center"
+         value="menu_separator" />
+    </rows>
+    <rows
+     enabled="false"
+     value="">
+        <columns
+         type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Sound and Media"
+         name="lst_action"
+         value="Audio_Press" />
+    </rows>
+    <rows
+     value="toggle_pause_media">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Play/Pause Media" />
+    </rows>
+    <rows
+     value="toggle_enable_media">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Play/Stop All Media" />
+    </rows>
+    <rows
+     value="voice_follow_key">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Voice" />
+    </rows>
+    <rows
+     value="toggle_voice">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Toggle Voice" />
+    </rows>
+    <rows
+     value="start_chat">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Start Chat" />
+    </rows>
+    <rows
+     value="start_gesture">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Start Gesture" />
+    </rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index db88798d6b..74c9b10cff 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -470,21 +470,6 @@
   width="237"
   tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."
   top_pad="3"/>
-  <button
-     enabled_control="EnableVoiceChat"
-     follows="top|left"
-     halign="center"
-     height="23"
-     image_overlay="Refresh_Off"
-     layout="topleft"
-     tool_tip="Reset to Middle Mouse Button"
-     mouse_opaque="true"
-     name="set_voice_middlemouse_button"
-     left_pad="5"
-     width="25">
-    <button.commit_callback
-    function="Pref.VoiceSetMiddleMouse" />
-  </button>
   <button
    control_name="ShowDeviceSettings"
    follows="left|top"
-- 
cgit v1.2.3


From fd5c1a1f0787d8464432a8ed592b0d6d9b8da092 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 31 Oct 2019 17:16:50 +0200
Subject: SL-6109 Fixed walk_to defaults and typo.

---
 indra/newview/skins/default/xui/en/control_table_contents.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
index f078e80dff..288075628c 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents.xml
@@ -6,7 +6,7 @@
      name="lst_action" />
     <columns
      relative_width="0.22"
-     label="Prymary Control"
+     label="Primary Control"
      name="lst_ctrl1" />
     <columns
      relative_width="0.22"
-- 
cgit v1.2.3


From b5b266c4d2bdf71d89f5d2545e7d6e7966082c90 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Mon, 4 Nov 2019 15:48:45 +0200
Subject: SL-6109 - Fixed defaults not restoring reliably - Fixed temporary
 changes not lifting reliably - Fixed switching modes was dropping changes to
 mode we switch to

---
 indra/newview/skins/default/xui/en/panel_preferences_controls.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index eca3c550d5..bd39343093 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -47,6 +47,7 @@
    height="23"
    width="110"
    label="Restore Default"
+   tooltip="Restores default values for all control modes."
    name="restore_defaults"/>
 
   <scroll_list
-- 
cgit v1.2.3


From 73a1877ff0abcba46f66ef55440274119427723b Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Thu, 7 Nov 2019 20:09:25 +0200
Subject: SL-6109 - Edit mode appears to be obsolete and is not used, cleaned
 up - Improved ability to set defaults - Improved some labels - Made buttons
 bigger to accomodate languages with longer descriptions - Added ability to
 assign key for all modes simultaneously

---
 .../skins/default/xui/en/floater_select_key.xml        |  8 ++++----
 indra/newview/skins/default/xui/en/notifications.xml   | 13 +++++++++++++
 .../default/xui/en/panel_preferences_controls.xml      | 18 +++++++-----------
 3 files changed, 24 insertions(+), 15 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/floater_select_key.xml b/indra/newview/skins/default/xui/en/floater_select_key.xml
index 255de60d00..48d9eee4cd 100644
--- a/indra/newview/skins/default/xui/en/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/en/floater_select_key.xml
@@ -44,11 +44,11 @@ Allowed input: [INPUT].
      follows="top|left"
      height="20"
      initial_value="false"
-     label="Ignore extra accelerator keys"
+     label="Apply to all"
      layout="topleft"
-     left="28"
-     name="ignore_masks"
-     tool_tip="Ignore extra Shift, Alt and Ctrl keys. Example: This allows to hold W (forward, ignores shift) and Shift+A (slide left) simultaneously and agent will both move forward and slide left."
+     left="90"
+     name="apply_all"
+     tool_tip="Viewer uses different control combinations depending on what you are doing in world, setting this will apply your change to all combinations"
      top_pad="8"
      width="160" />
   
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8a91a1f721..42d4f46d7f 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11406,6 +11406,19 @@ Cannot create large prims that intersect other residents.  Please re-try when ot
      notext="Cancel"
      yestext="OK"/>
   </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="PreferenceControlsDefaults"
+   type="alertmodal">
+    Do you want to restore default values for controls?
+    <tag>confirm</tag>
+    <usetemplate
+       canceltext="Cancel"
+       name="yesnocancelbuttons"
+       notext="Current mode"
+       yestext="All modes"/>
+  </notification>
     
   <notification
    icon="alertmodal.tga"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index bd39343093..0f830ef0c9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <panel
  border="true"
  follows="all"
@@ -15,28 +15,24 @@
    top="6"
    left="10"
    height="23"
-   width="110"
+   width="140"
    name="key_mode">
     <combo_box.item
      label="Third Person "
      name="third_person"
      value="1"/>
     <combo_box.item
-     label="First Person "
+     label="First Person (Mouselook)"
      name="first_person"
      value="0"/>
-    <combo_box.item
-     label="Edit"
-     name="edit"
-     value="2"/>
     <combo_box.item
      label="Edit Avatar"
      name="edit_avatar"
-     value="3"/>
+     value="2"/>
     <combo_box.item
      label="Sitting"
      name="sitting"
-     value="4"/>
+     value="3"/>
   </combo_box>
 
   <button
@@ -45,8 +41,8 @@
    top="6"
    right="-10"
    height="23"
-   width="110"
-   label="Restore Default"
+   width="140"
+   label="Restore Defaults"
    tooltip="Restores default values for all control modes."
    name="restore_defaults"/>
 
-- 
cgit v1.2.3


From b8d5a5f08173f44034a1ecfce86d7b4ff15b4a82 Mon Sep 17 00:00:00 2001
From: Ansariel Hiller <ansarielhiller@yahoo.de>
Date: Sat, 9 Nov 2019 17:28:23 +0000
Subject: Save XUI parser warning

---
 indra/newview/skins/default/xui/en/panel_preferences_controls.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index 0f830ef0c9..904387909e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -43,7 +43,7 @@
    height="23"
    width="140"
    label="Restore Defaults"
-   tooltip="Restores default values for all control modes."
+   tool_tip="Restores default values for all control modes."
    name="restore_defaults"/>
 
   <scroll_list
-- 
cgit v1.2.3


From e7d383be8a9734a5008690b8a7e1b179e2f2a718 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Sun, 10 Nov 2019 14:40:07 +0200
Subject: SL-6109 localization support for control table

---
 indra/newview/skins/default/xui/en/control_table_contents.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
index 288075628c..da9cceb2db 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents.xml
@@ -18,6 +18,7 @@
      name="lst_ctrl3" />
     <rows
      enabled="false"
+     name="move_actions"
      value="">
         <columns
          type="icontext"
@@ -202,6 +203,7 @@
     </rows>
     <rows
      enabled="false"
+     name="camera_actions"
      value="">
         <columns
          type="icontext"
@@ -424,6 +426,7 @@
     </rows>
     <rows
      enabled="false"
+     name="editing_actions"
      value="">
         <columns
          type="icontext"
@@ -502,6 +505,7 @@
     </rows>
     <rows
      enabled="false"
+     name="media_actions"
      value="">
         <columns
          type="icontext"
-- 
cgit v1.2.3


From 5568018bd20a43c30caca0c6288e63bfae29a2e3 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Sun, 10 Nov 2019 19:06:03 +0200
Subject: SL-6109 Better key and table localization support and fix for
 key-replacing

---
 .../default/xui/en/control_table_contents.xml      | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
index da9cceb2db..7b777befee 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents.xml
@@ -30,6 +30,7 @@
          value="Move_Walk_Off" />
     </rows>
     <rows
+     name="walk_to"
      value="walk_to">
         <columns
          column="lst_action"
@@ -40,6 +41,7 @@
          value="Walk to" />
     </rows>
     <rows
+     name="teleport_to"
      value="teleport_to">
         <columns
          column="lst_action"
@@ -50,6 +52,7 @@
          value="Teleport to" />
     </rows>
     <rows
+     name="push_forward"
      value="push_forward">
         <columns
          column="lst_action"
@@ -59,6 +62,7 @@
          value="Move Forward" />
     </rows>
     <rows
+     name="push_backward"
      value="push_backward">
         <columns
          column="lst_action"
@@ -68,6 +72,7 @@
          value="Move Backward" />
     </rows>
     <rows
+     name="turn_left"
      value="turn_left">
         <columns
          column="lst_action"
@@ -77,6 +82,7 @@
          value="Left" />
     </rows>
     <rows
+     name="turn_right"
      value="turn_right">
         <columns
          column="lst_action"
@@ -86,6 +92,7 @@
          value="Right" />
     </rows>
     <rows
+     name="slide_left"
      value="slide_left">
         <columns
          column="lst_action"
@@ -95,6 +102,7 @@
          value="Strafe left" />
     </rows>
     <rows
+     name="slide_right"
      value="slide_right">
         <columns
          column="lst_action"
@@ -104,6 +112,7 @@
          value="Strafe right" />
     </rows>
     <rows
+     name="jump"
      value="jump">
         <columns
          column="lst_action"
@@ -113,6 +122,7 @@
          value="Jump/Up" />
     </rows>
     <rows
+     name="push_down"
      value="push_down">
         <columns
          column="lst_action"
@@ -122,6 +132,7 @@
          value="Down" />
     </rows>
     <rows
+     name="run_forward"
      value="run_forward">
         <columns
          column="lst_action"
@@ -131,6 +142,7 @@
          value="Run Forward" />
     </rows>
     <rows
+     name="run_backward"
      value="run_backward">
         <columns
          column="lst_action"
@@ -140,6 +152,7 @@
          value="Run Backward" />
     </rows>
     <rows
+     name="run_left"
      value="run_left">
         <columns
          column="lst_action"
@@ -149,6 +162,7 @@
          value="Run Left" />
     </rows>
     <rows
+     name="run_right"
      value="run_right">
         <columns
          column="lst_action"
@@ -158,6 +172,7 @@
          value="Run Right" />
     </rows>
     <rows
+     name="toggle_run"
      value="toggle_run">
         <columns
          column="lst_action"
@@ -167,6 +182,7 @@
          value="Toggle Run" />
     </rows>
     <rows
+     name="toggle_fly"
      value="toggle_fly">
         <columns
          column="lst_action"
@@ -176,6 +192,7 @@
          value="Fly/Stop flying" />
     </rows>
     <rows
+     name="toggle_sit"
      value="toggle_sit">
         <columns
          column="lst_action"
@@ -185,6 +202,7 @@
          value="Sit/Stand" />
     </rows>
     <rows
+     name="stop_moving"
      value="stop_moving">
         <columns
          column="lst_action"
@@ -215,6 +233,7 @@
          value="Cam_FreeCam_Off" />
     </rows>
     <rows
+     name="look_up"
      value="look_up">
         <columns
          column="lst_action"
@@ -224,6 +243,7 @@
          value="Look Up" />
     </rows>
     <rows
+     name="look_down"
      value="look_down">
         <columns
          column="lst_action"
@@ -233,6 +253,7 @@
          value="Look Down" />
     </rows>
     <rows
+     name="move_forward"
      value="move_forward">
         <columns
          column="lst_action"
@@ -242,6 +263,7 @@
          value="Camera Forward" />
     </rows>
     <rows
+     name="move_backward"
      value="move_backward">
         <columns
          column="lst_action"
@@ -251,6 +273,7 @@
          value="Camera Backward" />
     </rows>
     <rows
+     name="move_forward_fast"
      value="move_forward_fast">
         <columns
          column="lst_action"
@@ -260,6 +283,7 @@
          value="Camera Forward Fast" />
     </rows>
     <rows
+     name="move_backward_fast"
      value="move_backward_fast">
         <columns
          column="lst_action"
@@ -269,6 +293,7 @@
          value="Camera Backward Fast" />
     </rows>
     <rows
+     name="move_forward_sitting"
      value="move_forward_sitting">
         <columns
          column="lst_action"
@@ -278,6 +303,7 @@
          value="Camera Forward Sitting" />
     </rows>
     <rows
+     name="move_backward_sitting"
      value="move_backward_sitting">
         <columns
          column="lst_action"
@@ -287,6 +313,7 @@
          value="Camera Backward Sitting" />
     </rows>
     <rows
+     name="spin_over"
      value="spin_over">
         <columns
          column="lst_action"
@@ -296,6 +323,7 @@
          value="Camera Spin Over" />
     </rows>
     <rows
+     name="spin_under"
      value="spin_under">
         <columns
          column="lst_action"
@@ -305,6 +333,7 @@
          value="Camera Spin Under" />
     </rows>
     <rows
+     name="spin_over_sitting"
      value="spin_over_sitting">
         <columns
          column="lst_action"
@@ -314,6 +343,7 @@
          value="Camera Spin Over" />
     </rows>
     <rows
+     name="spin_under_sitting"
      value="spin_under_sitting">
         <columns
          column="lst_action"
@@ -323,6 +353,7 @@
          value="Camera Spin Under" />
     </rows>
     <rows
+     name="pan_up"
      value="pan_up">
         <columns
          column="lst_action"
@@ -332,6 +363,7 @@
          value="Camera Pan Up" />
     </rows>
     <rows
+     name="pan_down"
      value="pan_down">
         <columns
          column="lst_action"
@@ -341,6 +373,7 @@
          value="Camera Pan Down" />
     </rows>
     <rows
+     name="pan_left"
      value="pan_left">
         <columns
          column="lst_action"
@@ -350,6 +383,7 @@
          value="Camera Pan Left" />
     </rows>
     <rows
+     name="pan_right"
      value="pan_right">
         <columns
          column="lst_action"
@@ -359,6 +393,7 @@
          value="Camera Pan Right" />
     </rows>
     <rows
+     name="pan_in"
      value="pan_in">
         <columns
          column="lst_action"
@@ -368,6 +403,7 @@
          value="Camera Pan In" />
     </rows>
     <rows
+     name="pan_out"
      value="pan_out">
         <columns
          column="lst_action"
@@ -377,6 +413,7 @@
          value="Camera Pan Out" />
     </rows>
     <rows
+     name="spin_around_ccw"
      value="spin_around_ccw">
         <columns
          column="lst_action"
@@ -387,6 +424,7 @@
          value="Counterclockwise" />
     </rows>
     <rows
+     name="spin_around_cw"
      value="spin_around_cw">
         <columns
          column="lst_action"
@@ -397,6 +435,7 @@
          value="Clockwise" />
     </rows>
     <rows
+     name="spin_around_ccw_sitting"
      value="spin_around_ccw_sitting">
         <columns
          column="lst_action"
@@ -407,6 +446,7 @@
          value="Counterclockwise Sitting" />
     </rows>
     <rows
+     name="spin_around_cw_sitting"
      value="spin_around_cw_sitting">
         <columns
          column="lst_action"
@@ -438,6 +478,7 @@
          value="Tool_Dozer" />
     </rows>
     <rows
+     name="edit_avatar_spin_ccw"
      value="edit_avatar_spin_ccw">
         <columns
          column="lst_action"
@@ -448,6 +489,7 @@
          value="Counterclockwise" />
     </rows>
     <rows
+     name="edit_avatar_spin_cw"
      value="edit_avatar_spin_cw">
         <columns
          column="lst_action"
@@ -458,6 +500,7 @@
          value="Clockwise" />
     </rows>
     <rows
+     name="edit_avatar_spin_over"
      value="edit_avatar_spin_over">
         <columns
          column="lst_action"
@@ -468,6 +511,7 @@
          value="Camera Spin Over" />
     </rows>
     <rows
+     name="edit_avatar_spin_under"
      value="edit_avatar_spin_under">
         <columns
          column="lst_action"
@@ -478,6 +522,7 @@
          value="Camera Spin Under" />
     </rows>
     <rows
+     name="edit_avatar_move_forward"
      value="edit_avatar_move_forward">
         <columns
          column="lst_action"
@@ -487,6 +532,7 @@
          value="Camera Forward" />
     </rows>
     <rows
+     name="edit_avatar_move_backward"
      value="edit_avatar_move_backward">
         <columns
          column="lst_action"
@@ -517,6 +563,7 @@
          value="Audio_Press" />
     </rows>
     <rows
+     name="toggle_pause_media"
      value="toggle_pause_media">
         <columns
          column="lst_action"
@@ -526,6 +573,7 @@
          value="Play/Pause Media" />
     </rows>
     <rows
+     name="toggle_enable_media"
      value="toggle_enable_media">
         <columns
          column="lst_action"
@@ -535,6 +583,7 @@
          value="Play/Stop All Media" />
     </rows>
     <rows
+     name="voice_follow_key"
      value="voice_follow_key">
         <columns
          column="lst_action"
@@ -544,6 +593,7 @@
          value="Voice" />
     </rows>
     <rows
+     name="toggle_voice"
      value="toggle_voice">
         <columns
          column="lst_action"
@@ -553,6 +603,7 @@
          value="Toggle Voice" />
     </rows>
     <rows
+     name="start_chat"
      value="start_chat">
         <columns
          column="lst_action"
@@ -562,6 +613,7 @@
          value="Start Chat" />
     </rows>
     <rows
+     name="start_gesture"
      value="start_gesture">
         <columns
          column="lst_action"
-- 
cgit v1.2.3


From 708fdb4e67393dbf03a0e0c82608d62f1868926a Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Tue, 12 Nov 2019 14:08:01 +0200
Subject: SL-6109 Mouse localization support

---
 indra/newview/skins/default/xui/en/strings.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 1bfac6aeb7..cd639ded36 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -4088,6 +4088,15 @@ Try enclosing path to the editor with double quotes.
   <string name="Z">Z</string>
   <!-- Key names end -->
 
+  <!-- Mouse button names (short) begin -->
+  <string name="LMB">LMB</string>
+  <string name="MMB">MMB</string>
+  <string name="RMB">RMB</string>
+  <string name="MB4">MB4</string>
+  <string name="MB5">MB5</string>
+  <string name="Double LMB">Double LMB</string>
+  <!-- Mouse button names end -->
+
   <!-- llviewerwindow -->
   <string name="BeaconParticle">Viewing particle beacons (blue)</string>
   <string name="BeaconPhysical">Viewing physical object beacons (green)</string>
-- 
cgit v1.2.3


From bcaf860e7e37bd3f0c48be9d4b94e0912d52b3f1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 11 Jun 2020 01:31:43 +0300
Subject: SL-13438 Fixed description

---
 indra/newview/skins/default/xui/en/control_table_contents.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
index 7b777befee..f3a34c59eb 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents.xml
@@ -340,7 +340,7 @@
          font="SansSerif"
          halign="left"
          name="lst_action"
-         value="Camera Spin Over" />
+         value="Camera Spin Over Sitting" />
     </rows>
     <rows
      name="spin_under_sitting"
@@ -350,7 +350,7 @@
          font="SansSerif"
          halign="left"
          name="lst_action"
-         value="Camera Spin Under" />
+         value="Camera Spin Under Sitting" />
     </rows>
     <rows
      name="pan_up"
-- 
cgit v1.2.3


From 629cd92c47e90a1fb8711c46bd406476d01e9b9b Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 12 Jun 2020 18:51:13 +0300
Subject: SL-13421 Removed camera control keybindings from mouselook

---
 .../default/xui/en/control_table_contents.xml      | 625 ---------------------
 .../xui/en/control_table_contents_camera.xml       | 240 ++++++++
 .../en/control_table_contents_columns_basic.xml    |  19 +
 .../xui/en/control_table_contents_editing.xml      |  80 +++
 .../xui/en/control_table_contents_media.xml        |  76 +++
 .../xui/en/control_table_contents_movement.xml     | 198 +++++++
 6 files changed, 613 insertions(+), 625 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/control_table_contents.xml
 create mode 100644 indra/newview/skins/default/xui/en/control_table_contents_camera.xml
 create mode 100644 indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml
 create mode 100644 indra/newview/skins/default/xui/en/control_table_contents_editing.xml
 create mode 100644 indra/newview/skins/default/xui/en/control_table_contents_media.xml
 create mode 100644 indra/newview/skins/default/xui/en/control_table_contents_movement.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
deleted file mode 100644
index f3a34c59eb..0000000000
--- a/indra/newview/skins/default/xui/en/control_table_contents.xml
+++ /dev/null
@@ -1,625 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<contents>
-    <columns
-     relative_width="0.34"
-     label="Action"
-     name="lst_action" />
-    <columns
-     relative_width="0.22"
-     label="Primary Control"
-     name="lst_ctrl1" />
-    <columns
-     relative_width="0.22"
-     label="Alternate 1"
-     name="lst_ctrl2" />
-    <columns
-     relative_width="0.22"
-     label="Alternate 2"
-     name="lst_ctrl3" />
-    <rows
-     enabled="false"
-     name="move_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Move Actions"
-         name="lst_action"
-         value="Move_Walk_Off" />
-    </rows>
-    <rows
-     name="walk_to"
-     value="walk_to">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Walk to location mouse cursor points to"
-         value="Walk to" />
-    </rows>
-    <rows
-     name="teleport_to"
-     value="teleport_to">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Teleport to location mouse cursor points to, but not all locations allow direct teleportation so you might be teleported closer to destination instead"
-         value="Teleport to" />
-    </rows>
-    <rows
-     name="push_forward"
-     value="push_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Move Forward" />
-    </rows>
-    <rows
-     name="push_backward"
-     value="push_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Move Backward" />
-    </rows>
-    <rows
-     name="turn_left"
-     value="turn_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Left" />
-    </rows>
-    <rows
-     name="turn_right"
-     value="turn_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Right" />
-    </rows>
-    <rows
-     name="slide_left"
-     value="slide_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Strafe left" />
-    </rows>
-    <rows
-     name="slide_right"
-     value="slide_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Strafe right" />
-    </rows>
-    <rows
-     name="jump"
-     value="jump">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Jump/Up" />
-    </rows>
-    <rows
-     name="push_down"
-     value="push_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Down" />
-    </rows>
-    <rows
-     name="run_forward"
-     value="run_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Forward" />
-    </rows>
-    <rows
-     name="run_backward"
-     value="run_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Backward" />
-    </rows>
-    <rows
-     name="run_left"
-     value="run_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Left" />
-    </rows>
-    <rows
-     name="run_right"
-     value="run_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Run Right" />
-    </rows>
-    <rows
-     name="toggle_run"
-     value="toggle_run">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Toggle Run" />
-    </rows>
-    <rows
-     name="toggle_fly"
-     value="toggle_fly">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Fly/Stop flying" />
-    </rows>
-    <rows
-     name="toggle_sit"
-     value="toggle_sit">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Sit/Stand" />
-    </rows>
-    <rows
-     name="stop_moving"
-     value="stop_moving">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Stop Moving" />
-    </rows>
-    <rows
-     enabled="false">
-        <columns
-         type="icon"
-         color="0 0 0 0.7"
-         halign="center"
-         value="menu_separator" />
-    </rows>
-    <rows
-     enabled="false"
-     name="camera_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Camera"
-         name="lst_action"
-         value="Cam_FreeCam_Off" />
-    </rows>
-    <rows
-     name="look_up"
-     value="look_up">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Look Up" />
-    </rows>
-    <rows
-     name="look_down"
-     value="look_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Look Down" />
-    </rows>
-    <rows
-     name="move_forward"
-     value="move_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward" />
-    </rows>
-    <rows
-     name="move_backward"
-     value="move_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward" />
-    </rows>
-    <rows
-     name="move_forward_fast"
-     value="move_forward_fast">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward Fast" />
-    </rows>
-    <rows
-     name="move_backward_fast"
-     value="move_backward_fast">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward Fast" />
-    </rows>
-    <rows
-     name="move_forward_sitting"
-     value="move_forward_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward Sitting" />
-    </rows>
-    <rows
-     name="move_backward_sitting"
-     value="move_backward_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward Sitting" />
-    </rows>
-    <rows
-     name="spin_over"
-     value="spin_over">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Over" />
-    </rows>
-    <rows
-     name="spin_under"
-     value="spin_under">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Under" />
-    </rows>
-    <rows
-     name="spin_over_sitting"
-     value="spin_over_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Over Sitting" />
-    </rows>
-    <rows
-     name="spin_under_sitting"
-     value="spin_under_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Under Sitting" />
-    </rows>
-    <rows
-     name="pan_up"
-     value="pan_up">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Up" />
-    </rows>
-    <rows
-     name="pan_down"
-     value="pan_down">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Down" />
-    </rows>
-    <rows
-     name="pan_left"
-     value="pan_left">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Left" />
-    </rows>
-    <rows
-     name="pan_right"
-     value="pan_right">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Right" />
-    </rows>
-    <rows
-     name="pan_in"
-     value="pan_in">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan In" />
-    </rows>
-    <rows
-     name="pan_out"
-     value="pan_out">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Pan Out" />
-    </rows>
-    <rows
-     name="spin_around_ccw"
-     value="spin_around_ccw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around counterclockwise"
-         value="Counterclockwise" />
-    </rows>
-    <rows
-     name="spin_around_cw"
-     value="spin_around_cw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around clockwise"
-         value="Clockwise" />
-    </rows>
-    <rows
-     name="spin_around_ccw_sitting"
-     value="spin_around_ccw_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around counterclockwise sitting"
-         value="Counterclockwise Sitting" />
-    </rows>
-    <rows
-     name="spin_around_cw_sitting"
-     value="spin_around_cw_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around clockwise sitting"
-         value="Clockwise Sitting" />
-    </rows>
-    <rows
-     enabled="false">
-        <columns
-         type="icon"
-         color="0 0 0 0.7"
-         halign="center"
-         value="menu_separator" />
-    </rows>
-    <rows
-     enabled="false"
-     name="editing_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Editing"
-         name="lst_action"
-         value="Tool_Dozer" />
-    </rows>
-    <rows
-     name="edit_avatar_spin_ccw"
-     value="edit_avatar_spin_ccw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around avatar counterclockwise"
-         value="Counterclockwise" />
-    </rows>
-    <rows
-     name="edit_avatar_spin_cw"
-     value="edit_avatar_spin_cw">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around avatar clockwise"
-         value="Clockwise" />
-    </rows>
-    <rows
-     name="edit_avatar_spin_over"
-     value="edit_avatar_spin_over">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin over avatar"
-         value="Camera Spin Over" />
-    </rows>
-    <rows
-     name="edit_avatar_spin_under"
-     value="edit_avatar_spin_under">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin under avatar"
-         value="Camera Spin Under" />
-    </rows>
-    <rows
-     name="edit_avatar_move_forward"
-     value="edit_avatar_move_forward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward" />
-    </rows>
-    <rows
-     name="edit_avatar_move_backward"
-     value="edit_avatar_move_backward">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward" />
-    </rows>
-    <rows
-     enabled="false">
-        <columns
-         type="icon"
-         color="0 0 0 0.7"
-         halign="center"
-         value="menu_separator" />
-    </rows>
-    <rows
-     enabled="false"
-     name="media_actions"
-     value="">
-        <columns
-         type="icontext"
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         label="Sound and Media"
-         name="lst_action"
-         value="Audio_Press" />
-    </rows>
-    <rows
-     name="toggle_pause_media"
-     value="toggle_pause_media">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Play/Pause Media" />
-    </rows>
-    <rows
-     name="toggle_enable_media"
-     value="toggle_enable_media">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Play/Stop All Media" />
-    </rows>
-    <rows
-     name="voice_follow_key"
-     value="voice_follow_key">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Voice" />
-    </rows>
-    <rows
-     name="toggle_voice"
-     value="toggle_voice">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Toggle Voice" />
-    </rows>
-    <rows
-     name="start_chat"
-     value="start_chat">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Start Chat" />
-    </rows>
-    <rows
-     name="start_gesture"
-     value="start_gesture">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Start Gesture" />
-    </rows>
-</contents>
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
new file mode 100644
index 0000000000..35cbb02271
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+    <rows
+     enabled="false"
+     name="camera_actions"
+     value="">
+        <columns
+         type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Camera"
+         name="lst_action"
+         value="Cam_FreeCam_Off" />
+    </rows>
+    <rows
+     name="look_up"
+     value="look_up">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Look Up" />
+    </rows>
+    <rows
+     name="look_down"
+     value="look_down">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Look Down" />
+    </rows>
+    <rows
+     name="move_forward"
+     value="move_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward" />
+    </rows>
+    <rows
+     name="move_backward"
+     value="move_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward" />
+    </rows>
+    <rows
+     name="move_forward_fast"
+     value="move_forward_fast">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward Fast" />
+    </rows>
+    <rows
+     name="move_backward_fast"
+     value="move_backward_fast">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward Fast" />
+    </rows>
+    <rows
+     name="move_forward_sitting"
+     value="move_forward_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward Sitting" />
+    </rows>
+    <rows
+     name="move_backward_sitting"
+     value="move_backward_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward Sitting" />
+    </rows>
+    <rows
+     name="spin_over"
+     value="spin_over">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Over" />
+    </rows>
+    <rows
+     name="spin_under"
+     value="spin_under">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Under" />
+    </rows>
+    <rows
+     name="spin_over_sitting"
+     value="spin_over_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Over Sitting" />
+    </rows>
+    <rows
+     name="spin_under_sitting"
+     value="spin_under_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Under Sitting" />
+    </rows>
+    <rows
+     name="pan_up"
+     value="pan_up">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Up" />
+    </rows>
+    <rows
+     name="pan_down"
+     value="pan_down">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Down" />
+    </rows>
+    <rows
+     name="pan_left"
+     value="pan_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Left" />
+    </rows>
+    <rows
+     name="pan_right"
+     value="pan_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Right" />
+    </rows>
+    <rows
+     name="pan_in"
+     value="pan_in">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan In" />
+    </rows>
+    <rows
+     name="pan_out"
+     value="pan_out">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Pan Out" />
+    </rows>
+    <rows
+     name="spin_around_ccw"
+     value="spin_around_ccw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around counterclockwise"
+         value="Counterclockwise" />
+    </rows>
+    <rows
+     name="spin_around_cw"
+     value="spin_around_cw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around clockwise"
+         value="Clockwise" />
+    </rows>
+    <rows
+     name="spin_around_ccw_sitting"
+     value="spin_around_ccw_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around counterclockwise sitting"
+         value="Counterclockwise Sitting" />
+    </rows>
+    <rows
+     name="spin_around_cw_sitting"
+     value="spin_around_cw_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around clockwise sitting"
+         value="Clockwise Sitting" />
+    </rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml b/indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml
new file mode 100644
index 0000000000..e707aaf22c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/control_table_contents_columns_basic.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+    <columns
+     relative_width="0.34"
+     label="Action"
+     name="lst_action" />
+    <columns
+     relative_width="0.22"
+     label="Primary Control"
+     name="lst_ctrl1" />
+    <columns
+     relative_width="0.22"
+     label="Alternate 1"
+     name="lst_ctrl2" />
+    <columns
+     relative_width="0.22"
+     label="Alternate 2"
+     name="lst_ctrl3" />
+</contents>
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_editing.xml b/indra/newview/skins/default/xui/en/control_table_contents_editing.xml
new file mode 100644
index 0000000000..2a3314840a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/control_table_contents_editing.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+    <rows
+     enabled="false"
+     name="editing_actions"
+     value="">
+        <columns
+         type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Editing"
+         name="lst_action"
+         value="Tool_Dozer" />
+    </rows>
+    <rows
+     name="edit_avatar_spin_ccw"
+     value="edit_avatar_spin_ccw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around avatar counterclockwise"
+         value="Counterclockwise" />
+    </rows>
+    <rows
+     name="edit_avatar_spin_cw"
+     value="edit_avatar_spin_cw">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around avatar clockwise"
+         value="Clockwise" />
+    </rows>
+    <rows
+     name="edit_avatar_spin_over"
+     value="edit_avatar_spin_over">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin over avatar"
+         value="Camera Spin Over" />
+    </rows>
+    <rows
+     name="edit_avatar_spin_under"
+     value="edit_avatar_spin_under">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin under avatar"
+         value="Camera Spin Under" />
+    </rows>
+    <rows
+     name="edit_avatar_move_forward"
+     value="edit_avatar_move_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward" />
+    </rows>
+    <rows
+     name="edit_avatar_move_backward"
+     value="edit_avatar_move_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward" />
+    </rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_media.xml b/indra/newview/skins/default/xui/en/control_table_contents_media.xml
new file mode 100644
index 0000000000..ce5d3556b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/control_table_contents_media.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+    <rows
+     enabled="false"
+     name="media_actions"
+     value="">
+        <columns
+         type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Sound and Media"
+         name="lst_action"
+         value="Audio_Press" />
+    </rows>
+    <rows
+     name="toggle_pause_media"
+     value="toggle_pause_media">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Play/Pause Media" />
+    </rows>
+    <rows
+     name="toggle_enable_media"
+     value="toggle_enable_media">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Play/Stop All Media" />
+    </rows>
+    <rows
+     name="voice_follow_key"
+     value="voice_follow_key">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Voice" />
+    </rows>
+    <rows
+     name="toggle_voice"
+     value="toggle_voice">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Toggle Voice" />
+    </rows>
+    <rows
+     name="start_chat"
+     value="start_chat">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Start Chat" />
+    </rows>
+    <rows
+     name="start_gesture"
+     value="start_gesture">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Start Gesture" />
+    </rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_movement.xml b/indra/newview/skins/default/xui/en/control_table_contents_movement.xml
new file mode 100644
index 0000000000..b410d2dc1c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/control_table_contents_movement.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+    <rows
+     enabled="false"
+     name="move_actions"
+     value="">
+        <columns
+         type="icontext"
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         label="Move Actions"
+         name="lst_action"
+         value="Move_Walk_Off" />
+    </rows>
+    <rows
+     name="walk_to"
+     value="walk_to">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Walk to location mouse cursor points to"
+         value="Walk to" />
+    </rows>
+    <rows
+     name="teleport_to"
+     value="teleport_to">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Teleport to location mouse cursor points to, but not all locations allow direct teleportation so you might be teleported closer to destination instead"
+         value="Teleport to" />
+    </rows>
+    <rows
+     name="push_forward"
+     value="push_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Move Forward" />
+    </rows>
+    <rows
+     name="push_backward"
+     value="push_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Move Backward" />
+    </rows>
+    <rows
+     name="turn_left"
+     value="turn_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Left" />
+    </rows>
+    <rows
+     name="turn_right"
+     value="turn_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Right" />
+    </rows>
+    <rows
+     name="slide_left"
+     value="slide_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Strafe left" />
+    </rows>
+    <rows
+     name="slide_right"
+     value="slide_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Strafe right" />
+    </rows>
+    <rows
+     name="jump"
+     value="jump">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Jump/Up" />
+    </rows>
+    <rows
+     name="push_down"
+     value="push_down">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Down" />
+    </rows>
+    <rows
+     name="run_forward"
+     value="run_forward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Forward" />
+    </rows>
+    <rows
+     name="run_backward"
+     value="run_backward">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Backward" />
+    </rows>
+    <rows
+     name="run_left"
+     value="run_left">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Left" />
+    </rows>
+    <rows
+     name="run_right"
+     value="run_right">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Run Right" />
+    </rows>
+    <rows
+     name="toggle_run"
+     value="toggle_run">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Toggle Run" />
+    </rows>
+    <rows
+     name="toggle_fly"
+     value="toggle_fly">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Fly/Stop flying" />
+    </rows>
+    <rows
+     name="toggle_sit"
+     value="toggle_sit">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Sit/Stand" />
+    </rows>
+    <rows
+     name="stop_moving"
+     value="stop_moving">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Stop Moving" />
+    </rows>
+</contents>
-- 
cgit v1.2.3


From c604b274fb4ab218a89fc03a4ea5cc1b739ad65f Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 12 Jun 2020 20:09:43 +0300
Subject: SL-13421 Separated some sitting-exclusive controls

---
 .../xui/en/control_table_contents_camera.xml       | 62 ---------------------
 .../en/control_table_contents_camera_sitting.xml   | 65 ++++++++++++++++++++++
 2 files changed, 65 insertions(+), 62 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
index 35cbb02271..aba81e3134 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
@@ -73,26 +73,6 @@
          name="lst_action"
          value="Camera Backward Fast" />
     </rows>
-    <rows
-     name="move_forward_sitting"
-     value="move_forward_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward Sitting" />
-    </rows>
-    <rows
-     name="move_backward_sitting"
-     value="move_backward_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward Sitting" />
-    </rows>
     <rows
      name="spin_over"
      value="spin_over">
@@ -113,26 +93,6 @@
          name="lst_action"
          value="Camera Spin Under" />
     </rows>
-    <rows
-     name="spin_over_sitting"
-     value="spin_over_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Over Sitting" />
-    </rows>
-    <rows
-     name="spin_under_sitting"
-     value="spin_under_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Under Sitting" />
-    </rows>
     <rows
      name="pan_up"
      value="pan_up">
@@ -215,26 +175,4 @@
          tool_tip="Camera spin around clockwise"
          value="Clockwise" />
     </rows>
-    <rows
-     name="spin_around_ccw_sitting"
-     value="spin_around_ccw_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around counterclockwise sitting"
-         value="Counterclockwise Sitting" />
-    </rows>
-    <rows
-     name="spin_around_cw_sitting"
-     value="spin_around_cw_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around clockwise sitting"
-         value="Clockwise Sitting" />
-    </rows>
 </contents>
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml b/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml
new file mode 100644
index 0000000000..9334c6e179
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+    <rows
+     name="move_forward_sitting"
+     value="move_forward_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward Sitting" />
+    </rows>
+    <rows
+     name="move_backward_sitting"
+     value="move_backward_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward Sitting" />
+    </rows>
+    <rows
+     name="spin_over_sitting"
+     value="spin_over_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Over Sitting" />
+    </rows>
+    <rows
+     name="spin_under_sitting"
+     value="spin_under_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Under Sitting" />
+    </rows>
+    <rows
+     name="spin_around_ccw_sitting"
+     value="spin_around_ccw_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around counterclockwise sitting"
+         value="Counterclockwise Sitting" />
+    </rows>
+    <rows
+     name="spin_around_cw_sitting"
+     value="spin_around_cw_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around clockwise sitting"
+         value="Clockwise Sitting" />
+    </rows>
+</contents>
-- 
cgit v1.2.3


From e578491be761fefa34e4041458e2cf5badc81873 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Mon, 15 Jun 2020 20:35:58 +0300
Subject: SL-13418 Restored previously removed 'click on land' controls from
 'move & view'

According to UX UI engineer. Also adapted it to new system, but it needs a better solution.
---
 .../default/xui/en/panel_preferences_move.xml      | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)

(limited to 'indra/newview/skins/default/xui')

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 d106456b31..8794e3bf95 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -195,6 +195,70 @@
    name="invert_mouse"
    top_delta="0"
    width="128" />
+  <text
+   follows="left|top"
+   type="string"
+   length="1"
+   height="10"
+   layout="topleft"
+   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="86"
+   name="double_click_action_lbl"
+   width="150"
+   top_pad="12">
+    Double click on land:
+  </text>
+  <combo_box
+   height="23"
+   layout="topleft"
+   left_pad="10"
+   top_delta="-6"
+   name="double_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.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"
-- 
cgit v1.2.3


From 7717097f7cfa1deaa934b9846c22523f53c600d3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 23 Jun 2020 20:29:00 +0300
Subject: SL-6109 Teleport and autopilot should not work in some cases

Hides teleport_to and walk_to also optimizes couple things.
---
 .../xui/en/control_table_contents_camera.xml       | 62 +++++++++++++++++++++
 .../en/control_table_contents_camera_sitting.xml   | 65 ----------------------
 2 files changed, 62 insertions(+), 65 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
index aba81e3134..24cbb2b885 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents_camera.xml
@@ -175,4 +175,66 @@
          tool_tip="Camera spin around clockwise"
          value="Clockwise" />
     </rows>
+    <rows
+     name="move_forward_sitting"
+     value="move_forward_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Forward Sitting" />
+    </rows>
+    <rows
+     name="move_backward_sitting"
+     value="move_backward_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Backward Sitting" />
+    </rows>
+    <rows
+     name="spin_over_sitting"
+     value="spin_over_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Over Sitting" />
+    </rows>
+    <rows
+     name="spin_under_sitting"
+     value="spin_under_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         value="Camera Spin Under Sitting" />
+    </rows>
+    <rows
+     name="spin_around_ccw_sitting"
+     value="spin_around_ccw_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around counterclockwise sitting"
+         value="Counterclockwise Sitting" />
+    </rows>
+    <rows
+     name="spin_around_cw_sitting"
+     value="spin_around_cw_sitting">
+        <columns
+         column="lst_action"
+         font="SansSerif"
+         halign="left"
+         name="lst_action"
+         tool_tip="Camera spin around clockwise sitting"
+         value="Clockwise Sitting" />
+    </rows>
 </contents>
diff --git a/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml b/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml
deleted file mode 100644
index 9334c6e179..0000000000
--- a/indra/newview/skins/default/xui/en/control_table_contents_camera_sitting.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<contents>
-    <rows
-     name="move_forward_sitting"
-     value="move_forward_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Forward Sitting" />
-    </rows>
-    <rows
-     name="move_backward_sitting"
-     value="move_backward_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Backward Sitting" />
-    </rows>
-    <rows
-     name="spin_over_sitting"
-     value="spin_over_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Over Sitting" />
-    </rows>
-    <rows
-     name="spin_under_sitting"
-     value="spin_under_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         value="Camera Spin Under Sitting" />
-    </rows>
-    <rows
-     name="spin_around_ccw_sitting"
-     value="spin_around_ccw_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around counterclockwise sitting"
-         value="Counterclockwise Sitting" />
-    </rows>
-    <rows
-     name="spin_around_cw_sitting"
-     value="spin_around_cw_sitting">
-        <columns
-         column="lst_action"
-         font="SansSerif"
-         halign="left"
-         name="lst_action"
-         tool_tip="Camera spin around clockwise sitting"
-         value="Clockwise Sitting" />
-    </rows>
-</contents>
-- 
cgit v1.2.3


From 703cbef8ab07db9fe65a39c577377a3e40f63728 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 21 Jan 2020 17:02:53 +0200
Subject: SL-12494 Add some more key bindings

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 31 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 873b95926b..c7ab26bc22 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -56,7 +56,8 @@
       </menu_item_call>
       <menu_item_call
        label="Places..."
-       name="Places">
+       name="Places"
+       shortcut="control|L">
         <menu_item_call.on_click
          function="Floater.ToggleOrBringToFront"
          parameter="places" />
@@ -85,11 +86,22 @@
       <menu_item_separator/>
       <menu_item_call
        label="Camera Controls..."
-       name="Camera Controls">
+       name="Camera Controls"
+       shortcut="control|K">
         <menu_item_call.on_click
          function="Floater.ToggleOrBringToFront"
          parameter="camera" />
       </menu_item_call>
+      <menu_item_call
+       label="Hover Height"
+       name="HoverHeight"
+       shortcut="alt|control|H"
+       visible="false">
+        <menu_item_call.on_click
+         function="HoverHeight"/>
+        <menu_item_call.on_enable
+         function="Edit.EnableHoverHeight"/>
+      </menu_item_call>
       <menu
        create_jump_keys="true"
        label="Movement"
@@ -150,7 +162,8 @@
         </menu_item_check>
         <menu_item_call
          label="Stop Animating Me"
-         name="Stop Animating My Avatar">
+         name="Stop Animating My Avatar"
+         shortcut="alt|shift|A">
           <menu_item_call.on_click
            function="Tools.StopAllAnimations" />
         </menu_item_call>
@@ -458,7 +471,8 @@
         </menu_item_check>
         <menu_item_call
              label="Events"
-             name="Events">
+             name="Events"
+             shortcut="control|E">
             <menu_item_call.on_click
              function="Advanced.ShowURL"
              parameter="https://secondlife.com/my/community/events"/>
@@ -647,7 +661,8 @@
          tear_off="true">
             <menu_item_check
              label="Sunrise"
-             name="Sunrise">
+             name="Sunrise"
+             shortcut="control|shift|O">
                 <menu_item_check.on_click
                  function="World.EnvSettings"
                  parameter="sunrise" />
@@ -679,7 +694,8 @@
             </menu_item_check>
             <menu_item_check
              label="Midnight"
-             name="Midnight">
+             name="Midnight"
+             shortcut="control|shift|Z">
                 <menu_item_check.on_click
                  function="World.EnvSettings"
                  parameter="midnight" />
@@ -1317,7 +1333,8 @@ function="World.EnvPreset"
             <menu_item_call
            label="Model..."
            layout="topleft"
-           name="Upload Model">
+           name="Upload Model"
+           shortcut="alt|control|U">
             <menu_item_call.on_click
              function="File.UploadModel"
              parameter="" />
-- 
cgit v1.2.3


From b102ee2dddf948679d11412a84e958dc61ad7211 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Tue, 18 Aug 2020 18:02:36 +0300
Subject: SL-13801 The"Hover Height" floater should be closed after pressing
 the "Ctrl-alt-H" shortcut keys

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index c7ab26bc22..181f529893 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -98,7 +98,8 @@
        shortcut="alt|control|H"
        visible="false">
         <menu_item_call.on_click
-         function="HoverHeight"/>
+         function="Floater.ToggleOrBringToFront"
+         parameter="edit_hover_height"/>
         <menu_item_call.on_enable
          function="Edit.EnableHoverHeight"/>
       </menu_item_call>
-- 
cgit v1.2.3


From e05338cf76bedae176b7ed41c7960d20308e3f59 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 19 Aug 2020 14:11:59 +0300
Subject: SL-13803 FIXED Objects do not link with the"Ctrl+L" shortcut keys

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 181f529893..aab47d0d0d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -59,8 +59,7 @@
        name="Places"
        shortcut="control|L">
         <menu_item_call.on_click
-         function="Floater.ToggleOrBringToFront"
-         parameter="places" />
+         function="Tools.Link"/>
       </menu_item_call>
       <menu_item_call
        label="Picks..."
-- 
cgit v1.2.3


From bf48c9103e9d10bbce653da12c2b325055efd15b Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 19 Aug 2020 15:40:28 +0300
Subject: SL-13799 Use macOS control key for "Hover Height" shortcut

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index aab47d0d0d..5f52b79f4a 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -95,6 +95,7 @@
        label="Hover Height"
        name="HoverHeight"
        shortcut="alt|control|H"
+       use_mac_ctrl="true"
        visible="false">
         <menu_item_call.on_click
          function="Floater.ToggleOrBringToFront"
-- 
cgit v1.2.3


From e566e82269ff52a88e3dc28345bba6c273a2eebf Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 19 Aug 2020 20:41:46 +0300
Subject: SL-13800 Made 'stop animation' continuous

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 5f52b79f4a..089742a4ee 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -164,6 +164,7 @@
         <menu_item_call
          label="Stop Animating Me"
          name="Stop Animating My Avatar"
+         allow_key_repeat="true"
          shortcut="alt|shift|A">
           <menu_item_call.on_click
            function="Tools.StopAllAnimations" />
-- 
cgit v1.2.3


From 958991ec4d0fa0e51f1410928de5b0d21f1720fb Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 26 Jan 2021 23:26:11 +0200
Subject: SL-14651 Keybinding's panel combobox can cause confusion

---
 .../skins/default/xui/en/panel_preferences_controls.xml        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index 904387909e..9dab7d34e6 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -15,22 +15,22 @@
    top="6"
    left="10"
    height="23"
-   width="140"
+   width="232"
    name="key_mode">
     <combo_box.item
-     label="Third Person "
+     label="When in third person"
      name="third_person"
      value="1"/>
     <combo_box.item
-     label="First Person (Mouselook)"
+     label="When in first person mode (Mouselook)"
      name="first_person"
      value="0"/>
     <combo_box.item
-     label="Edit Avatar"
+     label="When editing avatar"
      name="edit_avatar"
      value="2"/>
     <combo_box.item
-     label="Sitting"
+     label="When sitting"
      name="sitting"
      value="3"/>
   </combo_box>
-- 
cgit v1.2.3


From abdfc65f56bdf5bba7977760c57b5c7de7a61931 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 27 Jan 2021 18:47:54 +0200
Subject: SL-14424 Remove shortcut that conflicts with camera controls

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 47c4a9593d..a59a71a0eb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -622,8 +622,7 @@
           <menu_item_separator />
           <menu_item_check
              label="Advanced Menu"
-             name="Show Advanced Menu"
-             shortcut="control|alt|shift|D">
+             name="Show Advanced Menu">
             <on_check
                function="CheckControl"
                parameter="UseDebugMenus" />
@@ -2001,20 +2000,6 @@ function="World.EnvPreset"
          name="Shortcuts"
          tear_off="true"
          visible="false">
-            <!-- This second, alternative shortcut for Show Advanced Menu is for backward compatibility.  The main shortcut has been changed so it's Linux-friendly, where the old shortcut is typically eaten by the window manager. -->
-            <menu_item_check
-               label="Show Advanced Menu - legacy shortcut"
-               name="Show Advanced Menu - legacy shortcut"
-               shortcut="control|alt|D">
-              <on_check
-                 function="CheckControl"
-                 parameter="UseDebugMenus" />
-              <on_click
-                 function="ToggleControl"
-                 parameter="UseDebugMenus" />
-            </menu_item_check>
-
-            <menu_item_separator/>
 
             <menu_item_call
              label="Close Window"
-- 
cgit v1.2.3


From d3169aa696f5afaff18eb4d90c8b70a4f5528eb7 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 27 Jan 2021 19:18:22 +0200
Subject: SL-14423 Ctrl+Alt+Shift+A is assigned to 2 things

Remapped debugging avatar textures (requires godlike agent) to Ctrl+Shift+Alt+K
---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index a59a71a0eb..0a50ff089f 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3625,7 +3625,7 @@ function="World.EnvPreset"
             <menu_item_call
              label="Debug Avatar Textures"
              name="Debug Avatar Textures"
-             shortcut="control|alt|shift|A">
+             shortcut="control|alt|shift|K">
                 <menu_item_call.on_click
                  function="Advanced.DebugAvatarTextures" />
             </menu_item_call>
-- 
cgit v1.2.3