diff options
author | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
commit | 6e8ffc247fe52668446b8fa1ed7f1547a755076f (patch) | |
tree | 23b6fa5ce6bf6a32944faca54f9a18aca255fd75 /indra/newview/skins/default/xui/en/panel_preferences_move.xml | |
parent | 0ecc5c0878adf93e96b99e3db4c65cdb757b99fb (diff) | |
parent | fcd1ccd21e3ea8f0944537347dd6c9d7972d50ce (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_move.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_move.xml | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index cb547d7c6b..d9067b41c7 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -86,16 +86,6 @@ name="appearance_camera_movement" tool_tip="Use automatic camera positioning while in edit mode" width="242" /> - <check_box - control_name="SidebarCameraMovement" - follows="left|top" - height="16" - initial_value="true" - label="Sidebar" - layout="topleft" - name="appearance_sidebar_positioning" - tool_tip="Use automatic camera positioning for sidebar" - width="242" /> <icon follows="left|top" height="18" @@ -117,7 +107,7 @@ name="keyboard_lbl" width="270" top_delta="2"> - Keyboard: + Keyboard: </text> <check_box control_name="ArrowKeysAlwaysMove" @@ -149,7 +139,7 @@ name="mouse_lbl" width="270" top_pad="15"> - Mouse: + Mouse: </text> <check_box control_name="FirstPersonAvatarVisible" @@ -205,7 +195,7 @@ name="single_click_action_lbl" width="150" top_pad="20"> - Single click on land: + Single click on land: </text> <combo_box height="23" @@ -235,7 +225,7 @@ name="double_click_action_lbl" width="150" top_pad="12"> - Double click on land: + Double click on land: </text> <combo_box height="23" |