Merged SL 1.22.11 into Imprudence 1.1 RC2.

Conflicts:
	linden/doc/contributions.txt
	linden/indra/cmake/APR.cmake
	linden/indra/cmake/CopyWinLibs.cmake
	linden/indra/cmake/LLKDU.cmake                            (removed)
	linden/indra/cmake/LLMedia.cmake
	linden/indra/cmake/OPENAL.cmake
	linden/indra/cmake/QuickTime.cmake                        (removed)
	linden/indra/develop.py
	linden/indra/lib/python/indra/base/llsd.py
	linden/indra/lib/python/indra/util/fastest_elementtree.py
	linden/indra/lib/python/indra/util/llmanifest.py
	linden/indra/lib/python/indra/util/named_query.py
	linden/indra/llaudio/CMakeLists.txt
	linden/indra/llaudio/audioengine.cpp
	linden/indra/llaudio/audioengine.h
	linden/indra/llaudio/audioengine_fmod.cpp
	linden/indra/llaudio/audioengine_fmod.h
	linden/indra/llaudio/audioengine_openal.cpp
	linden/indra/llaudio/audioengine_openal.h
	linden/indra/llaudio/listener_openal.cpp
	linden/indra/llaudio/listener_openal.h
	linden/indra/llaudio/windgen.h
	linden/indra/llcrashlogger/llcrashlogger.cpp
	linden/indra/llmedia/llmediaimplgstreamer.cpp
	linden/indra/llmedia/llmediaimplgstreamer_syms.cpp     (removed)
	linden/indra/llmedia/llmediaimplgstreamer_syms.h       (removed)
	linden/indra/llmessage/llcircuit.h
	linden/indra/llrender/llgl.cpp
	linden/indra/llrender/llrender.h
	linden/indra/llui/llfloater.cpp
	linden/indra/llui/lltexteditor.cpp
	linden/indra/llwindow/llwindowsdl.cpp
	linden/indra/mac_crash_logger/CMakeLists.txt
	linden/indra/mac_updater/CMakeLists.txt
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/installers/windows/lang_de.nsi
	linden/indra/newview/installers/windows/lang_en-us.nsi
	linden/indra/newview/installers/windows/lang_ja.nsi
	linden/indra/newview/installers/windows/lang_ko.nsi
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llaudiosourcevo.cpp
	linden/indra/newview/llfloaterabout.cpp
	linden/indra/newview/llfloaterhtml.cpp
	linden/indra/newview/llfloaterhtml.h
	linden/indra/newview/llfloaterinspect.cpp
	linden/indra/newview/llfloatersnapshot.cpp
	linden/indra/newview/llpanelgeneral.cpp
	linden/indra/newview/llpanelgeneral.h
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/llpanelobject.cpp
	linden/indra/newview/llurlhistory.cpp
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/llviewernetwork.cpp
	linden/indra/newview/llviewernetwork.h
	linden/indra/newview/llviewerobject.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
	linden/indra/newview/skins/default/xui/de/floater_html.xml
	linden/indra/newview/skins/default/xui/de/floater_inspect.xml
	linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
	linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
	linden/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
	linden/indra/newview/skins/default/xui/de/floater_url_entry.xml
	linden/indra/newview/skins/default/xui/de/floater_water.xml
	linden/indra/newview/skins/default/xui/de/mime_types.xml
	linden/indra/newview/skins/default/xui/de/need_to_long.xml
	linden/indra/newview/skins/default/xui/de/need_to_translate.xml
	linden/indra/newview/skins/default/xui/de/need_to_update.xml
	linden/indra/newview/skins/default/xui/de/panel_friends.xml
	linden/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml
	linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/de/panel_voice_controls.xml
	linden/indra/newview/skins/default/xui/de/panel_voice_enable.xml
	linden/indra/newview/skins/default/xui/de/panel_voice_options.xml
	linden/indra/newview/skins/default/xui/de/strings.xml
	linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
	linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
	linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
	linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
	linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
	linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
	linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/en-us/panel_voice_remote.xml
	linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml
	linden/indra/newview/skins/default/xui/es/alerts.xml
	linden/indra/newview/skins/default/xui/es/floater_about_land.xml
	linden/indra/newview/skins/default/xui/es/floater_mute.xml
	linden/indra/newview/skins/default/xui/es/menu_viewer.xml
	linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml
	linden/indra/newview/skins/default/xui/es/panel_preferences_general.xml
	linden/indra/newview/skins/default/xui/fr/alerts.xml
	linden/indra/newview/skins/default/xui/fr/floater_about.xml
	linden/indra/newview/skins/default/xui/fr/floater_about_land.xml
	linden/indra/newview/skins/default/xui/fr/floater_active_speakers.xml
	linden/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
	linden/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
	linden/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
	linden/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
	linden/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
	linden/indra/newview/skins/default/xui/fr/floater_buy_land.xml
	linden/indra/newview/skins/default/xui/fr/floater_buy_object.xml
	linden/indra/newview/skins/default/xui/fr/floater_chat_history.xml
	linden/indra/newview/skins/default/xui/fr/floater_color_picker.xml
	linden/indra/newview/skins/default/xui/fr/floater_customize.xml
	linden/indra/newview/skins/default/xui/fr/floater_directory.xml
	linden/indra/newview/skins/default/xui/fr/floater_env_settings.xml
	linden/indra/newview/skins/default/xui/fr/floater_god_tools.xml
	linden/indra/newview/skins/default/xui/fr/floater_group_info.xml
	linden/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
	linden/indra/newview/skins/default/xui/fr/floater_html.xml
	linden/indra/newview/skins/default/xui/fr/floater_image_preview.xml
	linden/indra/newview/skins/default/xui/fr/floater_import.xml
	linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
	linden/indra/newview/skins/default/xui/fr/floater_instant_message_ad_hoc.xml
	linden/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
	linden/indra/newview/skins/default/xui/fr/floater_inventory.xml
	linden/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
	linden/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
	linden/indra/newview/skins/default/xui/fr/floater_joystick.xml
	linden/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
	linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
	linden/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
	linden/indra/newview/skins/default/xui/fr/floater_media_browser.xml
	linden/indra/newview/skins/default/xui/fr/floater_moveview.xml
	linden/indra/newview/skins/default/xui/fr/floater_mute.xml
	linden/indra/newview/skins/default/xui/fr/floater_mute_object.xml
	linden/indra/newview/skins/default/xui/fr/floater_name_description.xml
	linden/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
	linden/indra/newview/skins/default/xui/fr/floater_openobject.xml
	linden/indra/newview/skins/default/xui/fr/floater_pay.xml
	linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
	linden/indra/newview/skins/default/xui/fr/floater_preferences.xml
	linden/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
	linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
	linden/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
	linden/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml
	linden/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
	linden/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
	linden/indra/newview/skins/default/xui/fr/floater_region_info.xml
	linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
	linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
	linden/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml
	linden/indra/newview/skins/default/xui/fr/floater_sell_land.xml
	linden/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
	linden/indra/newview/skins/default/xui/fr/floater_skin_preview_template.xml
	linden/indra/newview/skins/default/xui/fr/floater_snapshot.xml
	linden/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
	linden/indra/newview/skins/default/xui/fr/floater_telehub.xml
	linden/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
	linden/indra/newview/skins/default/xui/fr/floater_tools.xml
	linden/indra/newview/skins/default/xui/fr/floater_top_objects.xml
	linden/indra/newview/skins/default/xui/fr/floater_url_entry.xml
	linden/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
	linden/indra/newview/skins/default/xui/fr/floater_world_map.xml
	linden/indra/newview/skins/default/xui/fr/menu_inventory.xml
	linden/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
	linden/indra/newview/skins/default/xui/fr/menu_pie_land.xml
	linden/indra/newview/skins/default/xui/fr/menu_pie_self.xml
	linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
	linden/indra/newview/skins/default/xui/fr/mime_types.xml
	linden/indra/newview/skins/default/xui/fr/notify.xml
	linden/indra/newview/skins/default/xui/fr/panel_audio.xml
	linden/indra/newview/skins/default/xui/fr/panel_audio_device.xml
	linden/indra/newview/skins/default/xui/fr/panel_avatar.xml
	linden/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml
	linden/indra/newview/skins/default/xui/fr/panel_chat_bar.xml
	linden/indra/newview/skins/default/xui/fr/panel_classified.xml
	linden/indra/newview/skins/default/xui/fr/panel_event.xml
	linden/indra/newview/skins/default/xui/fr/panel_friends.xml
	linden/indra/newview/skins/default/xui/fr/panel_group.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_finder.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_general.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_invite.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_notices.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_roles.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_voting.xml
	linden/indra/newview/skins/default/xui/fr/panel_groups.xml
	linden/indra/newview/skins/default/xui/fr/panel_login.xml
	linden/indra/newview/skins/default/xui/fr/panel_master_volume.xml
	linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
	linden/indra/newview/skins/default/xui/fr/panel_media_remote.xml
	linden/indra/newview/skins/default/xui/fr/panel_media_remote_expanded.xml
	linden/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
	linden/indra/newview/skins/default/xui/fr/panel_place.xml
	linden/indra/newview/skins/default/xui/fr/panel_place_small.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_input.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_network.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_popups.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
	linden/indra/newview/skins/default/xui/fr/panel_region_debug.xml
	linden/indra/newview/skins/default/xui/fr/panel_region_estate.xml
	linden/indra/newview/skins/default/xui/fr/panel_region_general.xml
	linden/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
	linden/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
	linden/indra/newview/skins/default/xui/fr/panel_speaker_controls.xml
	linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml
	linden/indra/newview/skins/default/xui/fr/panel_toolbar.xml
	linden/indra/newview/skins/default/xui/fr/panel_voice_controls.xml
	linden/indra/newview/skins/default/xui/fr/panel_voice_enable.xml
	linden/indra/newview/skins/default/xui/fr/panel_voice_options.xml
	linden/indra/newview/skins/default/xui/fr/panel_voice_remote_expanded.xml
	linden/indra/newview/skins/default/xui/fr/role_actions.xml
	linden/indra/newview/skins/default/xui/fr/strings.xml
	linden/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
	linden/indra/newview/skins/default/xui/ja/floater_inspect.xml
	linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml
	linden/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
	linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml
	linden/indra/newview/skins/default/xui/ja/floater_mute_object.xml
	linden/indra/newview/skins/default/xui/ja/floater_url_entry.xml
	linden/indra/newview/skins/default/xui/ja/need_to_long.xml
	linden/indra/newview/skins/default/xui/ja/need_to_translate.xml
	linden/indra/newview/skins/default/xui/ja/need_to_update.xml
	linden/indra/newview/skins/default/xui/ja/panel_audio.xml
	linden/indra/newview/skins/default/xui/ja/panel_groups.xml
	linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/ja/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/ja/strings.xml
	linden/indra/newview/skins/default/xui/ko/need_to_long.xml
	linden/indra/newview/skins/default/xui/ko/need_to_translate.xml
	linden/indra/newview/skins/default/xui/ko/need_to_update.xml
	linden/indra/newview/skins/default/xui/pt/alerts.xml
	linden/indra/newview/skins/default/xui/pt/floater_about.xml
	linden/indra/newview/skins/default/xui/pt/floater_about_land.xml
	linden/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
	linden/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
	linden/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
	linden/indra/newview/skins/default/xui/pt/floater_build_options.xml
	linden/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
	linden/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
	linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml
	linden/indra/newview/skins/default/xui/pt/floater_buy_object.xml
	linden/indra/newview/skins/default/xui/pt/floater_chat_history.xml
	linden/indra/newview/skins/default/xui/pt/floater_color_picker.xml
	linden/indra/newview/skins/default/xui/pt/floater_customize.xml
	linden/indra/newview/skins/default/xui/pt/floater_directory.xml
	linden/indra/newview/skins/default/xui/pt/floater_gesture.xml
	linden/indra/newview/skins/default/xui/pt/floater_html.xml
	linden/indra/newview/skins/default/xui/pt/floater_im.xml
	linden/indra/newview/skins/default/xui/pt/floater_image_preview.xml
	linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml
	linden/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml
	linden/indra/newview/skins/default/xui/pt/floater_inventory.xml
	linden/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
	linden/indra/newview/skins/default/xui/pt/floater_joystick.xml
	linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
	linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
	linden/indra/newview/skins/default/xui/pt/floater_mute.xml
	linden/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml
	linden/indra/newview/skins/default/xui/pt/floater_openobject.xml
	linden/indra/newview/skins/default/xui/pt/floater_pay.xml
	linden/indra/newview/skins/default/xui/pt/floater_pay_object.xml
	linden/indra/newview/skins/default/xui/pt/floater_postcard.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml
	linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
	linden/indra/newview/skins/default/xui/pt/floater_report_bug.xml
	linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml
	linden/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml
	linden/indra/newview/skins/default/xui/pt/floater_snapshot.xml
	linden/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
	linden/indra/newview/skins/default/xui/pt/floater_tools.xml
	linden/indra/newview/skins/default/xui/pt/floater_top_objects.xml
	linden/indra/newview/skins/default/xui/pt/floater_tos.xml
	linden/indra/newview/skins/default/xui/pt/floater_world_map.xml
	linden/indra/newview/skins/default/xui/pt/menu_inventory.xml
	linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml
	linden/indra/newview/skins/default/xui/pt/menu_viewer.xml
	linden/indra/newview/skins/default/xui/pt/notify.xml
	linden/indra/newview/skins/default/xui/pt/panel_avatar.xml
	linden/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml
	linden/indra/newview/skins/default/xui/pt/panel_chat_bar.xml
	linden/indra/newview/skins/default/xui/pt/panel_classified.xml
	linden/indra/newview/skins/default/xui/pt/panel_event.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_general.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_invite.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_notices.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_roles.xml
	linden/indra/newview/skins/default/xui/pt/panel_group_voting.xml
	linden/indra/newview/skins/default/xui/pt/panel_login.xml
	linden/indra/newview/skins/default/xui/pt/panel_overlaybar.xml
	linden/indra/newview/skins/default/xui/pt/panel_place.xml
	linden/indra/newview/skins/default/xui/pt/panel_place_small.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_input.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_network.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml
	linden/indra/newview/skins/default/xui/pt/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
	linden/indra/newview/skins/default/xui/pt/panel_region_debug.xml
	linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml
	linden/indra/newview/skins/default/xui/pt/panel_region_general.xml
	linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml
	linden/indra/newview/skins/default/xui/pt/panel_toolbar.xml
	linden/indra/newview/skins/default/xui/pt/teleport_strings.xml
	linden/indra/newview/skins/default/xui/zh/floater_account_history.xml
	linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
	linden/indra/newview/skins/default/xui/zh/floater_html.xml
	linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
	linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
	linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
	linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
	linden/indra/newview/skins/default/xui/zh/floater_settings_debug.xml
	linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml
	linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml
	linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
	linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
	linden/indra/newview/skins/default/xui/zh/menu_pie_self.xml
	linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
	linden/indra/newview/skins/default/xui/zh/need_to_translate.xml
	linden/indra/newview/skins/default/xui/zh/panel_account_details.xml
	linden/indra/newview/skins/default/xui/zh/panel_account_planning.xml
	linden/indra/newview/skins/default/xui/zh/panel_account_transactions.xml
	linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
	linden/indra/newview/skins/default/xui/zh/panel_group.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_finder.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_invite.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_notices.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_roles.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_voting.xml
	linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
	linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
	linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
	linden/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
	linden/indra/newview/skins/default/xui/zh/strings.xml
	linden/indra/newview/skins/default/xui/zh/strings_long.xml
	linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
	linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/win_updater/updater.cpp
	linden/install.xml

