summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_select_key.xml16
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_controls.xml10
2 files changed, 19 insertions, 7 deletions
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