diff options
Diffstat (limited to 'indra/newview/skins')
7 files changed, 18 insertions, 53 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml index 13e0738e52..4dd3a2f0e1 100644 --- a/indra/newview/skins/default/xui/en/floater_people.xml +++ b/indra/newview/skins/default/xui/en/floater_people.xml @@ -1,21 +1,23 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> + <floater - can_close="true" - can_resize="true" - height="570" - help_topic="sidebar_people" - min_width="333" - min_height="440" - name="floater_people" - save_rect="true" - save_visibility="true" - title="People" - width="333" > + can_close="true" + can_resize="true" + height="570" + help_topic="sidebar_people" + min_height="440" + min_width="333" + layout="topleft" + name="floater_people" + save_rect="true" + single_instance="true" + title="PEOPLE" + width="333"> <panel_container + default_panel_name="panel_people" follows="all" height="570" name="main_panel" - default_panel_name="panel_people" width="333"> <panel class="panel_people" diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 6ece01b2ba..d8f593715f 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -90,14 +90,6 @@ top="0" visible="false" width="1024"/> - <panel follows="right|top|bottom" - height="500" - mouse_opaque="false" - name="side_bar_tabs" - right="500" - tab_stop="false" - top="0" - width="32"/> <panel bottom="500" follows="left|right|bottom" height="25" @@ -116,17 +108,6 @@ visible="false"/> </layout_stack> </layout_panel> - <!-- side tray --> - <layout_panel auto_resize="false" - follows="top|bottom" - height="500" - min_width="333" - mouse_opaque="false" - tab_stop="false" - name="side_tray_container" - user_resize="false" - visible="false" - width="333"/> </layout_stack> <panel top="0" follows="all" diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index bb58dd500f..80e310a873 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -93,14 +93,6 @@ parameter="ui_preview" /> </menu_item_call> <menu_item_separator /> - <!-- Broken - <menu_item_call - label="Show Side Tray" - name="Show Side Tray"> - <menu_item_call.on_click - function="Advanced.ShowSideTray" /> - </menu_item_call> - --> <menu create_jump_keys="true" label="UI Tests" diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml index 29eeb93ac1..b452f96e7a 100644 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml @@ -42,6 +42,6 @@ </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> - <menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" /> + <menu_item_call.on_click function="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" /> </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml index 65bd2793b6..614dd693c5 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml @@ -52,6 +52,6 @@ </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> - <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" /> + <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="panel_block_list_sidetray" /> </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml index 0634e3bd3b..485a5a658c 100644 --- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml @@ -34,6 +34,6 @@ </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> - <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" /> + <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" /> </menu_item_call> </toggleable_menu> 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 1a8aae7f91..c131649fc8 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" |