1 files changed, 154 insertions, 141 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index b2bfccf..4ab5d8d 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
- * Copyright (c) 2007-2008, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -192,35 +192,22 @@
 
 //----------------------------------------------------------------------------
 // viewer.cpp - these are only used in viewer, should be easily moved.
-extern void disable_win_error_reporting();
 
 #if LL_DARWIN
-#include <Carbon/Carbon.h>
 extern void init_apple_menu(const char* product);
-extern OSErr AEGURLHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
-extern OSErr AEQuitHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
-extern OSStatus simpleDialogHandler(EventHandlerCallRef handler, EventRef event, void *userdata);
-#include <boost/tokenizer.hpp>
 #endif // LL_DARWIN
 
-
 extern BOOL gRandomizeFramerate;
 extern BOOL gPeriodicSlowFrame;
 extern BOOL gDebugGL;
 
 ////////////////////////////////////////////////////////////
 // All from the last globals push...
-BOOL gHandleKeysAsync = FALSE;
-
 const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user flagged as Away From Keyboard
 
 F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
 F32 gSimFrames;
 
-std::string gDisabledMessage; // Set in LLAppViewer::initConfiguration used in idle_startup
-
-BOOL gHideLinks = FALSE; // Set in LLAppViewer::initConfiguration, used externally
-
 BOOL gAllowIdleAFK = TRUE;
 BOOL gAllowTapTapHoldRun = TRUE;
 BOOL gShowObjectUpdates = FALSE;
