diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-25 17:54:36 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-23 14:48:03 +0300 |
| commit | c60b929fbb615f8d73f7bf42849b5628bf0f8f7a (patch) | |
| tree | 87c7bc9df86f49183df5176f8376ad8711383fdd /indra/newview/skins | |
| parent | 4df05c5a8995158922c7b7aacfef442ac8ae6fdd (diff) | |
SL-6109 Mouse support ready
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_select_key.xml | 16 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_controls.xml | 10 |
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 |