From 66a46d6f0440384b6f37e53d2a8fea5db1043d14 Mon Sep 17 00:00:00 2001 From: eli Date: Tue, 18 Oct 2011 16:26:18 -0700 Subject: sync with viewer-development --- .../default/xui/da/panel_preferences_chat.xml | 2 +- .../default/xui/de/panel_preferences_chat.xml | 2 +- .../default/xui/de/panel_preferences_general.xml | 1 - .../default/xui/en/panel_preferences_chat.xml | 2 +- .../default/xui/en/panel_preferences_general.xml | 20 +- .../default/xui/es/panel_preferences_chat.xml | 2 +- .../default/xui/es/panel_preferences_general.xml | 1 - .../default/xui/fr/panel_preferences_chat.xml | 2 +- .../default/xui/fr/panel_preferences_general.xml | 1 - .../default/xui/it/panel_preferences_chat.xml | 2 +- .../default/xui/it/panel_preferences_general.xml | 1 - .../default/xui/ja/panel_preferences_chat.xml | 2 +- .../default/xui/ja/panel_preferences_general.xml | 1 - .../newview/skins/default/xui/nl/floater_about.xml | 81 - .../skins/default/xui/nl/floater_about_land.xml | 488 --- .../default/xui/nl/floater_animation_preview.xml | 85 - .../skins/default/xui/nl/floater_auction.xml | 9 - .../skins/default/xui/nl/floater_avatar_picker.xml | 42 - .../default/xui/nl/floater_avatar_textures.xml | 30 - .../skins/default/xui/nl/floater_beacons.xml | 15 - .../skins/default/xui/nl/floater_build_options.xml | 8 - .../skins/default/xui/nl/floater_bulk_perms.xml | 44 - .../newview/skins/default/xui/nl/floater_bumps.xml | 21 - .../skins/default/xui/nl/floater_buy_contents.xml | 21 - .../skins/default/xui/nl/floater_buy_currency.xml | 68 - .../skins/default/xui/nl/floater_buy_land.xml | 235 -- .../skins/default/xui/nl/floater_buy_object.xml | 26 - .../skins/default/xui/nl/floater_camera.xml | 16 - .../skins/default/xui/nl/floater_choose_group.xml | 8 - .../skins/default/xui/nl/floater_color_picker.xml | 31 - .../skins/default/xui/nl/floater_critical.xml | 11 - .../newview/skins/default/xui/nl/floater_event.xml | 40 - .../skins/default/xui/nl/floater_font_test.xml | 6 - .../skins/default/xui/nl/floater_gesture.xml | 15 - .../default/xui/nl/floater_hardware_settings.xml | 28 - indra/newview/skins/default/xui/nl/floater_hud.xml | 2 - .../skins/default/xui/nl/floater_image_preview.xml | 33 - .../skins/default/xui/nl/floater_inspect.xml | 11 - .../skins/default/xui/nl/floater_inventory.xml | 47 - .../xui/nl/floater_inventory_item_properties.xml | 75 - .../xui/nl/floater_inventory_view_finder.xml | 24 - .../skins/default/xui/nl/floater_joystick.xml | 80 - .../skins/default/xui/nl/floater_lagmeter.xml | 152 - .../skins/default/xui/nl/floater_land_holdings.xml | 39 - .../default/xui/nl/floater_live_lsleditor.xml | 12 - .../skins/default/xui/nl/floater_lsl_guide.xml | 7 - indra/newview/skins/default/xui/nl/floater_map.xml | 51 - .../skins/default/xui/nl/floater_media_browser.xml | 19 - .../skins/default/xui/nl/floater_mem_leaking.xml | 18 - .../skins/default/xui/nl/floater_moveview.xml | 13 - .../skins/default/xui/nl/floater_mute_object.xml | 14 - .../skins/default/xui/nl/floater_openobject.xml | 8 - indra/newview/skins/default/xui/nl/floater_pay.xml | 21 - .../skins/default/xui/nl/floater_pay_object.xml | 30 - .../skins/default/xui/nl/floater_perm_prefs.xml | 16 - .../skins/default/xui/nl/floater_post_process.xml | 53 - .../skins/default/xui/nl/floater_postcard.xml | 36 - .../skins/default/xui/nl/floater_preferences.xml | 8 - .../default/xui/nl/floater_preview_animation.xml | 8 - .../default/xui/nl/floater_preview_gesture.xml | 58 - .../default/xui/nl/floater_preview_notecard.xml | 16 - .../skins/default/xui/nl/floater_preview_sound.xml | 8 - .../default/xui/nl/floater_preview_texture.xml | 9 - .../skins/default/xui/nl/floater_region_info.xml | 2 - .../skins/default/xui/nl/floater_report_abuse.xml | 103 - .../skins/default/xui/nl/floater_script_debug.xml | 6 - .../default/xui/nl/floater_script_preview.xml | 6 - .../skins/default/xui/nl/floater_script_queue.xml | 4 - .../skins/default/xui/nl/floater_script_search.xml | 15 - .../skins/default/xui/nl/floater_select_key.xml | 7 - .../skins/default/xui/nl/floater_sell_land.xml | 65 - .../default/xui/nl/floater_settings_debug.xml | 13 - .../skins/default/xui/nl/floater_snapshot.xml | 79 - .../skins/default/xui/nl/floater_sound_preview.xml | 11 - .../newview/skins/default/xui/nl/floater_stats.xml | 71 - .../skins/default/xui/nl/floater_telehub.xml | 33 - .../skins/default/xui/nl/floater_texture_ctrl.xml | 23 - .../newview/skins/default/xui/nl/floater_tools.xml | 567 ---- .../skins/default/xui/nl/floater_top_objects.xml | 55 - indra/newview/skins/default/xui/nl/floater_tos.xml | 16 - .../skins/default/xui/nl/floater_url_entry.xml | 12 - .../skins/default/xui/nl/floater_world_map.xml | 54 - .../skins/default/xui/nl/language_settings.xml | 57 - .../skins/default/xui/nl/menu_inventory.xml | 82 - .../skins/default/xui/nl/menu_inventory_add.xml | 32 - indra/newview/skins/default/xui/nl/menu_login.xml | 13 - .../newview/skins/default/xui/nl/menu_mini_map.xml | 8 - indra/newview/skins/default/xui/nl/menu_picks.xml | 8 - .../default/xui/nl/menu_places_gear_landmark.xml | 18 - indra/newview/skins/default/xui/nl/menu_slurl.xml | 6 - indra/newview/skins/default/xui/nl/menu_viewer.xml | 207 -- indra/newview/skins/default/xui/nl/mime_types.xml | 230 -- .../newview/skins/default/xui/nl/notifications.xml | 3044 ------------------ .../default/xui/nl/panel_block_list_sidetray.xml | 10 - .../skins/default/xui/nl/panel_edit_profile.xml | 45 - .../skins/default/xui/nl/panel_group_general.xml | 72 - .../skins/default/xui/nl/panel_group_invite.xml | 24 - .../default/xui/nl/panel_group_land_money.xml | 84 - .../skins/default/xui/nl/panel_group_notices.xml | 62 - .../skins/default/xui/nl/panel_group_roles.xml | 101 - indra/newview/skins/default/xui/nl/panel_login.xml | 41 - .../skins/default/xui/nl/panel_main_inventory.xml | 64 - .../default/xui/nl/panel_preferences_advanced.xml | 48 - .../default/xui/nl/panel_preferences_alerts.xml | 14 - .../default/xui/nl/panel_preferences_chat.xml | 42 - .../default/xui/nl/panel_preferences_general.xml | 90 - .../default/xui/nl/panel_preferences_graphics1.xml | 145 - .../default/xui/nl/panel_preferences_privacy.xml | 32 - .../default/xui/nl/panel_preferences_setup.xml | 31 - .../default/xui/nl/panel_preferences_sound.xml | 39 - .../skins/default/xui/nl/panel_region_covenant.xml | 84 - .../skins/default/xui/nl/panel_region_debug.xml | 40 - .../skins/default/xui/nl/panel_region_estate.xml | 70 - .../skins/default/xui/nl/panel_region_general.xml | 53 - .../skins/default/xui/nl/panel_region_terrain.xml | 27 - .../skins/default/xui/nl/panel_region_texture.xml | 57 - .../skins/default/xui/nl/panel_scrolling_param.xml | 10 - .../skins/default/xui/nl/panel_status_bar.xml | 38 - .../skins/default/xui/nl/panel_world_map.xml | 57 - .../newview/skins/default/xui/nl/role_actions.xml | 76 - indra/newview/skins/default/xui/nl/strings.xml | 3247 -------------------- .../skins/default/xui/nl/teleport_strings.xml | 75 - .../default/xui/pl/panel_preferences_chat.xml | 2 +- .../default/xui/pl/panel_preferences_general.xml | 1 - .../default/xui/pt/panel_preferences_chat.xml | 2 +- .../default/xui/pt/panel_preferences_general.xml | 1 - .../default/xui/ru/floater_buy_currency_html.xml | 2 + .../default/xui/tr/floater_buy_currency_html.xml | 2 + .../default/xui/zh/panel_preferences_chat.xml | 2 +- .../default/xui/zh/panel_preferences_general.xml | 1 - .../xui/zh_CN/floater_buy_currency_html.xml | 2 + .../skins/minimal/xui/ru/menu_script_chiclet.xml | 4 + .../skins/minimal/xui/tr/menu_script_chiclet.xml | 4 + .../skins/minimal/xui/zh/menu_script_chiclet.xml | 4 + .../minimal/xui/zh_CN/menu_script_chiclet.xml | 4 + 135 files changed, 47 insertions(+), 11844 deletions(-) delete mode 100644 indra/newview/skins/default/xui/nl/floater_about.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_about_land.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_animation_preview.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_auction.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_avatar_picker.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_avatar_textures.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_beacons.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_build_options.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_bulk_perms.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_bumps.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_buy_contents.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_buy_currency.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_buy_land.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_buy_object.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_camera.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_choose_group.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_color_picker.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_critical.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_event.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_font_test.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_gesture.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_hardware_settings.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_hud.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_image_preview.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_inspect.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_inventory.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_inventory_item_properties.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_inventory_view_finder.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_joystick.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_lagmeter.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_land_holdings.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_live_lsleditor.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_lsl_guide.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_map.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_media_browser.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_mem_leaking.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_moveview.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_mute_object.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_openobject.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_pay.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_pay_object.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_perm_prefs.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_post_process.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_postcard.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preferences.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preview_animation.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preview_gesture.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preview_notecard.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preview_sound.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_preview_texture.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_region_info.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_report_abuse.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_script_debug.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_script_preview.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_script_queue.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_script_search.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_select_key.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_sell_land.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_settings_debug.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_snapshot.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_sound_preview.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_stats.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_telehub.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_texture_ctrl.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_tools.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_top_objects.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_tos.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_url_entry.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_world_map.xml delete mode 100644 indra/newview/skins/default/xui/nl/language_settings.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_inventory.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_inventory_add.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_login.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_mini_map.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_picks.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_places_gear_landmark.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_slurl.xml delete mode 100644 indra/newview/skins/default/xui/nl/menu_viewer.xml delete mode 100644 indra/newview/skins/default/xui/nl/mime_types.xml delete mode 100644 indra/newview/skins/default/xui/nl/notifications.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_block_list_sidetray.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_edit_profile.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_group_general.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_group_invite.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_group_land_money.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_group_notices.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_group_roles.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_login.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_main_inventory.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_advanced.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_alerts.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_chat.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_general.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_graphics1.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_privacy.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_setup.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_preferences_sound.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_covenant.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_debug.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_estate.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_general.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_terrain.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_region_texture.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_scrolling_param.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_status_bar.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_world_map.xml delete mode 100644 indra/newview/skins/default/xui/nl/role_actions.xml delete mode 100644 indra/newview/skins/default/xui/nl/strings.xml delete mode 100644 indra/newview/skins/default/xui/nl/teleport_strings.xml create mode 100644 indra/newview/skins/default/xui/ru/floater_buy_currency_html.xml create mode 100644 indra/newview/skins/default/xui/tr/floater_buy_currency_html.xml create mode 100644 indra/newview/skins/default/xui/zh_CN/floater_buy_currency_html.xml create mode 100644 indra/newview/skins/minimal/xui/ru/menu_script_chiclet.xml create mode 100644 indra/newview/skins/minimal/xui/tr/menu_script_chiclet.xml create mode 100644 indra/newview/skins/minimal/xui/zh/menu_script_chiclet.xml create mode 100644 indra/newview/skins/minimal/xui/zh_CN/menu_script_chiclet.xml (limited to 'indra/newview') diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml index 19c82509cd..f0f6242fff 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml @@ -51,7 +51,7 @@ - + diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml index ca8af27f58..104f89b80c 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml @@ -51,7 +51,7 @@ - + diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml index 79b2a544f9..ed22e05a7c 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml @@ -11,7 +11,6 @@ - diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index ea09286592..52be805260 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -307,7 +307,7 @@ name="Ukrainian" value="uk" /> - + + + - + diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml index e725e4a05a..c762e6b7fe 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml @@ -11,7 +11,6 @@ - diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml index 1644eefbee..646f53704c 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml @@ -51,7 +51,7 @@ - + diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml index 2786798173..5ccf07f7b4 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml @@ -11,7 +11,6 @@ - diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml index 2834d520d1..72e687b6d1 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml @@ -51,7 +51,7 @@ - + diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml index c576b5f9d8..ee52ee7cb1 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml @@ -11,7 +11,6 @@ - diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml index 5038140ce5..20e17de5f1 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml @@ -51,7 +51,7 @@ - + diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml index e4091972d6..4356f3d47f 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml @@ -11,7 +11,6 @@ - diff --git a/indra/newview/skins/default/xui/nl/floater_about.xml b/indra/newview/skins/default/xui/nl/floater_about.xml deleted file mode 100644 index 4e22d865fe..0000000000 --- a/indra/newview/skins/default/xui/nl/floater_about.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - [APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) -[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] - - - Gemaakt met [COMPILER] versie [COMPILER_VERSION] - - - U bent op [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1] in [REGION] gelegen op <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -[SERVER_VERSION] -[[SERVER_RELEASE_NOTES_URL] [ReleaseNotes]] - - - CPU: [CPU] -Geheugen: [MEMORY_MB] MB -OS Versie: [OS_VERSION] -Grafische Kaard Vendor: [GRAPHICS_CARD_VENDOR] -Grafische Kaard: [GRAPHICS_CARD] - - - Windows Grafische Driver Versie: [GRAPHICS_DRIVER_VERSION] - - - OpenGL Versie: [OPENGL_VERSION] - -libcurl Versie: [LIBCURL_VERSION] -J2C Decoder Versie: [J2C_VERSION] -Audio Driver Versie: [AUDIO_DRIVER_VERSION] -Qt Webkit Versie: [QT_WEBKIT_VERSION] -Vivox Versie: [VIVOX_VERSION] - - - (none) - - - Pakketten Verloren: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) - - - - + + diff --git a/indra/newview/skins/default/xui/en/floater_critical.xml b/indra/newview/skins/default/xui/en/floater_critical.xml index 05c958e051..13b15bf724 100644 --- a/indra/newview/skins/default/xui/en/floater_critical.xml +++ b/indra/newview/skins/default/xui/en/floater_critical.xml @@ -6,7 +6,7 @@ height="500" layout="topleft" name="modal container" - open_centered="true" + open_positioning="centered" width="600"> + diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index f017a7ace6..3f5768bc0b 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -1,15 +1,16 @@ - NEARBY VOICE + Nearby voice - Group Call with [GROUP] + Group call with [GROUP] - Conference Call + Conference call diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index 0eda9ae62a..57d1c92acb 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -9,7 +9,6 @@ name="floater_web_content" help_topic="floater_web_content" save_rect="true" - auto_tile="true" title="" initial_mime_type="text/html" width="780"> diff --git a/indra/newview/skins/default/xui/en/floater_web_profile.xml b/indra/newview/skins/default/xui/en/floater_web_profile.xml new file mode 100644 index 0000000000..d0225f78a9 --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_web_profile.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 019e7cd032..4314c8a9e2 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -2,7 +2,7 @@ + top="0"> + + + - - + - - - - - - - - - - - - - - - - + + - + left="0" + follows="all" + height="500" + mouse_opaque="false" + name="login_panel_holder" + width="1024"/> - - - - + width="1024"/> + - - - + - - - - - - - - - - - - - - - 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 @@ - + 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 @@ - + 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 @@ - + diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml new file mode 100644 index 0000000000..59912b5503 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 16f48f3a4e..63e50b0b9f 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -8,169 +8,178 @@ label="Me" name="Me" tear_off="true"> - - - - - + + - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + label="Sit Down" + layout="topleft" + shortcut="alt|shift|S" + name="Sit Down Here"> + + - - - - - - - - - - + label="Fly" + name="Fly" + shortcut="Home"> + + + - - + label="Always Run" + name="Always Run" + shortcut="control|R"> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + label="Stop Animating Me" + name="Stop Animating My Avatar"> + + + + + label="Away" + name="Set Away"> + + + + + + + + + + + + + + + + + + + + + + + + function="Floater.Show" + parameter="preferences" /> + + + + + + @@ -219,10 +228,10 @@ use_mac_ctrl="true"> + parameter="chat_bar" /> + parameter="chat_bar" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml new file mode 100644 index 0000000000..355a76e05f --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 1c3e08d59b..3835cd17b6 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -120,33 +120,6 @@ label="Remember password" follows="left|bottom" font="SansSerifSmall" height="15" - left_pad="10" - name="mode_selection_text" - top="20" - width="130"> - Mode: - - - - - - - - - - - + diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 51ffec4727..7a8e872dc9 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -5,21 +5,21 @@ bg_opaque_color="MouseGray" follows="left|top|right" focus_root="true" - height="60" + height="34" layout="topleft" name="navigation_bar" chrome="true" - width="600"> + width="800"> + + + + width="480"> + width="355"> - - - - - - - - - - - - - - - - - + + + + + + + - - - - + auto_resize="true" + user_resize="true" + min_width="315" + name="favorites_layout_panel" + width="315"> + width="311"> - + + + More ▼ + + + + diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml new file mode 100644 index 0000000000..f766236b2e --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat.xml @@ -0,0 +1,35 @@ + + + + + diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml index 7daa52b2d9..24046d5cca 100644 --- a/indra/newview/skins/default/xui/en/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml @@ -117,7 +117,7 @@ + top_pad="0" + width="312"> - - Keyboard: + Keyboard: - Mouse: + Mouse: - Single click on land: + Single click on land: - Double click on land: + Double click on land: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 5894abd03b..422bbada7f 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -35,8 +35,8 @@ + diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 2e5ebafe46..adbb183317 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -1,7 +1,9 @@ - + + + + + diff --git a/indra/newview/skins/minimal/xui/da/floater_camera.xml b/indra/newview/skins/minimal/xui/da/floater_camera.xml deleted file mode 100644 index 5b7ef6db54..0000000000 --- a/indra/newview/skins/minimal/xui/da/floater_camera.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - Roter kamera omkring fokus - - - Zoom kamera mod fokus - - - Flyt kamera op og ned, til venstre og højre - - - Kamera valg - - - Kredsløb zoom panorering - - - Forvalg - - - Se objekt - - - - - - Se forfra - - - - - Se fra siden - - - - - Se bagfra - - - - - - - Se fra objekt - - - - - Førsteperson - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/minimal/xui/en/floater_help_browser.xml b/indra/newview/skins/minimal/xui/en/floater_help_browser.xml deleted file mode 100644 index 477f210352..0000000000 --- a/indra/newview/skins/minimal/xui/en/floater_help_browser.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - Loading... - - - - - - - - - diff --git a/indra/newview/skins/minimal/xui/en/floater_media_browser.xml b/indra/newview/skins/minimal/xui/en/floater_media_browser.xml deleted file mode 100644 index 4862146c94..0000000000 --- a/indra/newview/skins/minimal/xui/en/floater_media_browser.xml +++ /dev/null @@ -1,242 +0,0 @@ - - - - http://www.secondlife.com - - - http://support.secondlife.com - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/minimal/xui/en/floater_nearby_chat.xml b/indra/newview/skins/minimal/xui/en/floater_nearby_chat.xml deleted file mode 100644 index 74ac885202..0000000000 --- a/indra/newview/skins/minimal/xui/en/floater_nearby_chat.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - diff --git a/indra/newview/skins/minimal/xui/en/floater_side_bar_tab.xml b/indra/newview/skins/minimal/xui/en/floater_side_bar_tab.xml deleted file mode 100644 index 83b1260620..0000000000 --- a/indra/newview/skins/minimal/xui/en/floater_side_bar_tab.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/indra/newview/skins/minimal/xui/en/floater_web_content.xml b/indra/newview/skins/minimal/xui/en/floater_web_content.xml deleted file mode 100644 index 1d9a967d5a..0000000000 --- a/indra/newview/skins/minimal/xui/en/floater_web_content.xml +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/minimal/xui/en/inspect_avatar.xml b/indra/newview/skins/minimal/xui/en/inspect_avatar.xml deleted file mode 100644 index 853d5f8735..0000000000 --- a/indra/newview/skins/minimal/xui/en/inspect_avatar.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - - - -[AGE] - - -[SL_PROFILE] - - - - - - This is my second life description and I really think it is great. But for some reason my description is super extra long because I like to talk a whole lot - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/indra/newview/skins/minimal/xui/en/panel_group_control_panel.xml b/indra/newview/skins/minimal/xui/en/panel_group_control_panel.xml deleted file mode 100644 index abddc59296..0000000000 --- a/indra/newview/skins/minimal/xui/en/panel_group_control_panel.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - -