summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-10-03 22:45:29 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-06-23 14:50:02 +0300
commite211372923bed31e632bc9825913d3d57cdc2d52 (patch)
tree104d4e314df3b0f329ea2be61f94fd631dda4174 /indra/newview/skins
parent13a25be08f0c81a759076907d7950baf4f2c3ef2 (diff)
SL-6109 Remade 'ignore' list processing, renamed and reformed keybindings
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/control_table_contents.xml14
-rw-r--r--indra/newview/skins/default/xui/en/floater_select_key.xml15
2 files changed, 19 insertions, 10 deletions
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
@@ -16,6 +16,15 @@
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"
halign="center"
@@ -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" />