@@ -246,7 +233,7 @@ F32 gFPSClamped = 10.f;						// Pretend we start at target rate.
 F32 gFrameDTClamped = 0.f;                                      // Time between adjacent checks to network for packets
 U64     gStartTime = 0; // gStartTime is "private", used only to calculate gFrameTimeSeconds
 U32 gFrameStalls = 0;
-const F64 FRAME_STALL_THRESHOLD = 5.0;
+const F64 FRAME_STALL_THRESHOLD = 1.0;
 
 LLTimer gRenderStartTime;
 LLFrameTimer gForegroundTime;
@@ -316,6 +303,7 @@ std::string gLoginPage;
 std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
 
+LLAppViewer::LLUpdaterInfo *LLAppViewer::sUpdaterInfo = NULL ;
 
 void idle_afk_check()
 {
@@ -331,8 +319,7 @@ static void ui_audio_callback(const LLUUID& uuid)
 {
         if (gAudiop)
         {
-                F32 volume = gSavedSettings.getBOOL("MuteUI") ? 0.f : gSavedSettings.getF32("AudioLevelUI");
-                gAudiop->triggerSound(uuid, gAgent.getID(), volume);
+                gAudiop->triggerSound(uuid, gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI);
         }
 }
 
@@ -419,7 +406,6 @@ static void settings_to_globals()
         gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
         gMapScale = gSavedSettings.getF32("MapScale");
         gMiniMapScale = gSavedSettings.getF32("MiniMapScale");
-        gHandleKeysAsync = gSavedSettings.getBOOL("AsyncKeyboard");
         LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
 
         LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
@@ -498,30 +484,17 @@ void LLAppViewer::initGridChoice()
         }
 }
 
