From 6aab234105d6eed022afbea388ae21530c7e99dd 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/en')

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