diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
3 files changed, 24 insertions, 15 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 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"/> |