From 80772aa1ad62a89129f24508e2005b20fec88854 Mon Sep 17 00:00:00 2001 From: eli Date: Wed, 24 Apr 2013 13:49:11 -0700 Subject: sync with viewer-development (per DRTVWR-309) --- .../default/xui/pt/floater_conversation_log.xml | 8 - .../xui/pt/floater_conversation_preview.xml | 7 - .../skins/default/xui/pt/floater_im_container.xml | 29 +- .../skins/default/xui/pt/floater_im_session.xml | 61 +- .../skins/default/xui/pt/floater_incoming_call.xml | 8 +- .../default/xui/pt/floater_pathfinding_console.xml | 2 +- .../skins/default/xui/pt/floater_texture_ctrl.xml | 2 +- .../default/xui/pt/floater_voice_chat_volume.xml | 4 - .../skins/default/xui/pt/floater_voice_effect.xml | 2 +- .../skins/default/xui/pt/floater_voice_volume.xml | 8 - .../newview/skins/default/xui/pt/menu_cof_gear.xml | 6 +- .../skins/default/xui/pt/menu_conversation.xml | 31 - .../default/xui/pt/menu_conversation_log_gear.xml | 15 - .../default/xui/pt/menu_conversation_log_view.xml | 7 - .../skins/default/xui/pt/menu_im_conversation.xml | 15 - .../default/xui/pt/menu_im_session_showmodes.xml | 7 - .../skins/default/xui/pt/menu_object_icon.xml | 2 - .../skins/default/xui/pt/menu_outfit_gear.xml | 2 - .../skins/default/xui/pt/menu_participant_view.xml | 13 - .../default/xui/pt/menu_people_blocked_gear.xml | 5 - .../default/xui/pt/menu_people_blocked_plus.xml | 5 - .../default/xui/pt/menu_people_blocked_view.xml | 5 - .../default/xui/pt/menu_people_friends_view.xml | 8 - .../skins/default/xui/pt/menu_people_groups.xml | 2 +- .../default/xui/pt/menu_people_groups_view.xml | 4 - .../skins/default/xui/pt/menu_people_nearby.xml | 23 +- .../xui/pt/menu_people_nearby_multiselect.xml | 14 +- .../default/xui/pt/menu_people_nearby_view.xml | 8 - .../default/xui/pt/menu_people_recent_view.xml | 6 - .../skins/default/xui/pt/menu_url_agent.xml | 4 +- .../skins/default/xui/pt/menu_url_objectim.xml | 2 +- indra/newview/skins/default/xui/pt/menu_viewer.xml | 37 +- .../newview/skins/default/xui/pt/notifications.xml | 690 +-------------------- .../default/xui/pt/panel_avatar_list_item.xml | 1 - .../default/xui/pt/panel_block_list_sidetray.xml | 15 +- .../xui/pt/panel_conversation_list_item.xml | 8 - .../xui/pt/panel_conversation_log_list_item.xml | 6 - .../skins/default/xui/pt/panel_group_list_item.xml | 1 - .../newview/skins/default/xui/pt/panel_people.xml | 88 ++- .../default/xui/pt/panel_preferences_chat.xml | 110 +--- .../default/xui/pt/panel_preferences_general.xml | 5 +- .../skins/default/xui/pt/sidepanel_task_info.xml | 1 - indra/newview/skins/default/xui/pt/strings.xml | 63 +- 43 files changed, 187 insertions(+), 1153 deletions(-) delete mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_log.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_preview.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_voice_volume.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_conversation.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_im_conversation.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_participant_view.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_friends_view.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_groups_view.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml delete mode 100644 indra/newview/skins/default/xui/pt/menu_people_recent_view.xml delete mode 100644 indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml delete mode 100644 indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml (limited to 'indra/newview/skins/default/xui/pt') diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_log.xml b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml deleted file mode 100644 index ae7dd3c441..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_conversation_log.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml deleted file mode 100644 index 97a2e8327c..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - CONVERSA: [NAME] - - - diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml index a1cea72b1e..0fbb826a96 100644 --- a/indra/newview/skins/default/xui/pt/floater_im_container.xml +++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml @@ -1,29 +1,2 @@ - - - - - - - - -