-bool send_url_to_other_instance(const std::string& url)
+//virtual
+bool LLAppViewer::initSLURLHandler()
 {
-#if LL_WINDOWS
-        wchar_t window_class[256]; /* Flawfinder: ignore */   // Assume max length < 255 chars.
-        mbstowcs(window_class, sWindowClass, 255);
-        window_class[255] = 0;
-        // Use the class instead of the window name.
-        HWND other_window = FindWindow(window_class, NULL);
-
-        if (other_window != NULL)
-        {
-                lldebugs << "Found other window with the name '" << gWindowTitle << "'" << llendl;
-                COPYDATASTRUCT cds;
-                const S32 SLURL_MESSAGE_TYPE = 0;
-                cds.dwData = SLURL_MESSAGE_TYPE;
-                cds.cbData = url.length() + 1;
-                cds.lpData = (void*)url.c_str();
-
-                LRESULT msg_result = SendMessage(other_window, WM_COPYDATA, NULL, (LPARAM)&cds);
-                lldebugs << "SendMessage(WM_COPYDATA) to other window '" 
-                                 << gWindowTitle << "' returned " << msg_result << llendl;
-                return true;
-        }
-#endif
+        // does nothing unless subclassed
+        return false;
+}
+
+//virtual
+bool LLAppViewer::sendURLToOtherInstance(const std::string& url)
+{
+        // does nothing unless subclassed
         return false;
 }
 
