diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-05-06 15:26:55 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-05-06 15:26:55 -0700 |
| commit | 6fc2cce516763ca1df3894645c44add7371439d8 (patch) | |
| tree | 89c63e8084f2c429941015620ed06d823b303854 /indra/newview/skins/default/xui | |
| parent | 84df60678535573f972cae94f88a1d7bd8cb4bf5 (diff) | |
| parent | de0773fcf73b9a1889366d3c3608e5775f7bb89d (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default/xui')
4 files changed, 13 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index b2e4a7ad95..e42b88abc3 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -50,7 +50,7 @@ name="non_side_tray_view" user_resize="false" width="500"> - <view bottom="500" + <world_view bottom="500" follows="all" height="500" left="0" diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index e95300a4b3..9fac296e26 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -22,7 +22,7 @@ </menu_item_call> <menu_item_separator /> <menu_item_call - label="Quit [APP_NAME]" + label="Exit [APP_NAME]" name="Quit" shortcut="control|Q"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index e0d8926d4a..c9ebeb60fb 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -115,7 +115,7 @@ </menu_item_call> <menu_item_separator/> <menu_item_call - label="Quit [APP_NAME]" + label="Exit [APP_NAME]" name="Quit" shortcut="control|Q"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 69e8e6fdcc..0129d97616 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -94,6 +94,16 @@ Automatic position for: 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="1" + label="Sidebar" + layout="topleft" + name="appearance_sidebar_positioning" + tool_tip="Use automatic camera positioning for sidebar" + width="242" /> <icon follows="left|top" height="18" |