From d1345838c6e36c35dbe3a6b683eb8ffe274b024a Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 12 Dec 2008 23:24:52 -0600 Subject: Second Life viewer sources 1.22.3-RC --- linden/doc/contributions.txt | 7 + linden/indra/llcommon/llversionviewer.h | 2 +- linden/indra/llmath/llvolume.cpp | 16 +- linden/indra/llrender/llimagegl.cpp | 2 +- linden/indra/llrender/llrender.cpp | 24 +- linden/indra/llrender/llrender.h | 11 +- linden/indra/llwindow/llwindowwin32.cpp | 6 + linden/indra/newview/featuretable.txt | 14 +- linden/indra/newview/featuretable_linux.txt | 2 +- linden/indra/newview/featuretable_mac.txt | 2 +- linden/indra/newview/gpu_table.txt | 12 +- linden/indra/newview/llappviewerwin32.cpp | 30 +- linden/indra/newview/llfloaterinspect.cpp | 4 +- linden/indra/newview/llfloatersnapshot.cpp | 29 +- linden/indra/newview/llfloatertopobjects.cpp | 4 +- linden/indra/newview/llinventorymodel.cpp | 2 +- linden/indra/newview/llstartup.cpp | 5 +- linden/indra/newview/llviewermenu.cpp | 7 +- linden/indra/newview/llviewermenufile.cpp | 5 + linden/indra/newview/llwatchdog.cpp | 3 +- .../indra/newview/skins/default/xui/de/alerts.xml | 39 +- .../skins/default/xui/de/floater_about_land.xml | 3 +- .../default/xui/de/floater_animation_preview.xml | 15 +- .../default/xui/de/floater_avatar_textures.xml | 12 +- .../skins/default/xui/de/floater_color_picker.xml | 4 +- .../skins/default/xui/de/floater_customize.xml | 2 +- .../skins/default/xui/de/floater_directory.xml | 6 +- .../skins/default/xui/de/floater_inspect.xml | 2 +- .../skins/default/xui/de/floater_lsl_guide.xml | 2 +- .../newview/skins/default/xui/de/floater_mute.xml | 2 +- .../skins/default/xui/de/floater_report_abuse.xml | 2 +- .../newview/skins/default/xui/de/floater_tools.xml | 19 +- .../skins/default/xui/de/floater_world_map.xml | 4 +- .../newview/skins/default/xui/de/menu_viewer.xml | 5 +- .../newview/skins/default/xui/de/mime_types.xml | 3 - .../indra/newview/skins/default/xui/de/notify.xml | 6 +- .../skins/default/xui/de/panel_group_general.xml | 6 +- .../skins/default/xui/de/panel_group_roles.xml | 10 +- .../default/xui/de/panel_preferences_general.xml | 3 + .../default/xui/de/panel_preferences_voice.xml | 3 + .../newview/skins/default/xui/en-us/alerts.xml | 24 +- .../xui/en-us/floater_animation_preview.xml | 4 +- .../skins/default/xui/en-us/floater_lagmeter.xml | 2 +- .../default/xui/en-us/floater_top_objects.xml | 10 +- .../skins/default/xui/en-us/menu_viewer.xml | 8 +- .../default/xui/en-us/panel_group_land_money.xml | 2 + .../xui/en-us/panel_preferences_general.xml | 31 +- .../skins/default/xui/en-us/panel_region_debug.xml | 8 +- .../newview/skins/default/xui/es/floater_mute.xml | 4 +- .../newview/skins/default/xui/es/menu_viewer.xml | 2 +- .../indra/newview/skins/default/xui/fr/alerts.xml | 49 +- .../skins/default/xui/fr/floater_about_land.xml | 147 +- .../default/xui/fr/floater_animation_preview.xml | 25 +- .../skins/default/xui/fr/floater_buy_land.xml | 7 +- .../skins/default/xui/fr/floater_customize.xml | 12 +- .../skins/default/xui/fr/floater_directory.xml | 3 +- .../skins/default/xui/fr/floater_env_settings.xml | 6 +- .../skins/default/xui/fr/floater_god_tools.xml | 55 +- .../skins/default/xui/fr/floater_image_preview.xml | 2 +- .../xui/fr/floater_inventory_item_properties.xml | 2 +- .../xui/fr/floater_inventory_view_finder.xml | 8 +- .../skins/default/xui/fr/floater_lsl_guide.xml | 4 +- .../skins/default/xui/fr/floater_media_browser.xml | 4 +- .../newview/skins/default/xui/fr/floater_mute.xml | 2 +- .../default/xui/fr/floater_new_outfit_dialog.xml | 6 +- .../skins/default/xui/fr/floater_openobject.xml | 7 +- .../newview/skins/default/xui/fr/floater_pay.xml | 2 +- .../skins/default/xui/fr/floater_pay_object.xml | 23 +- .../skins/default/xui/fr/floater_preferences.xml | 3 +- .../default/xui/fr/floater_preview_animation.xml | 4 +- .../default/xui/fr/floater_preview_gesture.xml | 4 +- .../skins/default/xui/fr/floater_preview_sound.xml | 2 +- .../default/xui/fr/floater_price_for_listing.xml | 15 +- .../skins/default/xui/fr/floater_sell_land.xml | 34 +- .../default/xui/fr/floater_settings_debug.xml | 2 +- .../skins/default/xui/fr/floater_snapshot.xml | 23 +- .../skins/default/xui/fr/floater_telehub.xml | 21 +- .../skins/default/xui/fr/floater_texture_ctrl.xml | 10 +- .../newview/skins/default/xui/fr/floater_tools.xml | 20 +- .../skins/default/xui/fr/floater_url_entry.xml | 1 + .../default/xui/fr/floater_windlight_options.xml | 4 +- .../newview/skins/default/xui/fr/menu_viewer.xml | 4 +- .../newview/skins/default/xui/fr/panel_avatar.xml | 6 +- .../skins/default/xui/fr/panel_classified.xml | 4 +- .../skins/default/xui/fr/panel_group_general.xml | 2 +- .../skins/default/xui/fr/panel_group_notices.xml | 12 +- .../skins/default/xui/fr/panel_group_voting.xml | 9 +- .../default/xui/fr/panel_preferences_audio.xml | 4 +- .../default/xui/fr/panel_preferences_general.xml | 3 + .../default/xui/fr/panel_preferences_voice.xml | 2 +- .../skins/default/xui/fr/panel_region_covenant.xml | 11 +- .../skins/default/xui/fr/panel_region_debug.xml | 20 +- .../skins/default/xui/fr/panel_region_estate.xml | 8 +- .../skins/default/xui/fr/panel_region_general.xml | 4 +- .../skins/default/xui/fr/panel_region_terrain.xml | 12 +- .../indra/newview/skins/default/xui/ja/alerts.xml | 48 +- .../skins/default/xui/ja/floater_about_land.xml | 4 +- .../default/xui/ja/floater_avatar_textures.xml | 12 +- .../skins/default/xui/ja/floater_beacons.xml | 2 +- .../skins/default/xui/ja/floater_buy_currency.xml | 6 +- .../skins/default/xui/ja/floater_customize.xml | 2 +- .../default/xui/ja/floater_hardware_settings.xml | 4 +- .../skins/default/xui/ja/floater_inspect.xml | 2 +- .../xui/ja/floater_instant_message_group.xml | 4 +- .../newview/skins/default/xui/ja/floater_mute.xml | 16 +- .../skins/default/xui/ja/floater_mute_object.xml | 8 +- .../default/xui/ja/floater_new_outfit_dialog.xml | 10 +- .../skins/default/xui/ja/floater_postcard.xml | 12 +- .../skins/default/xui/ja/floater_report_abuse.xml | 2 +- .../skins/default/xui/ja/floater_snapshot.xml | 8 +- .../newview/skins/default/xui/ja/floater_tools.xml | 34 +- .../skins/default/xui/ja/menu_pie_avatar.xml | 2 +- .../skins/default/xui/ja/menu_pie_object.xml | 2 +- .../newview/skins/default/xui/ja/menu_viewer.xml | 40 +- .../newview/skins/default/xui/ja/need_to_long.xml | 241 -- .../skins/default/xui/ja/need_to_translate.xml | 1551 --------- .../skins/default/xui/ja/need_to_update.xml | 759 ----- .../newview/skins/default/xui/ja/panel_avatar.xml | 42 +- .../skins/default/xui/ja/panel_classified.xml | 2 +- .../newview/skins/default/xui/ja/panel_event.xml | 2 +- .../newview/skins/default/xui/ja/panel_groups.xml | 8 +- .../default/xui/ja/panel_preferences_chat.xml | 8 +- .../default/xui/ja/panel_preferences_general.xml | 3 + .../default/xui/ja/panel_preferences_graphics1.xml | 2 +- .../skins/default/xui/ja/panel_preferences_im.xml | 2 +- .../default/xui/ja/panel_preferences_voice.xml | 2 +- .../skins/default/xui/ja/panel_preferences_web.xml | 2 +- .../skins/default/xui/ja/panel_region_general.xml | 4 +- .../newview/skins/default/xui/ja/panel_toolbar.xml | 22 +- .../newview/skins/default/xui/ko/floater_mute.xml | 2 +- .../newview/skins/default/xui/ko/need_to_long.xml | 178 -- .../skins/default/xui/ko/need_to_translate.xml | 1232 -------- .../skins/default/xui/ko/need_to_update.xml | 621 ---- .../newview/skins/default/xui/pt/floater_mute.xml | 2 +- .../indra/newview/skins/default/xui/zh/alerts.xml | 3285 ++++++++++++-------- .../newview/skins/default/xui/zh/floater_about.xml | 41 +- .../skins/default/xui/zh/floater_about_land.xml | 454 ++- .../default/xui/zh/floater_account_history.xml | 4 - .../default/xui/zh/floater_active_speakers.xml | 23 + .../default/xui/zh/floater_animation_preview.xml | 109 +- .../skins/default/xui/zh/floater_auction.xml | 5 +- .../skins/default/xui/zh/floater_avatar_picker.xml | 21 +- .../default/xui/zh/floater_avatar_textures.xml | 22 +- .../skins/default/xui/zh/floater_beacons.xml | 35 + .../skins/default/xui/zh/floater_build_options.xml | 15 +- .../newview/skins/default/xui/zh/floater_bumps.xml | 12 +- .../skins/default/xui/zh/floater_buy_contents.xml | 16 +- .../skins/default/xui/zh/floater_buy_currency.xml | 17 +- .../skins/default/xui/zh/floater_buy_land.xml | 88 +- .../skins/default/xui/zh/floater_buy_object.xml | 19 +- .../skins/default/xui/zh/floater_camera.xml | 11 + .../skins/default/xui/zh/floater_chat_history.xml | 40 +- .../skins/default/xui/zh/floater_chatterbox.xml | 3 + .../skins/default/xui/zh/floater_clothing.xml | 2 +- .../skins/default/xui/zh/floater_color_picker.xml | 6 +- .../skins/default/xui/zh/floater_critical.xml | 2 + .../skins/default/xui/zh/floater_customize.xml | 156 +- .../default/xui/zh/floater_day_cycle_options.xml | 133 + .../default/xui/zh/floater_device_settings.xml | 3 + .../skins/default/xui/zh/floater_directory.xml | 294 +- .../skins/default/xui/zh/floater_env_settings.xml | 54 + .../skins/default/xui/zh/floater_gesture.xml | 11 +- .../skins/default/xui/zh/floater_god_tools.xml | 100 +- .../skins/default/xui/zh/floater_group_info.xml | 43 +- .../default/xui/zh/floater_hardware_settings.xml | 81 + .../newview/skins/default/xui/zh/floater_html.xml | 30 +- .../newview/skins/default/xui/zh/floater_hud.xml | 9 + .../newview/skins/default/xui/zh/floater_im.xml | 73 +- .../skins/default/xui/zh/floater_image_preview.xml | 13 +- .../skins/default/xui/zh/floater_inspect.xml | 14 +- .../default/xui/zh/floater_instant_message.xml | 94 +- .../xui/zh/floater_instant_message_ad_hoc.xml | 66 + .../xui/zh/floater_instant_message_group.xml | 76 + .../skins/default/xui/zh/floater_inventory.xml | 42 +- .../xui/zh/floater_inventory_item_properties.xml | 44 +- .../xui/zh/floater_inventory_view_finder.xml | 14 +- .../skins/default/xui/zh/floater_lagmeter.xml | 182 ++ .../skins/default/xui/zh/floater_land_holdings.xml | 30 +- .../skins/default/xui/zh/floater_landmark_ctrl.xml | 37 + .../default/xui/zh/floater_live_lsleditor.xml | 7 +- .../skins/default/xui/zh/floater_lsl_guide.xml | 19 + .../skins/default/xui/zh/floater_media_browser.xml | 46 + .../skins/default/xui/zh/floater_mem_leaking.xml | 36 + .../newview/skins/default/xui/zh/floater_mute.xml | 15 +- .../skins/default/xui/zh/floater_mute_object.xml | 25 + .../skins/default/xui/zh/floater_my_friends.xml | 19 + .../default/xui/zh/floater_new_outfit_dialog.xml | 54 +- .../skins/default/xui/zh/floater_openobject.xml | 2 +- .../newview/skins/default/xui/zh/floater_pay.xml | 2 +- .../skins/default/xui/zh/floater_pay_object.xml | 4 +- .../skins/default/xui/zh/floater_post_process.xml | 117 + .../skins/default/xui/zh/floater_postcard.xml | 25 +- .../skins/default/xui/zh/floater_preferences.xml | 4 +- .../default/xui/zh/floater_preview_animation.xml | 2 +- .../default/xui/zh/floater_preview_classified.xml | 7 + .../xui/zh/floater_preview_embedded_texture.xml | 2 +- .../skins/default/xui/zh/floater_preview_event.xml | 8 + .../xui/zh/floater_preview_existing_landmark.xml | 2 +- .../default/xui/zh/floater_preview_gesture.xml | 29 +- .../xui/zh/floater_preview_new_landmark.xml | 10 + .../default/xui/zh/floater_preview_notecard.xml | 10 +- .../zh/floater_preview_notecard_keep_discard.xml | 12 +- .../skins/default/xui/zh/floater_preview_sound.xml | 6 +- .../default/xui/zh/floater_preview_texture.xml | 2 +- .../zh/floater_preview_texture_keep_discard.xml | 6 +- .../skins/default/xui/zh/floater_preview_url.xml | 8 + .../default/xui/zh/floater_price_for_listing.xml | 2 +- .../skins/default/xui/zh/floater_region_info.xml | 3 + .../skins/default/xui/zh/floater_report_abuse.xml | 147 +- .../skins/default/xui/zh/floater_report_bug.xml | 32 +- .../skins/default/xui/zh/floater_script_debug.xml | 2 +- .../default/xui/zh/floater_script_ed_panel.xml | 43 +- .../skins/default/xui/zh/floater_script_search.xml | 6 +- .../skins/default/xui/zh/floater_select_key.xml | 14 + .../skins/default/xui/zh/floater_sell_land.xml | 24 +- .../default/xui/zh/floater_settings_debug.xml | 27 +- .../default/xui/zh/floater_sim_release_message.xml | 17 + .../skins/default/xui/zh/floater_snapshot.xml | 99 +- .../skins/default/xui/zh/floater_sound_preview.xml | 17 - .../skins/default/xui/zh/floater_telehub.xml | 22 +- .../skins/default/xui/zh/floater_texture_ctrl.xml | 13 +- .../newview/skins/default/xui/zh/floater_tools.xml | 501 +-- .../skins/default/xui/zh/floater_top_objects.xml | 32 +- .../newview/skins/default/xui/zh/floater_tos.xml | 25 +- .../skins/default/xui/zh/floater_url_entry.xml | 27 + .../skins/default/xui/zh/floater_voice_wizard.xml | 44 + .../newview/skins/default/xui/zh/floater_water.xml | 185 ++ .../default/xui/zh/floater_wearable_save_as.xml | 2 +- .../default/xui/zh/floater_windlight_options.xml | 327 ++ .../skins/default/xui/zh/floater_world_map.xml | 46 +- .../skins/default/xui/zh/menu_inventory.xml | 75 +- .../newview/skins/default/xui/zh/menu_login.xml | 36 + .../skins/default/xui/zh/menu_pie_attachment.xml | 4 +- .../skins/default/xui/zh/menu_pie_avatar.xml | 13 +- .../newview/skins/default/xui/zh/menu_pie_land.xml | 5 +- .../skins/default/xui/zh/menu_pie_object.xml | 10 +- .../newview/skins/default/xui/zh/menu_pie_self.xml | 8 +- .../newview/skins/default/xui/zh/menu_viewer.xml | 258 +- .../newview/skins/default/xui/zh/mime_types.xml | 262 ++ .../indra/newview/skins/default/xui/zh/notify.xml | 592 +++- .../skins/default/xui/zh/panel_account_details.xml | 7 - .../default/xui/zh/panel_account_planning.xml | 2 - .../default/xui/zh/panel_account_transactions.xml | 7 - .../newview/skins/default/xui/zh/panel_audio.xml | 30 + .../skins/default/xui/zh/panel_audio_device.xml | 44 + .../newview/skins/default/xui/zh/panel_avatar.xml | 137 +- .../default/xui/zh/panel_avatar_classified.xml | 24 +- .../skins/default/xui/zh/panel_avatar_pick.xml | 11 +- .../skins/default/xui/zh/panel_chat_bar.xml | 15 +- .../skins/default/xui/zh/panel_classified.xml | 6 +- .../newview/skins/default/xui/zh/panel_event.xml | 30 +- .../newview/skins/default/xui/zh/panel_friends.xml | 23 + .../newview/skins/default/xui/zh/panel_group.xml | 6 +- .../skins/default/xui/zh/panel_group_finder.xml | 4 +- .../skins/default/xui/zh/panel_group_general.xml | 84 +- .../skins/default/xui/zh/panel_group_invite.xml | 14 +- .../default/xui/zh/panel_group_land_money.xml | 38 +- .../skins/default/xui/zh/panel_group_notices.xml | 39 +- .../skins/default/xui/zh/panel_group_roles.xml | 63 +- .../skins/default/xui/zh/panel_group_voting.xml | 102 +- .../newview/skins/default/xui/zh/panel_groups.xml | 29 + .../newview/skins/default/xui/zh/panel_login.xml | 21 +- .../skins/default/xui/zh/panel_media_controls.xml | 83 + .../default/xui/zh/panel_media_remote_expanded.xml | 39 + .../skins/default/xui/zh/panel_overlaybar.xml | 32 +- .../newview/skins/default/xui/zh/panel_place.xml | 62 +- .../skins/default/xui/zh/panel_place_small.xml | 62 +- .../default/xui/zh/panel_preferences_audio.xml | 52 +- .../default/xui/zh/panel_preferences_chat.xml | 54 +- .../default/xui/zh/panel_preferences_general.xml | 122 +- .../default/xui/zh/panel_preferences_graphics1.xml | 254 +- .../skins/default/xui/zh/panel_preferences_im.xml | 49 +- .../default/xui/zh/panel_preferences_input.xml | 41 +- .../default/xui/zh/panel_preferences_network.xml | 39 +- .../default/xui/zh/panel_preferences_popups.xml | 45 +- .../default/xui/zh/panel_preferences_skins.xml | 12 + .../default/xui/zh/panel_preferences_voice.xml | 59 + .../skins/default/xui/zh/panel_preferences_web.xml | 88 + .../skins/default/xui/zh/panel_region_covenant.xml | 22 +- .../skins/default/xui/zh/panel_region_debug.xml | 67 +- .../skins/default/xui/zh/panel_region_estate.xml | 61 +- .../skins/default/xui/zh/panel_region_general.xml | 44 +- .../skins/default/xui/zh/panel_region_terrain.xml | 12 +- .../skins/default/xui/zh/panel_region_texture.xml | 42 +- .../default/xui/zh/panel_speaker_controls.xml | 60 + .../skins/default/xui/zh/panel_status_bar.xml | 39 +- .../newview/skins/default/xui/zh/panel_toolbar.xml | 37 +- .../skins/default/xui/zh/panel_voice_controls.xml | 8 + .../skins/default/xui/zh/panel_voice_enable.xml | 24 + .../skins/default/xui/zh/panel_voice_options.xml | 45 + .../default/xui/zh/panel_voice_remote_expanded.xml | 4 + .../newview/skins/default/xui/zh/role_actions.xml | 173 +- .../indra/newview/skins/default/xui/zh/strings.xml | 173 +- .../newview/skins/default/xui/zh/strings_long.xml | 2 - .../skins/default/xui/zh/teleport_strings.xml | 109 + 295 files changed, 9570 insertions(+), 8350 deletions(-) delete mode 100644 linden/indra/newview/skins/default/xui/ja/need_to_long.xml delete mode 100644 linden/indra/newview/skins/default/xui/ja/need_to_translate.xml delete mode 100644 linden/indra/newview/skins/default/xui/ja/need_to_update.xml delete mode 100644 linden/indra/newview/skins/default/xui/ko/need_to_long.xml delete mode 100644 linden/indra/newview/skins/default/xui/ko/need_to_translate.xml delete mode 100644 linden/indra/newview/skins/default/xui/ko/need_to_update.xml delete mode 100644 linden/indra/newview/skins/default/xui/zh/floater_account_history.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_active_speakers.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_beacons.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_camera.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_chatterbox.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_day_cycle_options.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_device_settings.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_hardware_settings.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_hud.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_instant_message_group.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_lsl_guide.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_media_browser.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_mem_leaking.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_mute_object.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_my_friends.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_post_process.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_preview_classified.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_preview_event.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_preview_new_landmark.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_preview_url.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_region_info.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_select_key.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_sim_release_message.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_url_entry.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_voice_wizard.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_water.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/menu_login.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/mime_types.xml delete mode 100644 linden/indra/newview/skins/default/xui/zh/panel_account_details.xml delete mode 100644 linden/indra/newview/skins/default/xui/zh/panel_account_planning.xml delete mode 100644 linden/indra/newview/skins/default/xui/zh/panel_account_transactions.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_audio.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_audio_device.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_friends.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_groups.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_media_controls.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_media_remote_expanded.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_preferences_skins.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_preferences_voice.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_preferences_web.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_voice_controls.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_voice_enable.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/panel_voice_remote_expanded.xml delete mode 100644 linden/indra/newview/skins/default/xui/zh/strings_long.xml create mode 100644 linden/indra/newview/skins/default/xui/zh/teleport_strings.xml (limited to 'linden') diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 563caaa..4d10442 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt @@ -57,6 +57,7 @@ Alissa Sabre VWR-7168 VWR-7087 VWR-7086 + VWR-10728 Angus Boyd VWR-592 Argent Stonecutter @@ -133,6 +134,8 @@ Fluf Fredriksson VWR-3450 Fremont Cunningham VWR-1147 +Geneko Nemeth + CT-117 Gudmund Shepherd VWR-1873 Gigs Taggart @@ -203,6 +206,8 @@ Kage Pixel Kunnis Basiat VWR-82 VWR-102 +maciek marksman + CT-86 march Korda SVC-1020 Matthew Dowd @@ -321,6 +326,8 @@ Peekay Semyorka VWR-19 VWR-49 VWR-79 +princess niven + VWR-5733 Renault Clio VWR-1976 Robin Cornelius diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index e027fad..3fc4e72 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h @@ -34,7 +34,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 22; -const S32 LL_VERSION_PATCH = 2; +const S32 LL_VERSION_PATCH = 3; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Release"; diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp index 7b6c6a9..be03090 100644 --- a/linden/indra/llmath/llvolume.cpp +++ b/linden/indra/llmath/llvolume.cpp @@ -1759,13 +1759,21 @@ BOOL LLVolume::generate() if (regenPath || regenProf ) { - sNumMeshPoints -= mMesh.size(); - mMesh.resize(mProfilep->mProfile.size() * mPathp->mPath.size()); - sNumMeshPoints += mMesh.size(); - S32 sizeS = mPathp->mPath.size(); S32 sizeT = mProfilep->mProfile.size(); + //debug info + if((U32)(sizeS * sizeT) > (1u << 20)) + { + llinfos << "sizeS: " << sizeS << " sizeT: " << sizeT << llendl ; + llinfos << "path_detail : " << path_detail << " split: " << split << " profile_detail: " << profile_detail << llendl ; + llinfos << mParams << llendl ; + } + + sNumMeshPoints -= mMesh.size(); + mMesh.resize(sizeT * sizeS); + sNumMeshPoints += mMesh.size(); + //generate vertex positions // Run along the path. diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp index a41b931..9a392d7 100644 --- a/linden/indra/llrender/llimagegl.cpp +++ b/linden/indra/llrender/llimagegl.cpp @@ -748,7 +748,7 @@ BOOL LLImageGL::setSubImage(const LLImageRaw* imageraw, S32 x_pos, S32 y_pos, S3 // Copy sub image from frame buffer BOOL LLImageGL::setSubImageFromFrameBuffer(S32 fb_x, S32 fb_y, S32 x_pos, S32 y_pos, S32 width, S32 height) { - if (gGL.getTexUnit(0)->bind(this)) + if (gGL.getTexUnit(0)->bind(this, true)) { glCopyTexSubImage2D(GL_TEXTURE_2D, 0, fb_x, fb_y, x_pos, y_pos, width, height); mInitialized = true; diff --git a/linden/indra/llrender/llrender.cpp b/linden/indra/llrender/llrender.cpp index a15f44a..fcd76d4 100644 --- a/linden/indra/llrender/llrender.cpp +++ b/linden/indra/llrender/llrender.cpp @@ -175,7 +175,7 @@ void LLTexUnit::disable(void) } } -bool LLTexUnit::bind(const LLImageGL* texture) +bool LLTexUnit::bind(const LLImageGL* texture, bool forceBind) { if (mIndex < 0) return false; @@ -183,29 +183,27 @@ bool LLTexUnit::bind(const LLImageGL* texture) if (texture == NULL) { - return texture->bindError(mIndex); + llwarns << "NULL LLTexUnit::bind texture" << llendl; + return false; } - if (!texture->isInitialized()) + if (!texture->isInitialized() && !forceBind) { return texture->bindDefaultImage(mIndex); } + if (!texture->getTexName()) //if texture does not exist { return texture->bindDefaultImage(mIndex); } // Disabled caching of binding state. - if (texture != NULL) - { - activate(); - enable(texture->getTarget()); - mCurrTexture = texture->getTexName(); - glBindTexture(sGLTextureType[texture->getTarget()], mCurrTexture); - texture->updateBindStats(); - return true; - } - return false; + activate(); + enable(texture->getTarget()); + mCurrTexture = texture->getTexName(); + glBindTexture(sGLTextureType[texture->getTarget()], mCurrTexture); + texture->updateBindStats(); + return true; } bool LLTexUnit::bind(LLCubeMap* cubeMap) diff --git a/linden/indra/llrender/llrender.h b/linden/indra/llrender/llrender.h index 8c648f3..7dcb504 100644 --- a/linden/indra/llrender/llrender.h +++ b/linden/indra/llrender/llrender.h @@ -135,12 +135,17 @@ public: // Disables the current texture unit void disable(void); - // Binds the LLImageGL to this texture unit (automatically enables the unit for the LLImageGL's texture type) - bool bind(const LLImageGL* texture); - // Binds a cubemap to this texture unit (automatically enables the texture unit for cubemaps) + // Binds the LLImageGL to this texture unit + // (automatically enables the unit for the LLImageGL's texture type) + bool bind(const LLImageGL* texture, bool forceBind = false); + + // Binds a cubemap to this texture unit + // (automatically enables the texture unit for cubemaps) bool bind(LLCubeMap* cubeMap); + // Binds a render target to this texture unit (automatically enables the texture unit for the RT's texture type) bool bind(LLRenderTarget * renderTarget, bool bindDepth = false); + // Manually binds a texture to the texture unit (automatically enables the tex unit for the given texture type) bool bindManual(eTextureType type, U32 texture); diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp index ef3cf68..8d0ab65 100644 --- a/linden/indra/llwindow/llwindowwin32.cpp +++ b/linden/indra/llwindow/llwindowwin32.cpp @@ -1559,7 +1559,13 @@ void LLWindowWin32::captureMouse() void LLWindowWin32::releaseMouse() { + // *NOTE:Mani ReleaseCapture will spawn new windows messages... + // which will in turn call our MainWindowProc. It therefore requires + // pausing *and more importantly resumption* of the mainlooptimeout... + // just like DispatchMessage below. + mCallbacks->handlePauseWatchdog(this); ReleaseCapture(); + mCallbacks->handleResumeWatchdog(this); } diff --git a/linden/indra/newview/featuretable.txt b/linden/indra/newview/featuretable.txt index 7af05a5..c02ba86 100644 --- a/linden/indra/newview/featuretable.txt +++ b/linden/indra/newview/featuretable.txt @@ -1,4 +1,4 @@ -version 18 +version 19 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table @@ -367,28 +367,40 @@ Disregard96DefaultDrawDistance 1 0 list ATI_Radeon_X300 Disregard128DefaultDrawDistance 1 0 +RenderVBOEnable 1 0 list ATI_Radeon_X400 Disregard128DefaultDrawDistance 1 0 +RenderVBOEnable 1 0 list ATI_Radeon_X500 Disregard128DefaultDrawDistance 1 0 +RenderVBOEnable 1 0 list ATI_Radeon_X600 Disregard128DefaultDrawDistance 1 0 +RenderVBOEnable 1 0 list ATI_Radeon_X700 Disregard128DefaultDrawDistance 1 0 +RenderVBOEnable 1 0 list ATI_Radeon_X1300 Disregard128DefaultDrawDistance 1 0 +RenderVBOEnable 1 0 UseStartScreen 0 0 list ATI_Radeon_X1400 Disregard128DefaultDrawDistance 1 0 +RenderVBOEnable 1 0 list ATI_Radeon_X1500 Disregard128DefaultDrawDistance 1 0 +RenderVBOEnable 1 0 UseStartScreen 0 0 list ATI_Radeon_X1600 Disregard128DefaultDrawDistance 1 0 +RenderVBOEnable 1 0 list ATI_Radeon_X1700 Disregard128DefaultDrawDistance 1 0 +RenderVBOEnable 1 0 list ATI_Mobility_Radeon_X1xxx Disregard128DefaultDrawDistance 1 0 +RenderVBOEnable 1 0 + list ATI_Radeon_HD_2300 Disregard128DefaultDrawDistance 1 0 list ATI_Radeon_HD_2400 diff --git a/linden/indra/newview/featuretable_linux.txt b/linden/indra/newview/featuretable_linux.txt index 0036f11..09105b8 100644 --- a/linden/indra/newview/featuretable_linux.txt +++ b/linden/indra/newview/featuretable_linux.txt @@ -1,4 +1,4 @@ -version 18 +version 19 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/linden/indra/newview/featuretable_mac.txt b/linden/indra/newview/featuretable_mac.txt index 54a7c11..fd2496d 100644 --- a/linden/indra/newview/featuretable_mac.txt +++ b/linden/indra/newview/featuretable_mac.txt @@ -1,4 +1,4 @@ -version 18 +version 19 // NOTE: This is mostly identical to featuretable_mac.txt with a few differences // Should be combined into one table diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt index 150e7f3..7484005 100644 --- a/linden/indra/newview/gpu_table.txt +++ b/linden/indra/newview/gpu_table.txt @@ -48,12 +48,12 @@ ATI ASUS EAH34xx .*ATI.*ASUS.*EAH34.* 1 1 ATI ASUS EAH36xx .*ATI.*ASUS.*EAH36.* 3 1 ATI ASUS EAH38xx .*ATI.*ASUS.*EAH38.* 3 1 ATI ASUS EAH48xx .*ATI.*ASUS.*EAH48.* 3 1 -ATI ASUS X1xxx .*ATI.*ASUS.*X1.* 2 1 -ATI ASUS X7xx .*ATI.*ASUS.*X7.* 1 1 -ATI Diamond X550 .*ATI.*Diamond X550.* 1 1 -ATI Diamond X13xx .*ATI.*Diamond X13.* 1 1 -ATI Diamond X16xx .*ATI.*Diamond X16.* 1 1 -ATI Diamond X19xx .*ATI.*Diamond X19.* 1 1 +ATI Radeon X1xxx .*ATI.*ASUS.*X1.* 2 1 +ATI Radeon X7xx .*ATI.*ASUS.*X7.* 1 1 +ATI Radeon X500 .*ATI.*Diamond X5.* 1 1 +ATI Radeon X13xx .*ATI.*Diamond X13.* 1 1 +ATI Radeon X16xx .*ATI.*Diamond X16.* 1 1 +ATI Radeon X19xx .*ATI.*Diamond X19.* 1 1 ATI Display Adapter .*ATI.*display adapter.* 0 1 ATI FireGL 5200 .*ATI.*FireGL V52.* 0 1 ATI FireGL 5xxx .*ATI.*FireGL V5.* 1 1 diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp index 2a6fd60..34e6d42 100644 --- a/linden/indra/newview/llappviewerwin32.cpp +++ b/linden/indra/newview/llappviewerwin32.cpp @@ -124,6 +124,27 @@ LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *excepti return retval; } +// Create app mutex creates a unique global windows object. +// If the object can be created it returns true, otherwise +// it returns false. The false result can be used to determine +// if another instance of a second life app (this vers. or later) +// is running. +// *NOTE: Do not use this method to run a single instance of the app. +// This is intended to help debug problems with the cross-platform +// locked file method used for that purpose. +bool create_app_mutex() +{ + bool result = true; + LPCWSTR unique_mutex_name = L"SecondLifeAppMutex"; + HANDLE hMutex; + hMutex = CreateMutex(NULL, TRUE, unique_mutex_name); + if(GetLastError() == ERROR_ALREADY_EXISTS) + { + result = false; + } + return result; +} + //#define DEBUGGING_SEH_FILTER 1 #if DEBUGGING_SEH_FILTER # define WINMAIN DebuggingWinMain @@ -151,6 +172,10 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash); + // Set a debug info flag to indicate if multiple instances are running. + bool found_other_instance = !create_app_mutex(); + gDebugInfo["FoundOtherInstanceAtStartup"] = LLSD::Boolean(found_other_instance); + bool ok = viewer_app_ptr->init(); if(!ok) { @@ -204,11 +229,8 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, //start updater if(LLAppViewer::sUpdaterInfo) { -#if LL_WINDOWS _spawnl(_P_NOWAIT, LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mParams.str().c_str(), NULL); -#elif LL_DARWIN - system(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str()); /* Flawfinder: ignore */ -#endif + delete LLAppViewer::sUpdaterInfo ; LLAppViewer::sUpdaterInfo = NULL ; } diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp index d308210..a825511 100644 --- a/linden/indra/newview/llfloaterinspect.cpp +++ b/linden/indra/newview/llfloaterinspect.cpp @@ -206,8 +206,8 @@ void LLFloaterInspect::refresh() mObjectList->operateOnAll(LLScrollListCtrl::OP_DELETE); //List all transient objects, then all linked objects - for (LLObjectSelection::iterator iter = mObjectSelection->begin(); - iter != mObjectSelection->end(); iter++) + for (LLObjectSelection::valid_iterator iter = mObjectSelection->valid_begin(); + iter != mObjectSelection->valid_end(); iter++) { LLSelectNode* obj = *iter; LLSD row; diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp index afa0785..61ae4c2 100644 --- a/linden/indra/newview/llfloatersnapshot.cpp +++ b/linden/indra/newview/llfloatersnapshot.cpp @@ -899,6 +899,13 @@ void LLSnapshotLivePreview::getSize(S32& w, S32& h) const LLFloaterPostcard* LLSnapshotLivePreview::savePostcard() { + if(mViewerImage[mCurImageIndex].isNull()) + { + //this should never happen!! + llwarns << "The snapshot image has not been generated!" << llendl ; + return NULL ; + } + // calculate and pass in image scale in case image data only use portion // of viewerimage buffer LLVector2 image_scale(1.f, 1.f); @@ -1636,6 +1643,9 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL LLSnapshotLivePreview* previewp = getPreviewView(view); if (previewp && combobox->getCurrentIndex() >= 0) { + S32 original_width = 0 , original_height = 0 ; + previewp->getSize(original_width, original_height) ; + if (width == 0 || height == 0) { // take resolution from current window size @@ -1660,19 +1670,24 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL { resetSnapshotSizeOnUI(view, width, height) ; } - previewp->setSize(width, height); - + if(view->childGetValue("snapshot_width").asInteger() != width || view->childGetValue("snapshot_height").asInteger() != height) { - view->childSetValue("snapshot_width", width); - view->childSetValue("snapshot_height", height); - // hide old preview as the aspect ratio could be wrong - checkAutoSnapshot(previewp, FALSE); + view->childSetValue("snapshot_width", width); + view->childSetValue("snapshot_height", height); + } + + if(original_width != width || original_height != height) + { + previewp->setSize(width, height); + + // hide old preview as the aspect ratio could be wrong + checkAutoSnapshot(previewp, FALSE); getPreviewView(view)->updateSnapshot(FALSE, TRUE); if(do_update) { updateControls(view); - } + } } } } diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp index 96492e8..0afa618 100644 --- a/linden/indra/newview/llfloatertopobjects.cpp +++ b/linden/indra/newview/llfloatertopobjects.cpp @@ -212,7 +212,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data) if (mCurrentMode == STAT_REPORT_TOP_SCRIPTS && have_extended_data) { - element["columns"][5]["column"] = "Mono Time"; + element["columns"][5]["column"] = "mono_time"; element["columns"][5]["value"] = llformat("%0.3f", mono_score); element["columns"][5]["font"] = "SANSSERIF"; } @@ -238,6 +238,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data) { setTitle(getString("top_scripts_title")); list->setColumnLabel("score", getString("scripts_score_label")); + list->setColumnLabel("mono_time", getString("scripts_mono_time_label")); LLUIString format = getString("top_scripts_text"); format.setArg("[COUNT]", llformat("%d", total_count)); @@ -248,6 +249,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data) { setTitle(getString("top_colliders_title")); list->setColumnLabel("score", getString("colliders_score_label")); + list->setColumnLabel("mono_time", ""); LLUIString format = getString("top_colliders_text"); format.setArg("[COUNT]", llformat("%d", total_count)); childSetValue("title_text", LLSD(format)); diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp index c3392ce..9149658 100644 --- a/linden/indra/newview/llinventorymodel.cpp +++ b/linden/indra/newview/llinventorymodel.cpp @@ -1499,7 +1499,7 @@ void LLInventoryModel::stopBackgroundFetch() //static void LLInventoryModel::backgroundFetch(void*) { - if (sBackgroundFetchActive) + if (sBackgroundFetchActive && gAgent.getRegion()) { //If we'll be using the capability, we'll be sending batches and the background thing isn't as important. std::string url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents"); diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 2ce111f..2d37eb3 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp @@ -2896,7 +2896,10 @@ void update_dialog_callback(S32 option, void *userdata) LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" &"; LL_DEBUGS("AppInit") << "Calling updater: " << LLAppViewer::sUpdaterInfo->mUpdateExePath << LL_ENDL; - + + // Run the auto-updater. + system(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str()); /* Flawfinder: ignore */ + #elif LL_LINUX OSMessageBox("Automatic updating is not yet implemented for Linux.\n" "Please download the latest version from www.secondlife.com.", diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 7c08c8a..dff31e1 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -1740,7 +1740,7 @@ class LLViewCommunicate : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0) + if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0) { LLFloaterMyFriends::toggleInstance(); } @@ -1748,7 +1748,6 @@ class LLViewCommunicate : public view_listener_t { LLFloaterChatterBox::toggleInstance(); } - return true; } }; @@ -5291,6 +5290,10 @@ class LLFloaterVisible : public view_listener_t { new_value = LLFloaterMyFriends::instanceVisible(0); } + else if (floater_name == "communicate") + { + new_value = LLFloaterChatterBox::instanceVisible(); + } else if (floater_name == "toolbar") { new_value = LLToolBar::visible(NULL); diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp index d9d8636..bb84f43 100644 --- a/linden/indra/newview/llviewermenufile.cpp +++ b/linden/indra/newview/llviewermenufile.cpp @@ -930,6 +930,11 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty LLAssetStorage::LLStoreAssetCallback callback, void *userdata) { + if(gDisconnected) + { + return ; + } + LLAssetID uuid = tid.makeAssetID(gAgent.getSecureSessionID()); if( LLAssetType::AT_SOUND == asset_type ) diff --git a/linden/indra/newview/llwatchdog.cpp b/linden/indra/newview/llwatchdog.cpp index 55975ee..e37bbd8 100644 --- a/linden/indra/newview/llwatchdog.cpp +++ b/linden/indra/newview/llwatchdog.cpp @@ -239,7 +239,8 @@ void LLWatchdog::run() llinfos << "Watchdog detected error:" << llendl; #ifdef LL_WINDOWS - RaiseException(0,0,0,0); + llerrs << "Windows Watchdog killer event" << llendl; + // RaiseException(0,0,0,0); #else raise(SIGQUIT); #endif diff --git a/linden/indra/newview/skins/default/xui/de/alerts.xml b/linden/indra/newview/skins/default/xui/de/alerts.xml index 20e6113..9e59021 100644 --- a/linden/indra/newview/skins/default/xui/de/alerts.xml +++ b/linden/indra/newview/skins/default/xui/de/alerts.xml @@ -323,9 +323,15 @@ Der Rolle '[ROLE_NAME]' diese Fähigkeit zuweisen? Nein - - + + + Auswahl von „In Suche veröffentlichen“ +Dieses Kontrollkästchen zeigt Folgendes an: +- diese Parzelle in den Suchergebnissen +- die öffentlichen Objekte dieser Parzelle +- diese Parzelle in der Websuche + @@ -338,6 +344,11 @@ Der Rolle '[ROLE_NAME]' diese Fähigkeit zuweisen? + + Auswahl von "In Suche anzeigen" zeigt Folgendes an: +- Ihr Profil in den Suchergebnissen +- einen Link auf Ihr Profil in den öffentlichen Gruppenseiten + @@ -1314,6 +1325,28 @@ Der Avatar wird außer Gefecht gesetzt und kann sich nicht mehr bewegen, chatten Abbrechen + + + Diesen Avatar aus Ihrem Land werfen? + + + + + + + [AVATAR_NAME] aus Ihrem Land werfen? + + + + Ungültige UUID. @@ -2881,7 +2914,7 @@ Diese Gruppe verlassen? - Linden können nicht stummgeschaltet werden. + Lindens können nicht stummgeschaltet werden.