@@ -690,6 +663,7 @@ bool LLAppViewer::init()
                                         ui_audio_callback,
                                         &LLUI::sGLScaleFactor);
         LLWeb::initClass();                       // do this after LLUI
+
         LLTextEditor::setURLCallbacks(&LLWeb::loadURL,
                                 &LLURLDispatcher::dispatchFromTextEditor,
                                 &LLURLDispatcher::dispatchFromTextEditor);
@@ -710,7 +684,6 @@ bool LLAppViewer::init()
         // load MIME type -> media impl mappings
         LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") ); 
 
-
         // Copy settings to globals. *TODO: Remove or move to appropriage class initializers
         settings_to_globals();
         // Setup settings listeners
@@ -721,6 +694,9 @@ bool LLAppViewer::init()
         // Find partition serial number (Windows) or hardware serial (Mac)
         mSerialNumber = generateSerialNumber();
 
+        // do any necessary set-up for accepting incoming SLURLs from apps
+        initSLURLHandler();
+
         if(false == initHardwareTest())
         {
                 // Early out from user choice.
@@ -851,7 +827,10 @@ bool LLAppViewer::init()
                 }
 
         }
-        
+
+        // save the graphics card
+        gDebugInfo["GraphicsCard"] = LLFeatureManager::getInstance()->getGPUString();
+
         // Save the current version to the prefs file
         gSavedSettings.setString("LastRunVersion", gCurrentVersion);
 
@@ -896,16 +875,21 @@ bool LLAppViewer::mainLoop()
                 {
                         LLFastTimer t(LLFastTimer::FTM_FRAME);
                         
+                        pingMainloopTimeout("Main:MiscNativeWindowEvents");
+                        
+                        {
+                                LLFastTimer t2(LLFastTimer::FTM_MESSAGES);
+                                gViewerWindow->mWindow->processMiscNativeEvents();
+                        }
+                        
                         pingMainloopTimeout("Main:GatherInput");
                         
                         {
                                 LLFastTimer t2(LLFastTimer::FTM_MESSAGES);
-                        #if LL_WINDOWS
-                                if (!LLWinDebug::checkExceptionHandler())
+                                if (!restoreErrorTrap())
                                 {
-                                        llwarns << " Someone took over my exception handler (post messagehandling)!" << llendl;
+                                        llwarns << " Someone took over my signal/exception handler (post messagehandling)!" << llendl;
                                 }
-                        #endif
 
                                 gViewerWindow->mWindow->gatherInput();
                         }
@@ -961,7 +945,7 @@ bool LLAppViewer::mainLoop()
                                         
                                         resumeMainloopTimeout();
                                 }
-
+ 
                                 if (gDoDisconnect && (LLStartUp::getStartupState() == STATE_STARTED))
                                 {
                                         pauseMainloopTimeout();
@@ -1183,17 +1167,24 @@ bool LLAppViewer::cleanup()
         
         llinfos << "Global stuff deleted" << llendflush;
 
-#if (!defined(LL_FMOD)) || (!LL_RELEASE_FOR_DOWNLOAD)
-        // OpenAL likes to crash on exit if we *don't* explicitly shut it down.
         if (gAudiop)
         {
-                gAudiop->shutdown();
+                bool want_longname = false;
+                if (gAudiop->getDriverName(want_longname) == "FMOD")
+                {
+                        // This hack exists because fmod likes to occasionally
+                        // hang forever when shutting down, for no apparent
+                        // reason.
+                        llwarns << "Hack, skipping FMOD audio engine cleanup" << llendflush;
+                }
+                else
+                {
+                        gAudiop->shutdown();
+                }
+
+                delete gAudiop;
+                gAudiop = NULL;
         }
-#else
-        // This hack exists because fmod likes to occasionally hang forever
-        // when shutting down for no apparent reason.
-        llwarns << "Hack, skipping audio engine cleanup" << llendflush;
-#endif
 
         // Note: this is where LLFeatureManager::getInstance()-> used to be deleted.
 
@@ -1204,9 +1195,6 @@ bool LLAppViewer::cleanup()
         cleanupSavedSettings();
         llinfos << "Settings patched up" << llendflush;
 
-        delete gAudiop;
-        gAudiop = NULL;
-
         // delete some of the files left around in the cache.
         removeCacheFiles("*.wav");
         removeCacheFiles("*.tmp");
@@ -1375,12 +1363,15 @@ bool LLAppViewer::cleanup()
         delete sImageDecodeThread;
     sImageDecodeThread = NULL;
 
+        //Note:
+        //LLViewerMedia::cleanupClass() has to be put before gImageList.shutdown()
+        //because some new image might be generated during cleaning up media. --bao
+        LLViewerMedia::cleanupClass();
         gImageList.shutdown(); // shutdown again in case a callback added something
         LLUIImageList::getInstance()->cleanUp();
         
         // This should eventually be done in LLAppViewer
-        LLImageJ2C::closeDSO();
-        LLImageFormatted::cleanupClass();
+        LLImage::cleanupClass();
         LLVFSThread::cleanupClass();
         LLLFSThread::cleanupClass();
 
@@ -1401,14 +1392,17 @@ bool LLAppViewer::cleanup()
         LLWatchdog::getInstance()->cleanup();
 
         end_messaging_system();
+        llinfos << "Message system deleted." << llendflush;
 
         // *NOTE:Mani - The following call is not thread safe. 
         LLCurl::cleanupClass();
+        llinfos << "LLCurl cleaned up." << llendflush;
 
         // If we're exiting to launch an URL, do that here so the screen
         // is at the right resolution before we launch IE.
         if (!gLaunchFileOnQuit.empty())
         {
+                llinfos << "Launch file on quit." << llendflush;
 #if LL_WINDOWS
                 // Indicate an application is starting.
                 SetCursor(LoadCursor(NULL, IDC_WAIT));
@@ -1418,9 +1412,8 @@ bool LLAppViewer::cleanup()
                 ms_sleep(1000);
 
                 LLWeb::loadURLExternal( gLaunchFileOnQuit );
+                llinfos << "File launched." << llendflush;
         }
-        
-        LLViewerMedia::cleanupClass();
 
     llinfos << "Goodbye" << llendflush;
 
@@ -1428,6 +1421,25 @@ bool LLAppViewer::cleanup()
         return true;
 }
 
