From 6c667b8c3372505b17385efaac7c0e758b29a1a7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 28 Jan 2013 16:20:52 -0500 Subject: rename "Lighting and Shadows" (deferred rendering) to "Advanced Lighting Model" --- indra/newview/skins/default/xui/pt/menu_viewer.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/pt') diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index ca378c1b58..e8baff5af2 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -286,7 +286,7 @@ - + -- cgit v1.2.3 From 806d09b1143894ad66cea2c228f467e8c39a8adf Mon Sep 17 00:00:00 2001 From: Graham Madarasz Date: Tue, 30 Apr 2013 19:50:05 -0700 Subject: Merge 3.5.1 into Materials --- .../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 | 21 +- .../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, 1139 insertions(+), 185 deletions(-) create mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_log.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_conversation_preview.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml create mode 100644 indra/newview/skins/default/xui/pt/floater_voice_volume.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_im_conversation.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_participant_view.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_people_friends_view.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_people_groups_view.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml create mode 100644 indra/newview/skins/default/xui/pt/menu_people_recent_view.xml create mode 100644 indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml create 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 new file mode 100644 index 0000000000..ae7dd3c441 --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml new file mode 100644 index 0000000000..97a2e8327c --- /dev/null +++ b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml @@ -0,0 +1,7 @@ + + + + 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 0fbb826a96..a1cea72b1e 100644 --- a/indra/newview/skins/default/xui/pt/floater_im_container.xml +++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml @@ -1,2 +1,29 @@ - + + + + + + + + +