From 8103710c054ec6ea4a46f9732e569e543691184b Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 19 Oct 2009 01:45:44 +0000 Subject: Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231 * Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476 * IM changes --- .../skins/default/xui/en/floater_nearby_chat.xml | 15 +- .../skins/default/xui/en/menu_inventory.xml | 5 +- .../newview/skins/default/xui/en/menu_landmark.xml | 8 ++ .../default/xui/en/menu_places_gear_folder.xml | 45 ++++++ .../default/xui/en/menu_places_gear_landmark.xml | 56 ++++++++ .../default/xui/en/panel_avatar_list_item.xml | 5 +- .../skins/default/xui/en/panel_chat_header.xml | 53 +++++++ .../skins/default/xui/en/panel_chat_separator.xml | 16 +++ .../skins/default/xui/en/panel_landmarks.xml | 158 +++++++++++++++++---- .../skins/default/xui/en/panel_notification.xml | 92 ++++++++++++ .../default/xui/en/panel_teleport_history.xml | 23 --- .../skins/default/xui/en/widgets/chat_history.xml | 14 ++ 12 files changed, 428 insertions(+), 62 deletions(-) create mode 100644 indra/newview/skins/default/xui/en/menu_places_gear_folder.xml create mode 100644 indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml create mode 100644 indra/newview/skins/default/xui/en/panel_chat_header.xml create mode 100644 indra/newview/skins/default/xui/en/panel_chat_separator.xml create mode 100644 indra/newview/skins/default/xui/en/panel_notification.xml create mode 100644 indra/newview/skins/default/xui/en/widgets/chat_history.xml (limited to 'indra/newview/skins/default') diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index f1976afb4a..6fbfed5f60 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -30,23 +30,18 @@ color="1 1 1 1" enabled="true" image_name="closebox.tga" name="close_btn"/> - + width="250"/> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 6dc08ad3ef..7785492651 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -478,11 +478,12 @@ parameter="open" /> + layout="topleft" + name="Landmark Separator" /> + name="About Landmark"> diff --git a/indra/newview/skins/default/xui/en/menu_landmark.xml b/indra/newview/skins/default/xui/en/menu_landmark.xml index 64fec3ab40..54a4095967 100644 --- a/indra/newview/skins/default/xui/en/menu_landmark.xml +++ b/indra/newview/skins/default/xui/en/menu_landmark.xml @@ -29,4 +29,12 @@ function="Places.OverflowMenu.Action" parameter="pick" /> + + + diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml new file mode 100644 index 0000000000..b31a0d88a4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml new file mode 100644 index 0000000000..2d8bb0dcb9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml index f7f08b9b6a..69d90e4c7d 100644 --- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml +++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml @@ -38,12 +38,13 @@ width="20" /> + + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_chat_separator.xml b/indra/newview/skins/default/xui/en/panel_chat_separator.xml new file mode 100644 index 0000000000..dd27595cdb --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chat_separator.xml @@ -0,0 +1,16 @@ + + + + diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index ae33d6da3e..7c7561f922 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -1,35 +1,143 @@ - -