+// A callback for llerrs to call during the watchdog error.
+void watchdog_llerrs_callback(const std::string &error_string)
+{
+        gLLErrorActivated = true;
+
+#ifdef LL_WINDOWS
+        RaiseException(0,0,0,0);
+#else
+        raise(SIGQUIT);
+#endif
+}
+
+// A callback for the watchdog to call.
+void watchdog_killer_callback()
+{
+        LLError::setFatalFunction(watchdog_llerrs_callback);
+        llerrs << "Watchdog killer event" << llendl;
+}
+
 bool LLAppViewer::initThreads()
 {
 #if MEM_TRACK_MEM
@@ -1437,10 +1449,11 @@ bool LLAppViewer::initThreads()
 #endif
 
         const S32 NEVER_SUBMIT_REPORT = 2;
-        if(TRUE == gSavedSettings.getBOOL("WatchdogEnabled") 
-                && (gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) != NEVER_SUBMIT_REPORT))
+        bool use_watchdog = gSavedSettings.getBOOL("WatchdogEnabled");
+        bool send_reports = gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) != NEVER_SUBMIT_REPORT;
+        if(use_watchdog && send_reports)
         {
-                LLWatchdog::getInstance()->init();
+                LLWatchdog::getInstance()->init(watchdog_killer_callback);
         }
 
         LLVFSThread::initClass(enable_threads && true);
@@ -1450,8 +1463,7 @@ bool LLAppViewer::initThreads()
         LLAppViewer::sImageDecodeThread = new LLWorkerThread("ImageDecode", enable_threads && true);
         LLAppViewer::sTextureCache = new LLTextureCache(enable_threads && true);
         LLAppViewer::sTextureFetch = new LLTextureFetch(LLAppViewer::getTextureCache(), enable_threads && false);
-        LLImageWorker::initClass(LLAppViewer::getImageDecodeThread());
-        LLImageJ2C::openDSO();
+        LLImage::initClass(LLAppViewer::getImageDecodeThread());
 
         // *FIX: no error handling here!
         return true;
@@ -1883,22 +1895,6 @@ bool LLAppViewer::initConfiguration()
         //              llerrs << "Failed to parse skin definition." << llendl;
         //      }
 
-        //      LLXmlTreeNode* rootp = skin_def_tree.getRoot();
-        //      LLXmlTreeNode* disabled_message_node = rootp->getChildByName("disabled_message");       
-        //      if (disabled_message_node)
-        //      {
-        //              gDisabledMessage = disabled_message_node->getContents();
-        //      }
-
-        //      static LLStdStringHandle hide_links_string = LLXmlTree::addAttributeString("hide_links");
-        //      rootp->getFastAttributeBOOL(hide_links_string, gHideLinks);
-
-        //      // Legacy string.  This flag really meant we didn't want to expose references to "Second Life".
-        //      // Just set gHideLinks instead.
-        //      static LLStdStringHandle silent_string = LLXmlTree::addAttributeString("silent_update");
-        //      BOOL silent_update;
-        //      rootp->getFastAttributeBOOL(silent_string, silent_update);
-        //      gHideLinks = (gHideLinks || silent_update);
         //}
 
 #if LL_DARWIN
@@ -1951,7 +1947,7 @@ bool LLAppViewer::initConfiguration()
 #endif
         LLStringUtil::truncate(gWindowTitle, 255);
 
-        //RN: if we received a URL, hand it off to the existing instance
+        //RN: if we received a URL, hand it off to the existing instance.
         // don't call anotherInstanceRunning() when doing URL handoff, as
         // it relies on checking a marker file which will not work when running
         // out of different directories
@@ -1966,7 +1962,7 @@ bool LLAppViewer::initConfiguration()
         }
         if (!slurl.empty())
         {
-                if (send_url_to_other_instance(slurl))
+                if (sendURLToOtherInstance(slurl))
                 {
                         // successfully handed off URL to existing instance, exit
                         return false;
@@ -1997,7 +1993,7 @@ bool LLAppViewer::initConfiguration()
                 }
 
                 initMarkerFile();
-
+                
 #if LL_SEND_CRASH_REPORTS
                 if (gLastExecEvent == LAST_EXEC_FROZE)
                 {
@@ -2019,52 +2015,8 @@ bool LLAppViewer::initConfiguration()
                         {
                                 llinfos << "Sending crash report." << llendl;
 
-#if LL_WINDOWS
-                                std::string exe_path = gDirUtilp->getAppRODataDir();
-                                exe_path += gDirUtilp->getDirDelimiter();
-                                exe_path += "win_crash_logger.exe";
-
-                                std::string arg_string = "-previous ";
-                                // Spawn crash logger.
-                                // NEEDS to wait until completion, otherwise log files will get smashed.
-                                _spawnl(_P_WAIT, exe_path.c_str(), exe_path.c_str(), arg_string.c_str(), NULL);
-#elif LL_DARWIN
-                                std::string command_str;
-                                command_str = "mac-crash-logger.app/Contents/MacOS/mac-crash-logger ";
-                                command_str += "-previous";
-                                // XXX -- We need to exit fullscreen mode for this to work.
-                                // XXX -- system() also doesn't wait for completion.  Hmm...
-                                system(command_str.c_str());            /* Flawfinder: Ignore */
-#elif LL_LINUX || LL_SOLARIS
-                                std::string cmd =gDirUtilp->getAppRODataDir();
-                                cmd += gDirUtilp->getDirDelimiter();
-#if LL_LINUX
-                                cmd += "linux-crash-logger.bin";
-#else // LL_SOLARIS
-                                cmd += "bin/solaris-crash-logger";
-#endif // LL_LINUX
-                                char* const cmdargv[] =
-                                        {(char*)cmd.c_str(),
-                                         (char*)"-previous",
-                                         NULL};
-                                fflush(NULL); // flush all buffers before the child inherits them
-                                pid_t pid = fork();
-                                if (pid == 0)
-                                { // child
-                                        execv(cmd.c_str(), cmdargv);            /* Flawfinder: Ignore */
-                                        llwarns << "execv failure when trying to start " << cmd << llendl;
-                                        _exit(1); // avoid atexit()
-                                } else {
-                                        if (pid > 0)
-                                        {
-                                                // wait for child proc to die
-                                                int childExitStatus;
-                                                waitpid(pid, &childExitStatus, 0);
-                                        } else {
-                                                llwarns << "fork failure." << llendl;
-                                        }
-                                }
-#endif
+                                bool report_freeze = true;
+                                handleCrashReporting(report_freeze);
                         }
                         else
                         {
@@ -2229,7 +2181,6 @@ void LLAppViewer::cleanupSavedSettings()
 
         gSavedSettings.setF32("MapScale", gMapScale );
         gSavedSettings.setF32("MiniMapScale", gMiniMapScale );
-        gSavedSettings.setBOOL("AsyncKeyboard", gHandleKeysAsync);
         gSavedSettings.setBOOL("ShowHoverTips", LLHoverView::sShowHoverTips);
 
         // Some things are cached in LLAgent.
@@ -2271,7 +2222,7 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["RAMInfo"]["Physical"] = (LLSD::Integer)(gSysMemory.getPhysicalMemoryKB());
         gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer)(gMemoryAllocated>>10); // MB -> KB
         gDebugInfo["OSInfo"] = getOSInfo().getOSStringSimple();
-                
+
         // The user is not logged on yet, but record the current grid choice login url
         // which may have been the intended grid. This can b
         gDebugInfo["GridName"] = LLViewerLogin::getInstance()->getGridLabel();
@@ -2282,6 +2233,13 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["MainloopThreadID"] = (S32)thread_id;
 #endif
 
+        // "CrashNotHandled" is set here, while things are running well,
+        // in case of a freeze. If there is a freeze, the crash logger will be launched
+        // and can read this value from the debug_info.log.
+        // If the crash is handled by LLAppViewer::handleViewerCrash, ie not a freeze,
+        // then the value of "CrashNotHandled" will be set to true.
+        gDebugInfo["CrashNotHandled"] = (LLSD::Boolean)true;
+        
         // Dump some debugging info
         LL_INFOS("SystemInfo") << gCurrentVersion << LL_ENDL;
 
@@ -2358,6 +2316,10 @@ void LLAppViewer::handleViewerCrash()
         gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
         gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
         gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
+        gDebugInfo["SessionLength"] = F32(LLFrameTimer::getElapsedSeconds());
+        gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
+        gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer) getCurrentRSS() >> 10;
+
         if(gLogoutInProgress)
         {
                 gDebugInfo["LastExecEvent"] = LAST_EXEC_LOGOUT_CRASH;
@@ -2383,6 +2345,9 @@ void LLAppViewer::handleViewerCrash()
                 gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
         }
         
+        // The crash is being handled here so set this value to false.
+        // Otherwise the crash logger will think this crash was a freeze.
+        gDebugInfo["CrashNotHandled"] = (LLSD::Boolean)false;
     
         //Write out the crash status file
         //Use marker file style setup, as that's the simplest, especially since
@@ -2466,24 +2431,23 @@ bool LLAppViewer::anotherInstanceRunning()
                 {
                         // Another instance is running. Skip the rest of these operations.
                         LL_INFOS("MarkerFile") << "Marker file is locked." << LL_ENDL;
-                        return TRUE;
+                        return true;
                 }
                 if (apr_file_lock(fMarker, APR_FLOCK_NONBLOCK | APR_FLOCK_EXCLUSIVE) != APR_SUCCESS) //flock(fileno(fMarker), LOCK_EX | LOCK_NB) == -1)
                 {
                         apr_file_close(fMarker);
                         LL_INFOS("MarkerFile") << "Marker file is locked." << LL_ENDL;
-                        return TRUE;
+                        return true;
                 }
                 // No other instances; we'll lock this file now & delete on quit.
                 apr_file_close(fMarker);
         }
         LL_DEBUGS("MarkerFile") << "Marker file isn't locked." << LL_ENDL;
-        return FALSE;
+        return false;
 }
 
 void LLAppViewer::initMarkerFile()
 {
-
         //First, check for the existence of other files.
         //There are marker files for two different types of crashes
         
@@ -2738,7 +2702,7 @@ bool LLAppViewer::initCache()
         
         // Init the texture cache
         // Allocate 80% of the cache size for textures
-        BOOL read_only = mSecondInstance ? true : false;
+        BOOL read_only = mSecondInstance ? TRUE : FALSE;
         const S32 MB = 1024*1024;
         S64 cache_size = (S64)(gSavedSettings.getU32("CacheSize")) * MB;
         const S64 MAX_CACHE_SIZE = 1024*MB;
@@ -3539,12 +3503,12 @@ void LLAppViewer::sendLogoutRequest()
                 if (mLogoutMarkerFile)
                 {
                         llinfos << "Created logout marker file " << mLogoutMarkerFileName << llendl;
+                apr_file_close(mLogoutMarkerFile);
                 }
                 else
                 {
                         llwarns << "Cannot create logout marker file " << mLogoutMarkerFileName << llendl;
                 }
-                apr_file_close(mLogoutMarkerFile);
         }
 }
 
@@ -3765,6 +3729,11 @@ void LLAppViewer::forceErrorSoftwareException()
     throw; 
 }
 
+void LLAppViewer::forceErrorDriverCrash()
+{
+        glDeleteTextures(1, NULL);
+}
+
 void LLAppViewer::initMainloopTimeout(const std::string& state, F32 secs)
 {
         if(!mMainloopTimeout)
@@ -3807,6 +3776,11 @@ void LLAppViewer::pauseMainloopTimeout()
 
 void LLAppViewer::pingMainloopTimeout(const std::string& state, F32 secs)
 {
+//      if(!restoreErrorTrap())
+//      {
+//              llwarns << "!!!!!!!!!!!!! Its an error trap!!!!" << state << llendl;
+//      }
+        
         if(mMainloopTimeout)
         {
                 if(secs < 0.0f)
@@ -3819,3 +3793,42 @@ void LLAppViewer::pingMainloopTimeout(const std::string& state, F32 secs)
         }
 }
 
+void LLAppViewer::handleLoginComplete()
+{
+        initMainloopTimeout("Mainloop Init");
+
+        // Store some data to DebugInfo in case of a freeze.
+        gDebugInfo["ClientInfo"]["Name"] = gSavedSettings.getString("VersionChannelName");
+
+        gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
+        gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
+        gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
+        gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD;
+
+        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+        if ( parcel && parcel->getMusicURL()[0])
+        {
+                gDebugInfo["ParcelMusicURL"] = parcel->getMusicURL();
+        }       
+        if ( parcel && parcel->getMediaURL()[0])
+        {
+                gDebugInfo["ParcelMediaURL"] = parcel->getMediaURL();
+        }
+        
+        gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
+        gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
+        gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
+        gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
+
+        if(gAgent.getRegion())
+        {
+                gDebugInfo["CurrentSimHost"] = gAgent.getRegionHost().getHostName();
+                gDebugInfo["CurrentRegion"] = gAgent.getRegion()->getName();
+        }
+
+        if(LLAppViewer::instance()->mMainloopTimeout)
+        {
+                gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
+        }
+        writeDebugInfo();
+}