Merged SL 1.23.4 into Imprudence.

Conflicts: linden/doc/contributions.txt linden/indra/CMakeLists.txt linden/indra/cmake/APR.cmake linden/indra/cmake/CopyWinLibs.cmake linden/indra/cmake/OPENAL.cmake linden/indra/develop.py linden/indra/llaudio/audioengine.cpp linden/indra/llcommon/indra_constants.h linden/indra/llcommon/llversionviewer.h linden/indra/llcrashlogger/llcrashlogger.cpp linden/indra/llmedia/llmediaimplgstreamer.cpp linden/indra/llmedia/llmediaimplgstreamer.h linden/indra/llmedia/llmediaimplgstreamer_syms.cpp linden/indra/llmedia/llmediaimplgstreamer_syms.h linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc linden/indra/llmedia/llmediamanager.cpp linden/indra/llmessage/llassetstorage.cpp linden/indra/llui/lltexteditor.cpp linden/indra/llvfs/lldir.cpp linden/indra/newview/CMakeLists.txt linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/app_settings/logcontrol.xml linden/indra/newview/app_settings/settings.xml linden/indra/newview/installers/windows/installer_template.nsi linden/indra/newview/llagent.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llcallingcard.cpp linden/indra/newview/llfilepicker.cpp linden/indra/newview/llfloateractivespeakers.cpp linden/indra/newview/llfloateravatarpicker.cpp linden/indra/newview/llfloaterbulkpermission.cpp linden/indra/newview/llfloaterbulkpermission.h linden/indra/newview/llfloaterchat.cpp linden/indra/newview/llfloatergodtools.cpp linden/indra/newview/llfloaterhtmlhelp.cpp linden/indra/newview/llfloatertools.cpp linden/indra/newview/llfloatertools.h linden/indra/newview/llfloatertopobjects.cpp linden/indra/newview/llinventorybridge.cpp linden/indra/newview/llinventoryview.cpp linden/indra/newview/llnetmap.cpp linden/indra/newview/llnetmap.h linden/indra/newview/llpanelland.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/llpanelobject.cpp linden/indra/newview/llprefsim.cpp linden/indra/newview/lltexturecache.cpp linden/indra/newview/lltoolbrush.cpp linden/indra/newview/llvieweraudio.cpp linden/indra/newview/llviewermenu.cpp linden/indra/newview/llviewermessage.cpp linden/indra/newview/llviewerparcelmedia.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/llwebbrowserctrl.cpp linden/indra/newview/llworldmapview.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/colors_base.xml linden/indra/newview/skins/default/xui/de/floater_active_speakers.xml linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml linden/indra/newview/skins/default/xui/de/floater_joystick.xml linden/indra/newview/skins/default/xui/de/floater_mute_object.xml linden/indra/newview/skins/default/xui/de/floater_sim_release_message.xml linden/indra/newview/skins/default/xui/de/panel_media_controls.xml linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/de/strings.xml linden/indra/newview/skins/default/xui/de/teleport_strings.xml linden/indra/newview/skins/default/xui/en-us/alerts.xml linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml linden/indra/newview/skins/default/xui/en-us/floater_chatterbox.xml linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml linden/indra/newview/skins/default/xui/en-us/floater_tools.xml linden/indra/newview/skins/default/xui/en-us/menu_login.xml linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml linden/indra/newview/skins/default/xui/en-us/notify.xml linden/indra/newview/skins/default/xui/en-us/panel_bars.xml linden/indra/newview/skins/default/xui/en-us/panel_groups.xml linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.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/strings.xml linden/indra/newview/skins/default/xui/es/alerts.xml linden/indra/newview/skins/default/xui/es/floater_about.xml linden/indra/newview/skins/default/xui/es/floater_about_land.xml linden/indra/newview/skins/default/xui/es/floater_animation_preview.xml linden/indra/newview/skins/default/xui/es/floater_auction.xml linden/indra/newview/skins/default/xui/es/floater_avatar_picker.xml linden/indra/newview/skins/default/xui/es/floater_avatar_textures.xml linden/indra/newview/skins/default/xui/es/floater_build_options.xml linden/indra/newview/skins/default/xui/es/floater_bumps.xml linden/indra/newview/skins/default/xui/es/floater_buy_contents.xml linden/indra/newview/skins/default/xui/es/floater_buy_currency.xml linden/indra/newview/skins/default/xui/es/floater_buy_land.xml linden/indra/newview/skins/default/xui/es/floater_buy_object.xml linden/indra/newview/skins/default/xui/es/floater_chat_history.xml linden/indra/newview/skins/default/xui/es/floater_choose_group.xml linden/indra/newview/skins/default/xui/es/floater_clothing.xml linden/indra/newview/skins/default/xui/es/floater_color_picker.xml linden/indra/newview/skins/default/xui/es/floater_critical.xml linden/indra/newview/skins/default/xui/es/floater_customize.xml linden/indra/newview/skins/default/xui/es/floater_directory.xml linden/indra/newview/skins/default/xui/es/floater_gesture.xml linden/indra/newview/skins/default/xui/es/floater_group_info.xml linden/indra/newview/skins/default/xui/es/floater_html.xml linden/indra/newview/skins/default/xui/es/floater_im.xml linden/indra/newview/skins/default/xui/es/floater_image_preview.xml linden/indra/newview/skins/default/xui/es/floater_import.xml linden/indra/newview/skins/default/xui/es/floater_instant_message.xml linden/indra/newview/skins/default/xui/es/floater_inventory.xml linden/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml linden/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml linden/indra/newview/skins/default/xui/es/floater_land_holdings.xml linden/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml linden/indra/newview/skins/default/xui/es/floater_moveview.xml linden/indra/newview/skins/default/xui/es/floater_mute.xml linden/indra/newview/skins/default/xui/es/floater_name_description.xml linden/indra/newview/skins/default/xui/es/floater_new_im.xml linden/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml linden/indra/newview/skins/default/xui/es/floater_openobject.xml linden/indra/newview/skins/default/xui/es/floater_pay.xml linden/indra/newview/skins/default/xui/es/floater_pay_object.xml linden/indra/newview/skins/default/xui/es/floater_postcard.xml linden/indra/newview/skins/default/xui/es/floater_preferences.xml linden/indra/newview/skins/default/xui/es/floater_preview_animation.xml linden/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml linden/indra/newview/skins/default/xui/es/floater_preview_gesture.xml linden/indra/newview/skins/default/xui/es/floater_preview_notecard.xml linden/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml linden/indra/newview/skins/default/xui/es/floater_preview_sound.xml linden/indra/newview/skins/default/xui/es/floater_preview_texture.xml linden/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml linden/indra/newview/skins/default/xui/es/floater_price_for_listing.xml linden/indra/newview/skins/default/xui/es/floater_profile.xml linden/indra/newview/skins/default/xui/es/floater_report_abuse.xml linden/indra/newview/skins/default/xui/es/floater_script_debug.xml linden/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml linden/indra/newview/skins/default/xui/es/floater_script_preview.xml linden/indra/newview/skins/default/xui/es/floater_script_queue.xml linden/indra/newview/skins/default/xui/es/floater_script_search.xml linden/indra/newview/skins/default/xui/es/floater_sell_land.xml linden/indra/newview/skins/default/xui/es/floater_settings_debug.xml linden/indra/newview/skins/default/xui/es/floater_snapshot.xml linden/indra/newview/skins/default/xui/es/floater_sound_preview.xml linden/indra/newview/skins/default/xui/es/floater_telehub.xml linden/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml linden/indra/newview/skins/default/xui/es/floater_tools.xml linden/indra/newview/skins/default/xui/es/floater_top_objects.xml linden/indra/newview/skins/default/xui/es/floater_tos.xml linden/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml linden/indra/newview/skins/default/xui/es/floater_world_map.xml linden/indra/newview/skins/default/xui/es/menu_inventory.xml linden/indra/newview/skins/default/xui/es/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/es/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/es/menu_pie_land.xml linden/indra/newview/skins/default/xui/es/menu_pie_object.xml linden/indra/newview/skins/default/xui/es/menu_pie_self.xml linden/indra/newview/skins/default/xui/es/menu_viewer.xml linden/indra/newview/skins/default/xui/es/notify.xml linden/indra/newview/skins/default/xui/es/panel_avatar.xml linden/indra/newview/skins/default/xui/es/panel_avatar_classified.xml linden/indra/newview/skins/default/xui/es/panel_avatar_pick.xml linden/indra/newview/skins/default/xui/es/panel_chat_bar.xml linden/indra/newview/skins/default/xui/es/panel_classified.xml linden/indra/newview/skins/default/xui/es/panel_event.xml linden/indra/newview/skins/default/xui/es/panel_group.xml linden/indra/newview/skins/default/xui/es/panel_group_finder.xml linden/indra/newview/skins/default/xui/es/panel_group_general.xml linden/indra/newview/skins/default/xui/es/panel_group_invite.xml linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml linden/indra/newview/skins/default/xui/es/panel_group_notices.xml linden/indra/newview/skins/default/xui/es/panel_group_roles.xml linden/indra/newview/skins/default/xui/es/panel_group_voting.xml linden/indra/newview/skins/default/xui/es/panel_land_covenant.xml linden/indra/newview/skins/default/xui/es/panel_login.xml linden/indra/newview/skins/default/xui/es/panel_overlaybar.xml linden/indra/newview/skins/default/xui/es/panel_place.xml linden/indra/newview/skins/default/xui/es/panel_place_small.xml linden/indra/newview/skins/default/xui/es/panel_preferences_audio.xml linden/indra/newview/skins/default/xui/es/panel_preferences_chat.xml linden/indra/newview/skins/default/xui/es/panel_preferences_general.xml linden/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/es/panel_preferences_im.xml linden/indra/newview/skins/default/xui/es/panel_preferences_input.xml linden/indra/newview/skins/default/xui/es/panel_preferences_network.xml linden/indra/newview/skins/default/xui/es/panel_preferences_popups.xml linden/indra/newview/skins/default/xui/es/panel_region_covenant.xml linden/indra/newview/skins/default/xui/es/panel_region_debug.xml linden/indra/newview/skins/default/xui/es/panel_region_estate.xml linden/indra/newview/skins/default/xui/es/panel_region_general.xml linden/indra/newview/skins/default/xui/es/panel_region_terrain.xml linden/indra/newview/skins/default/xui/es/panel_region_texture.xml linden/indra/newview/skins/default/xui/es/panel_scrolling_param.xml linden/indra/newview/skins/default/xui/es/panel_status_bar.xml linden/indra/newview/skins/default/xui/es/panel_toolbar.xml linden/indra/newview/skins/default/xui/es/panel_top_pick.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_avatar_picker.xml linden/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml linden/indra/newview/skins/default/xui/fr/floater_beacons.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_chat_history.xml linden/indra/newview/skins/default/xui/fr/floater_clothing.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_god_tools.xml linden/indra/newview/skins/default/xui/fr/floater_group_info.xml linden/indra/newview/skins/default/xui/fr/floater_html.xml linden/indra/newview/skins/default/xui/fr/floater_im.xml linden/indra/newview/skins/default/xui/fr/floater_instant_message.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_view_finder.xml linden/indra/newview/skins/default/xui/fr/floater_joystick.xml linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml linden/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml linden/indra/newview/skins/default/xui/fr/floater_media_browser.xml linden/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml linden/indra/newview/skins/default/xui/fr/floater_name_description.xml linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml linden/indra/newview/skins/default/xui/fr/floater_profile.xml linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml linden/indra/newview/skins/default/xui/fr/floater_script_search.xml linden/indra/newview/skins/default/xui/fr/floater_sell_land.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_tools.xml linden/indra/newview/skins/default/xui/fr/floater_top_objects.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_login.xml linden/indra/newview/skins/default/xui/fr/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/fr/menu_pie_object.xml linden/indra/newview/skins/default/xui/fr/menu_viewer.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_avatar.xml linden/indra/newview/skins/default/xui/fr/panel_avatar_classified.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_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_roles.xml linden/indra/newview/skins/default/xui/fr/panel_login.xml linden/indra/newview/skins/default/xui/fr/panel_media_controls.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_general.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_voice.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_general.xml linden/indra/newview/skins/default/xui/fr/panel_voice_controls.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/fr/teleport_strings.xml linden/indra/newview/skins/default/xui/ja/floater_active_speakers.xml linden/indra/newview/skins/default/xui/ja/floater_html.xml linden/indra/newview/skins/default/xui/ja/floater_instant_message_ad_hoc.xml linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml linden/indra/newview/skins/default/xui/ja/floater_joystick.xml linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml linden/indra/newview/skins/default/xui/ja/floater_windlight_options.xml linden/indra/newview/skins/default/xui/ja/menu_login.xml linden/indra/newview/skins/default/xui/ja/panel_friends.xml linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml linden/indra/newview/skins/default/xui/ja/panel_media_remote_expanded.xml linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/ja/panel_speaker_controls.xml linden/indra/newview/skins/default/xui/ja/strings.xml linden/indra/newview/skins/default/xui/ja/teleport_strings.xml linden/indra/newview/skins/default/xui/ko/panel_media_controls.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_active_speakers.xml linden/indra/newview/skins/default/xui/pt/floater_animation_preview.xml linden/indra/newview/skins/default/xui/pt/floater_auction.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_beacons.xml linden/indra/newview/skins/default/xui/pt/floater_build_options.xml linden/indra/newview/skins/default/xui/pt/floater_bumps.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_clothing.xml linden/indra/newview/skins/default/xui/pt/floater_color_picker.xml linden/indra/newview/skins/default/xui/pt/floater_critical.xml linden/indra/newview/skins/default/xui/pt/floater_customize.xml linden/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml linden/indra/newview/skins/default/xui/pt/floater_directory.xml linden/indra/newview/skins/default/xui/pt/floater_env_settings.xml linden/indra/newview/skins/default/xui/pt/floater_gesture.xml linden/indra/newview/skins/default/xui/pt/floater_god_tools.xml linden/indra/newview/skins/default/xui/pt/floater_group_info.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_inspect.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_instant_message_group.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_inventory_view_finder.xml linden/indra/newview/skins/default/xui/pt/floater_joystick.xml linden/indra/newview/skins/default/xui/pt/floater_lagmeter.xml linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml linden/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml linden/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml linden/indra/newview/skins/default/xui/pt/floater_media_browser.xml linden/indra/newview/skins/default/xui/pt/floater_moveview.xml linden/indra/newview/skins/default/xui/pt/floater_mute.xml linden/indra/newview/skins/default/xui/pt/floater_mute_object.xml linden/indra/newview/skins/default/xui/pt/floater_name_description.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_postcard.xml linden/indra/newview/skins/default/xui/pt/floater_preferences.xml linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml linden/indra/newview/skins/default/xui/pt/floater_preview_classified.xml linden/indra/newview/skins/default/xui/pt/floater_preview_event.xml linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml linden/indra/newview/skins/default/xui/pt/floater_preview_sound.xml linden/indra/newview/skins/default/xui/pt/floater_preview_url.xml linden/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml linden/indra/newview/skins/default/xui/pt/floater_profile.xml linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml linden/indra/newview/skins/default/xui/pt/floater_script_queue.xml linden/indra/newview/skins/default/xui/pt/floater_script_search.xml linden/indra/newview/skins/default/xui/pt/floater_sell_land.xml linden/indra/newview/skins/default/xui/pt/floater_settings_debug.xml linden/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml linden/indra/newview/skins/default/xui/pt/floater_snapshot.xml linden/indra/newview/skins/default/xui/pt/floater_sound_preview.xml linden/indra/newview/skins/default/xui/pt/floater_telehub.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_url_entry.xml linden/indra/newview/skins/default/xui/pt/floater_water.xml linden/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml linden/indra/newview/skins/default/xui/pt/floater_windlight_options.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_attachment.xml linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/pt/menu_pie_land.xml linden/indra/newview/skins/default/xui/pt/menu_pie_object.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_account_details.xml linden/indra/newview/skins/default/xui/pt/panel_account_planning.xml linden/indra/newview/skins/default/xui/pt/panel_account_transactions.xml linden/indra/newview/skins/default/xui/pt/panel_audio_device.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_avatar_pick.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_friends.xml linden/indra/newview/skins/default/xui/pt/panel_group.xml linden/indra/newview/skins/default/xui/pt/panel_group_finder.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_land_covenant.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_voice.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_region_terrain.xml linden/indra/newview/skins/default/xui/pt/panel_region_texture.xml linden/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml linden/indra/newview/skins/default/xui/pt/panel_speaker_controls.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/panel_top_pick.xml linden/indra/newview/skins/default/xui/pt/panel_voice_controls.xml linden/indra/newview/skins/default/xui/pt/panel_voice_enable.xml linden/indra/newview/skins/default/xui/pt/panel_voice_options.xml linden/indra/newview/skins/default/xui/pt/strings.xml linden/indra/newview/skins/default/xui/pt/teleport_strings.xml linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml linden/indra/newview/skins/default/xui/zh/floater_post_process.xml linden/indra/newview/skins/default/xui/zh/floater_settings_debug.xml linden/indra/newview/skins/default/xui/zh/floater_windlight_options.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_viewer.xml linden/indra/newview/skins/default/xui/zh/panel_avatar.xml linden/indra/newview/skins/default/xui/zh/panel_friends.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_preferences_audio.xml linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml linden/indra/newview/skins/default/xui/zh/panel_region_covenant.xml linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml linden/indra/newview/skins/default/xui/zh/strings.xml linden/indra/newview/skins/silver/colors_base.xml linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml linden/indra/newview/viewer_manifest.py linden/install.xml
author: Jacek Antonelli 2009-08-29 17:44:38 -0500
committer: Jacek Antonelli 2009-08-29 22:49:51 -0500
commit: 6a5aab98892df74f60743f5b789959c9593d6647 (patch)
tree: 62da18f8540879ed01e12eeb0ce49375474272e4 /linden/indra/newview/llappviewer.cpp
parent: Merge branch 'mac-openal-url' into next (diff)
parent: Converted 1.23 XUI files to unix line endings. (diff)
download: meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.zip
meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.gz
meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.bz2
meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.xz
1 files changed, 427 insertions, 289 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 4d53c88..58c1c2b 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -17,7 +17,8 @@
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
@@ -103,6 +104,7 @@
 #include "llviewermenu.h"
 #include "llselectmgr.h"
 #include "lltrans.h"
+#include "lluitrans.h"
 #include "lltracker.h"
 #include "llviewerparcelmgr.h"
 #include "llworldmapview.h"
@@ -158,19 +160,12 @@
 #include "llimview.h"
 #include "llviewerthrottle.h"
 #include "llparcel.h"
-// 
 #include "llinventoryview.h"
 #include "llcommandlineparser.h"
-// annoying detail to determine whether font prefs are over-ridden
-#if LL_LINUX
-# define LL_DYNAMIC_FONT_DISCOVERY 1
-#else
-# define LL_DYNAMIC_FONT_DISCOVERY 0
-#endif
 // *FIX: These extern globals should be cleaned up.
 // The globals either represent state/config/resource-storage of either 
 // this app, or another 'component' of the viewer. App globals should be 
@@ -287,6 +282,9 @@ const std::string LOGOUT_MARKER_FILE_NAME("Imprudence.logout_marker");
 static BOOL gDoDisconnect = FALSE;
 static std::string gLaunchFileOnQuit;
+// Used on Win32 for other apps to identify our window (eg, win_setup)
+const char* const VIEWER_WINDOW_CLASSNAME = "Imprudence";
 //----------------------------------------------------------------------------
 // File scope definitons
 const char *VFS_DATA_FILE_BASE = "data.db2.x.";
@@ -294,9 +292,6 @@ const char *VFS_INDEX_FILE_BASE = "index.db2.x.";
 static std::string gSecondLife;
 static std::string gWindowTitle;
-#ifdef LL_WINDOWS
-        static char sWindowClass[] = "Imprudence";
-#endif
 std::string gLoginPage;
 std::vector<std::string> gLoginURIs;
@@ -415,7 +410,7 @@ static void settings_modify()
        LLRenderTarget::sUseFBO                         = gSavedSettings.getBOOL("RenderUseFBO");
        LLVOAvatar::sUseImpostors                       = gSavedSettings.getBOOL("RenderUseImpostors");
        LLVOSurfacePatch::sLODFactor            = gSavedSettings.getF32("RenderTerrainLODFactor");
-        LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //sqaure lod factor to get exponential range of [1,4]
+        LLVOSurfacePatch::sLODFactor *= LLVOSurfacePatch::sLODFactor; //square lod factor to get exponential range of [1,4]
        gDebugGL = gSavedSettings.getBOOL("RenderDebugGL");
        gDebugPipeline = gSavedSettings.getBOOL("RenderDebugPipeline");
        
@@ -513,7 +508,7 @@ LLWorkerThread* LLAppViewer::sImageDecodeThread = NULL;
 LLTextureFetch* LLAppViewer::sTextureFetch = NULL; 
 LLAppViewer::LLAppViewer() : 
-        mMarkerFile(NULL),
+        mMarkerFile(),
        mReportedCrash(false),
        mNumSessions(0),
        mPurgeCache(false),
@@ -608,25 +603,6 @@ bool LLAppViewer::init()
        /////////////////////////////////////////////////
        // OS-specific login dialogs
        /////////////////////////////////////////////////
-#if LL_WINDOWS
-        /*
-        // Display initial login screen, comes up quickly. JC
-        {
-                LLSplashScreen::hide();
-                INT_PTR result = DialogBox(hInstance, L"CONNECTBOX", NULL, login_dialog_func);
-                if (result < 0)
-                {
-                        llwarns << "Connect dialog box failed, returned " << result << llendl;
-                        return 1;
-                }
-                // success, result contains which button user clicked
-                llinfos << "Connect dialog box clicked " << result << llendl;
-                LLSplashScreen::show();
-        }
-        */
-#endif
        //test_cached_control();
@@ -657,6 +633,7 @@ bool LLAppViewer::init()
        // Widget construction depends on LLUI being initialized
        LLUI::initClass(&gSavedSettings, 
+                                        &gSavedSettings, 
                                        &gColors, 
                                        LLUIImageList::getInstance(),
                                        ui_audio_callback,
@@ -668,7 +645,7 @@ bool LLAppViewer::init()
                                &LLURLDispatcher::dispatchFromTextEditor);
        
        LLUICtrlFactory::getInstance()->setupPaths(); // update paths with correct language set
-        
        /////////////////////////////////////////////////
        //
        // Load settings files
@@ -741,7 +718,10 @@ bool LLAppViewer::init()
        //
        initWindow();
-#if LL_LCD_COMPILE
+        // call all self-registered classes
+        LLInitClassList::instance().fireCallbacks();
+        #if LL_LCD_COMPILE
                // start up an LCD window on a logitech keyboard, if there is one
                HINSTANCE hInstance = GetModuleHandle(NULL);
                gLcdScreen = new LLLCD(hInstance);
@@ -767,64 +747,67 @@ bool LLAppViewer::init()
        // If we don't have the right GL requirements, exit.
        if (!gGLManager.mHasRequirements && !gNoRender)
        {       
-                // can't use an alert here since we're existing and
+                // can't use an alert here since we're exiting and
                // all hell breaks lose.
                OSMessageBox(
-                        LLAlertDialog::getTemplateMessage("UnsupportedGLRequirements"),
+                        LLNotifications::instance().getGlobalString("UnsupportedGLRequirements"),
                        LLStringUtil::null,
                        OSMB_OK);
                return 0;
        }
+        // alert the user if they are using unsupported hardware
-        bool unsupported = false;
+        if(!gSavedSettings.getBOOL("AlertedUnsupportedHardware"))
-        LLStringUtil::format_map_t args;
-        std::string minSpecs;
-                
-        // get cpu data from xml
-        std::stringstream minCPUString(LLAlertDialog::getTemplateMessage("UnsupportedCPUAmount"));
-        S32 minCPU = 0;
-        minCPUString >> minCPU;
-        // get RAM data from XML
-        std::stringstream minRAMString(LLAlertDialog::getTemplateMessage("UnsupportedRAMAmount"));
-        U64 minRAM = 0;
-        minRAMString >> minRAM;
-        minRAM = minRAM * 1024 * 1024;
-        if(!LLFeatureManager::getInstance()->isGPUSupported() && LLFeatureManager::getInstance()->getGPUClass() != GPU_CLASS_UNKNOWN)
-        {
-                minSpecs += LLAlertDialog::getTemplateMessage("UnsupportedGPU");
-                minSpecs += "\n";
-                unsupported = true;
-        }
-        if(gSysCPU.getMhz() < minCPU)
-        {
-                minSpecs += LLAlertDialog::getTemplateMessage("UnsupportedCPU");
-                minSpecs += "\n";
-                unsupported = true;
-        }
-        if(gSysMemory.getPhysicalMemoryClamped() < minRAM)
-        {
-                minSpecs += LLAlertDialog::getTemplateMessage("UnsupportedRAM");
-                minSpecs += "\n";
-                unsupported = true;
-        }
-        if (LLFeatureManager::getInstance()->getGPUClass() == GPU_CLASS_UNKNOWN)
        {
-                gViewerWindow->alertXml("UnknownGPU");
+                bool unsupported = false;
-        } 
+                LLSD args;
+                std::string minSpecs;
                
-        if(unsupported)
+                // get cpu data from xml
-        {
+                std::stringstream minCPUString(LLNotifications::instance().getGlobalString("UnsupportedCPUAmount"));
-                if(!gSavedSettings.controlExists("WarnUnsupportedHardware") 
+                S32 minCPU = 0;
-                        || gSavedSettings.getBOOL("WarnUnsupportedHardware"))
+                minCPUString >> minCPU;
+                // get RAM data from XML
+                std::stringstream minRAMString(LLNotifications::instance().getGlobalString("UnsupportedRAMAmount"));
+                U64 minRAM = 0;
+                minRAMString >> minRAM;
+                minRAM = minRAM * 1024 * 1024;
+                if(!LLFeatureManager::getInstance()->isGPUSupported() && LLFeatureManager::getInstance()->getGPUClass() != GPU_CLASS_UNKNOWN)
+                {
+                        minSpecs += LLNotifications::instance().getGlobalString("UnsupportedGPU");
+                        minSpecs += "\n";
+                        unsupported = true;
+                }
+                if(gSysCPU.getMhz() < minCPU)
                {
-                        args["MINSPECS"] = minSpecs;
+                        minSpecs += LLNotifications::instance().getGlobalString("UnsupportedCPU");
-                        gViewerWindow->alertXml("UnsupportedHardware", args );
+                        minSpecs += "\n";
+                        unsupported = true;
                }
+                if(gSysMemory.getPhysicalMemoryClamped() < minRAM)
+                {
+                        minSpecs += LLNotifications::instance().getGlobalString("UnsupportedRAM");
+                        minSpecs += "\n";
+                        unsupported = true;
+                }
+                if (LLFeatureManager::getInstance()->getGPUClass() == GPU_CLASS_UNKNOWN)
+                {
+                        LLNotifications::instance().add("UnknownGPU");
+                } 
+                        
+                if(unsupported)
+                {
+                        if(!gSavedSettings.controlExists("WarnUnsupportedHardware") 
+                                || gSavedSettings.getBOOL("WarnUnsupportedHardware"))
+                        {
+                                args["MINSPECS"] = minSpecs;
+                                LLNotifications::instance().add("UnsupportedHardware", args );
+                        }
+                }
        }
        // save the graphics card
@@ -873,7 +856,6 @@ bool LLAppViewer::mainLoop()
                try
                {
                        LLFastTimer t(LLFastTimer::FTM_FRAME);
-                        
                        pingMainloopTimeout("Main:MiscNativeWindowEvents");
                        
                        {
@@ -1078,6 +1060,9 @@ bool LLAppViewer::mainLoop()
                        }
                        else
                        {
+                                //output possible call stacks to log file.
+                                LLError::LLCallStacks::print() ;
                                llerrs << "Bad memory allocation in LLAppViewer::mainLoop()!" << llendl ;
                        }
                }
@@ -1113,6 +1098,16 @@ bool LLAppViewer::mainLoop()
 bool LLAppViewer::cleanup()
 {
+        //----------------------------------------------
+        //this test code will be removed after the test
+        //test manual call stack tracer
+        if(gSavedSettings.getBOOL("QAMode"))
+        {
+                LLError::LLCallStacks::print() ;
+        }
+        //end of the test code
+        //----------------------------------------------
        //flag all elements as needing to be destroyed immediately
        // to ensure shutdown order
        LLMortician::setZealous(TRUE);
@@ -1132,6 +1127,9 @@ bool LLAppViewer::cleanup()
        llinfos << "Cleaning Up" << llendflush;
        // Must clean up texture references before viewer window is destroyed.
+        LLHUDManager::getInstance()->updateEffects();
+        LLHUDObject::updateAll();
+        LLHUDManager::getInstance()->cleanupEffects();
        LLHUDObject::cleanupHUDObjects();
        llinfos << "HUD Objects cleaned up" << llendflush;
@@ -1158,8 +1156,6 @@ bool LLAppViewer::cleanup()
        // Note: this is where gLocalSpeakerMgr and gActiveSpeakerMgr used to be deleted.
-        LLNotifyBox::cleanup();
        LLWorldMap::getInstance()->reset(); // release any images
        LLCalc::cleanUp();
@@ -1172,8 +1168,8 @@ bool LLAppViewer::cleanup()
                if (gAudiop->getDriverName(want_longname) == "FMOD")
                {
                        // This hack exists because fmod likes to occasionally
-                        // hang forever when shutting down, for no apparent
+                        // crash or hang forever when shutting down, for no
-                        // reason.
+                        // apparent reason.
                        llwarns << "Hack, skipping FMOD audio engine cleanup" << llendflush;
                }
                else
@@ -1293,6 +1289,13 @@ bool LLAppViewer::cleanup()
        LLVFile::cleanupClass();
        llinfos << "VFS cleaned up" << llendflush;
+        // Quitting with "Remember Password" turned off should always stomp your
+        // saved password, whether or not you successfully logged in.  JC
+        if (!gSavedSettings.getBOOL("RememberPassword"))
+        {
+                LLStartUp::deletePasswordFromDisk();
+        }
+        
        // Store the time of our current logoff
        gSavedPerAccountSettings.setU32("LastLogoff", time_corrected());
@@ -1507,46 +1510,78 @@ bool LLAppViewer::initLogging()
        return true;
 }
-bool LLAppViewer::loadSettingsFromDirectory(ELLPath path_index, bool set_defaults)
+bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key,
+                                            bool set_defaults)
 {       
-        for(LLSD::map_iterator itr = mSettingsFileList.beginMap(); itr != mSettingsFileList.endMap(); ++itr)
+        // Find and vet the location key.
+        if(!mSettingsLocationList.has(location_key))
+        {
+                llerrs << "Requested unknown location: " << location_key << llendl;
+                return false;
+        }
+        LLSD location = mSettingsLocationList.get(location_key);
+        if(!location.has("PathIndex"))
+        {
+                llerrs << "Settings location is missing PathIndex value. Settings cannot be loaded." << llendl;
+                return false;
+        }
+        ELLPath path_index = (ELLPath)(location.get("PathIndex").asInteger());
+        if(path_index <= LL_PATH_NONE || path_index >= LL_PATH_LAST)
        {
-                std::string settings_name = (*itr).first;
+                llerrs << "Out of range path index in app_settings/settings_files.xml" << llendl;
-                std::string settings_file = mSettingsFileList[settings_name].asString();
+                return false;
+        }
-                std::string full_settings_path = gDirUtilp->getExpandedFilename(path_index, settings_file);
+        // Iterate through the locations list of files.
+        LLSD files = location.get("Files");
+        for(LLSD::map_iterator itr = files.beginMap(); itr != files.endMap(); ++itr)
+        {
+                std::string settings_group = (*itr).first;
+                llinfos << "Attempting to load settings for the group " << settings_group 
+                            << " - from location " << location_key << llendl;
-                if(settings_name == sGlobalSettingsName 
+                if(gSettings.find(settings_group) == gSettings.end())
-                        && path_index == LL_PATH_USER_SETTINGS)
                {
-                        // The non-persistent setting, ClientSettingsFile, specifies a 
+                        llwarns << "No matching settings group for name " << settings_group << llendl;
-                        // custom name to use for the global settings file.
+                        continue;
-                        // Only apply this setting if this method is setting the 'Global' 
+                }
-                        // settings from the user_settings path.
-                        std::string custom_path;
+                LLSD file = (*itr).second;
-                        if(gSettings[sGlobalSettingsName]->controlExists("ClientSettingsFile"))
-                        {
+                std::string full_settings_path;
-                                custom_path = 
+                if(file.has("NameFromSetting"))
-                                        gSettings[sGlobalSettingsName]->getString("ClientSettingsFile");
+                {
-                        }
+                        std::string custom_name_setting = file.get("NameFromSetting");
-                        if(!custom_path.empty())
+                        // *NOTE: Regardless of the group currently being lodaed,
+                        // this setting is always read from the Global settings.
+                        if(gSettings[sGlobalSettingsName]->controlExists(custom_name_setting))
                        {
-                                full_settings_path = custom_path;
+                                std::string file_name = 
+                                        gSettings[sGlobalSettingsName]->getString(custom_name_setting);
+                                full_settings_path = file_name;
                        }
                }
-                if(gSettings.find(settings_name) == gSettings.end())
+                if(full_settings_path.empty())
                {
-                        llwarns << "Cannot load " << settings_file << " - No matching settings group for name " << settings_name << llendl;
+                        std::string file_name = file.get("Name");
-                        continue;
+                        full_settings_path = gDirUtilp->getExpandedFilename(path_index, file_name);
                }
-                if(!gSettings[settings_name]->loadFromFile(full_settings_path, set_defaults))
+                int requirement = 0;
+                if(file.has("Requirement"))
                {
-                        // If attempting to load the default global settings (app_settings/settings.xml) 
+                        requirement = file.get("Requirement").asInteger();
-                        // fails, the app should error and quit.
+                }
-                        if(path_index == LL_PATH_APP_SETTINGS && settings_name == sGlobalSettingsName)
+                
+                if(!gSettings[settings_group]->loadFromFile(full_settings_path, set_defaults))
+                {
+                        if(requirement == 1)
                        {
-                                llwarns << "Error: Cannot load default settings from: " << full_settings_path << llendl;
+                                llwarns << "Error: Cannot load required settings file from: " 
+                                                << full_settings_path << llendl;
                                return false;
                        }
                        else
@@ -1559,14 +1594,24 @@ bool LLAppViewer::loadSettingsFromDirectory(ELLPath path_index, bool set_default
                        llinfos << "Loaded settings file " << full_settings_path << llendl;
                }
        }
        return true;
 }
-std::string LLAppViewer::getSettingsFileName(const std::string& file)
+std::string LLAppViewer::getSettingsFilename(const std::string& location_key,
+                                                                                         const std::string& file)
 {
-        if(mSettingsFileList.has(file))
+        if(mSettingsLocationList.has(location_key))
        {
-                return mSettingsFileList[file].asString();
+                LLSD location = mSettingsLocationList.get(location_key);
+                if(location.has("Files"))
+                {
+                        LLSD files = location.get("Files");
+                        if(files.has(file) && files[file].has("Name"))
+                        {
+                                return files.get(file).get("Name").asString();
+                        }
+                }
        }
        return std::string();
 }
@@ -1587,8 +1632,8 @@ bool LLAppViewer::initConfiguration()
        llerrs << "Cannot load default configuration file " << settings_file_list << llendl;
        }
-        mSettingsFileList = settings_control.getLLSD("Files");
+        mSettingsLocationList = settings_control.getLLSD("Locations");
-        
+                
        // The settings and command line parsing have a fragile
        // order-of-operation:
        // - load defaults from app_settings
@@ -1601,11 +1646,11 @@ bool LLAppViewer::initConfiguration()
        
        // - load defaults
        bool set_defaults = true;
-        if(!loadSettingsFromDirectory(LL_PATH_APP_SETTINGS, set_defaults))
+        if(!loadSettingsFromDirectory("Default", set_defaults))
        {
                std::ostringstream msg;
                msg << "Second Life could not load its default settings file. \n" 
-                        << "The installation may be corrupted. \n";
+                    << "The installation may be corrupted. \n";
                OSMessageBox(
                        msg.str(),
@@ -1617,16 +1662,11 @@ bool LLAppViewer::initConfiguration()
        // - set procedural settings 
        gSavedSettings.setString("ClientSettingsFile", 
+        // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));
        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence.xml"));
        gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);
-#if !LL_DYNAMIC_FONT_DISCOVERY
-        // static font discovery - user settings can override.
-        gSavedSettings.setString("FontSansSerifFallback",
-                                 LLWindow::getFontListSans());
-#endif
        //*FIX:Mani - Set default to disabling watchdog mainloop 
        // timeout for mac and linux. There is no call stack info 
        // on these platform to help debug.
@@ -1665,25 +1705,6 @@ bool LLAppViewer::initConfiguration()
        LLFirstUse::addConfigVariable("FirstVoice");
        LLFirstUse::addConfigVariable("FirstMedia");
                
-    //////
-    // *FIX:Mani - Find a way to remove the gUICtrlFactory and
-    // LLAlertDialog::parseAlerts dependecies on the being loaded
-    // *before* the user settings. Having to do this init here
-    // seems odd. 
-        // This is where gUICtrlFactory used to be instantiated with a new LLUICtrlFactory
-        // which needed to happen before calling parseAlerts below.
-        // TODO: That method is still dependant upon the base LLUICtrlFactory constructor being called
-        // which registers some callbacks so I'm leaving in a call to getInstance here to cause that to
-        // still happen. This needs to be cleaned up later when the base and derived classes
-        // are planned to be combined. -MG
-        LLUICtrlFactory::getInstance();
-        
-        // Pre-load alerts.xml to define the warnings settings (always loads from skins/xui/en-us/)
-        // Do this *before* loading the settings file
-        LLAlertDialog::parseAlerts("alerts.xml", &gSavedSettings, TRUE);
        // - read command line settings.
        LLControlGroupCLP clp;
        std::string     cmd_line_config = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,
@@ -1726,22 +1747,13 @@ bool LLAppViewer::initConfiguration()
        }
        // - load overrides from user_settings 
-        loadSettingsFromDirectory(LL_PATH_USER_SETTINGS);
+        loadSettingsFromDirectory("User");
-#if LL_DYNAMIC_FONT_DISCOVERY
-        // Linux does *dynamic* font discovery which is preferable to
-        // whatever got written-out into the config file last time.  This
-        // does remove the ability of the user to hand-define the fallbacks
-        // though, so from a config-management point of view this is hacky.
-        gSavedSettings.setString("FontSansSerifFallback",
-                                 LLWindow::getFontListSans());
-#endif
        // - apply command line settings 
        clp.notify(); 
        // Handle initialization from settings.
-        // Start up     the     debugging console before handling other options.
+        // Start up the debugging console before handling other options.
        if (gSavedSettings.getBOOL("ShowConsoleWindow"))
        {
                initConsole();
@@ -1992,38 +2004,9 @@ bool LLAppViewer::initConfiguration()
                }
                initMarkerFile();
-                
+        
-#if LL_SEND_CRASH_REPORTS
+        checkForCrash();
-                if (gLastExecEvent == LAST_EXEC_FROZE)
+    }
-                {
-                        llinfos << "Last execution froze, requesting to send crash report." << llendl;
-                        //
-                        // Pop up a freeze or crash warning dialog
-                        //
-                        std::ostringstream msg;
-                        msg << gSecondLife
-                                << " appears to have frozen or crashed on the previous run.\n"
-                                << "Would you like to send a crash report?";
-                        std::string alert;
-                        alert = gSecondLife;
-                        alert += " Alert";
-                        S32 choice = OSMessageBox(msg.str(),
-                                                                          alert,
-                                                                          OSMB_YESNO);
-                        if (OSBTN_YES == choice)
-                        {
-                                llinfos << "Sending crash report." << llendl;
-                                bool report_freeze = true;
-                                handleCrashReporting(report_freeze);
-                        }
-                        else
-                        {
-                                llinfos << "Not sending crash report." << llendl;
-                        }
-                }
-#endif // #if LL_SEND_CRASH_REPORTS
-        }
        else
        {
                mSecondInstance = anotherInstanceRunning();
@@ -2041,6 +2024,11 @@ bool LLAppViewer::initConfiguration()
                }
                initMarkerFile();
+        
+        if(!mSecondInstance)
+        {
+            checkForCrash();
+        }
        }
        // need to do this here - need to have initialized global settings first
@@ -2055,6 +2043,66 @@ bool LLAppViewer::initConfiguration()
        return true; // Config was successful.
 }
+void LLAppViewer::checkForCrash(void)
+{
+    
+#if LL_SEND_CRASH_REPORTS
+        //*NOTE:Mani The current state of the crash handler has the MacOSX
+        // sending all crash reports as freezes, in order to let 
+        // the MacOSX CrashRepoter generate stacks before spawning the 
+        // SL crash logger.
+        // The Linux and Windows clients generate their own stacks and
+        // spawn the SL crash logger immediately. This may change in the future. 
+#if LL_DARWIN
+        if(gLastExecEvent != LAST_EXEC_NORMAL)
+#else           
+        if (gLastExecEvent == LAST_EXEC_FROZE)
+#endif
+    {
+        llinfos << "Last execution froze, requesting to send crash report." << llendl;
+        //
+        // Pop up a freeze or crash warning dialog
+        //
+        S32 choice;
+        if(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) == CRASH_BEHAVIOR_ASK)
+        {
+            std::ostringstream msg;
+            msg << gSecondLife
+            << " appears to have frozen or crashed on the previous run.\n"
+            << "Would you like to send a crash report?";
+            std::string alert;
+            alert = gSecondLife;
+            alert += " Alert";
+            choice = OSMessageBox(msg.str(),
+                                  alert,
+                                  OSMB_YESNO);
+        } 
+        else if(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING) == CRASH_BEHAVIOR_NEVER_SEND)
+        {
+            choice = OSBTN_NO;
+        }
+        else
+        {
+            choice = OSBTN_YES;
+        }
+        if (OSBTN_YES == choice)
+        {
+            llinfos << "Sending crash report." << llendl;
+            
+            bool report_freeze = true;
+            handleCrashReporting(report_freeze);
+        }
+        else
+        {
+            llinfos << "Not sending crash report." << llendl;
+        }
+    }
+#endif // LL_SEND_CRASH_REPORTS    
+    
+}
 bool LLAppViewer::initWindow()
 {
        LL_INFOS("AppInit") << "Initializing window..." << LL_ENDL;
@@ -2067,7 +2115,8 @@ bool LLAppViewer::initWindow()
        // always start windowed
        BOOL ignorePixelDepth = gSavedSettings.getBOOL("IgnorePixelDepth");
-        gViewerWindow = new LLViewerWindow(gWindowTitle, gWindowTitle,
+        gViewerWindow = new LLViewerWindow(gWindowTitle, 
+                VIEWER_WINDOW_CLASSNAME,
                gSavedSettings.getS32("WindowX"), gSavedSettings.getS32("WindowY"),
                gSavedSettings.getS32("WindowWidth"), gSavedSettings.getS32("WindowHeight"),
                FALSE, ignorePixelDepth);
@@ -2110,9 +2159,8 @@ bool LLAppViewer::initWindow()
        LLUI::sWindow = gViewerWindow->getWindow();
-        LLAlertDialog::parseAlerts("alerts.xml");
-        LLNotifyBox::parseNotify("notify.xml");
        LLTrans::parseStrings("strings.xml");
+        LLUITrans::parseStrings("ui_strings.xml");
        // Show watch cursor
        gViewerWindow->setCursor(UI_CURSOR_WAIT);
@@ -2121,7 +2169,7 @@ bool LLAppViewer::initWindow()
        gViewerWindow->initBase();
        // show viewer window
-        gViewerWindow->mWindow->show();
+        //gViewerWindow->mWindow->show();
        
        return true;
@@ -2159,7 +2207,6 @@ void LLAppViewer::cleanupSavedSettings()
                if (gDebugView)
                {
                        gSavedSettings.setBOOL("ShowDebugConsole", gDebugView->mDebugConsolep->getVisible());
-                        gSavedSettings.setBOOL("ShowDebugStats", gDebugView->mFloaterStatsp->getVisible());
                }
        }
@@ -2268,6 +2315,9 @@ void LLAppViewer::handleViewerCrash()
 {
        llinfos << "Handle viewer crash entry." << llendl;
+        //print out recorded call stacks if there are any.
+        LLError::LLCallStacks::print();
        LLAppViewer* pApp = LLAppViewer::instance();
        if (pApp->beingDebugged())
        {
@@ -2317,6 +2367,8 @@ void LLAppViewer::handleViewerCrash()
        gDebugInfo["SessionLength"] = F32(LLFrameTimer::getElapsedSeconds());
        gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
        gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer) getCurrentRSS() >> 10;
+        gDebugInfo["FirstLogin"] = (LLSD::Boolean) gAgent.isFirstLogin();
+        gDebugInfo["FirstRunThisInstall"] = gSavedSettings.getBOOL("FirstRunThisInstall");
        if(gLogoutInProgress)
        {
@@ -2356,16 +2408,17 @@ void LLAppViewer::handleViewerCrash()
                if(gLLErrorActivated) crash_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,LLERROR_MARKER_FILE_NAME);
                else crash_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,ERROR_MARKER_FILE_NAME);
                llinfos << "Creating crash marker file " << crash_file_name << llendl;
-                apr_file_t* crash_file =  ll_apr_file_open(crash_file_name, LL_APR_W);
+                
-                if (crash_file)
+                LLAPRFile crash_file ;
+                crash_file.open(crash_file_name, LL_APR_W);
+                if (crash_file.getFileHandle())
                {
                        LL_INFOS("MarkerFile") << "Created crash marker file " << crash_file_name << LL_ENDL;
                }
                else
                {
                        LL_WARNS("MarkerFile") << "Cannot create error marker file " << crash_file_name << LL_ENDL;
-                }
+                }               
-                apr_file_close(crash_file);
        }
        
        if (gMessageSystem && gDirUtilp)
@@ -2394,6 +2447,10 @@ void LLAppViewer::handleViewerCrash()
        LLError::logToFile("");
+// On Mac, we send the report on the next run, since we need macs crash report
+// for a stack trace, so we have to let it the app fail.
+#if !LL_DARWIN
        // Remove the marker file, since otherwise we'll spawn a process that'll keep it locked
        if(gDebugInfo["LastExecEvent"].asInteger() == LAST_EXEC_LOGOUT_CRASH)
        {
@@ -2407,6 +2464,8 @@ void LLAppViewer::handleViewerCrash()
        // Call to pure virtual, handled by platform specific llappviewer instance.
        pApp->handleCrashReporting(); 
+#endif //!LL_DARWIN
+    
        return;
 }
@@ -2419,13 +2478,13 @@ bool LLAppViewer::anotherInstanceRunning()
        LL_DEBUGS("MarkerFile") << "Checking marker file for lock..." << LL_ENDL;
        //Freeze case checks
-        apr_file_t* fMarker = ll_apr_file_open(marker_file, LL_APR_RB);         
+        if (LLAPRFile::isExist(marker_file, NULL, LL_APR_RB))
-        if (fMarker != NULL)
        {
                // File exists, try opening with write permissions
-                apr_file_close(fMarker);
+                LLAPRFile outfile ;
-                fMarker = ll_apr_file_open(marker_file, LL_APR_WB);
+                outfile.open(marker_file, LL_APR_WB);
-                if (fMarker == NULL)
+                apr_file_t* fMarker = outfile.getFileHandle() ; 
+                if (!fMarker)
                {
                        // Another instance is running. Skip the rest of these operations.
                        LL_INFOS("MarkerFile") << "Marker file is locked." << LL_ENDL;
@@ -2433,12 +2492,10 @@ bool LLAppViewer::anotherInstanceRunning()
                }
                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;
                }
-                // No other instances; we'll lock this file now & delete on quit.
+                // 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;
@@ -2464,51 +2521,46 @@ void LLAppViewer::initMarkerFile()
        std::string llerror_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LLERROR_MARKER_FILE_NAME);
        std::string error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME);
-        apr_file_t* fMarker = ll_apr_file_open(logout_marker_file, LL_APR_RB);
+        
-        if(fMarker != NULL)
+        if (LLAPRFile::isExist(mMarkerFileName, NULL, LL_APR_RB) && !anotherInstanceRunning())
+        {
+                gLastExecEvent = LAST_EXEC_FROZE;
+                LL_INFOS("MarkerFile") << "Exec marker found: program froze on previous execution" << LL_ENDL;
+        }    
+    
+        if(LLAPRFile::isExist(logout_marker_file, NULL, LL_APR_RB))
        {
-                apr_file_close(fMarker);
                LL_INFOS("MarkerFile") << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << LL_ENDL;
                gLastExecEvent = LAST_EXEC_LOGOUT_FROZE;
-        }       
+        }
-        fMarker = ll_apr_file_open(llerror_marker_file, LL_APR_RB);
+        if(LLAPRFile::isExist(llerror_marker_file, NULL, LL_APR_RB))
-        if(fMarker != NULL)
        {
-                apr_file_close(fMarker);
                llinfos << "Last exec LLError crashed, setting LastExecEvent to " << LAST_EXEC_LLERROR_CRASH << llendl;
                if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH;
                else gLastExecEvent = LAST_EXEC_LLERROR_CRASH;
        }
-        fMarker = ll_apr_file_open(error_marker_file, LL_APR_RB);
+        if(LLAPRFile::isExist(error_marker_file, NULL, LL_APR_RB))
-        if(fMarker != NULL)
        {
-                apr_file_close(fMarker);
                LL_INFOS("MarkerFile") << "Last exec crashed, setting LastExecEvent to " << LAST_EXEC_OTHER_CRASH << LL_ENDL;
                if(gLastExecEvent == LAST_EXEC_LOGOUT_FROZE) gLastExecEvent = LAST_EXEC_LOGOUT_CRASH;
                else gLastExecEvent = LAST_EXEC_OTHER_CRASH;
        }
-        ll_apr_file_remove(logout_marker_file);
-        ll_apr_file_remove(llerror_marker_file);
-        ll_apr_file_remove(error_marker_file);
        
-        //Freeze case checks
+        LLAPRFile::remove(logout_marker_file);
+        LLAPRFile::remove(llerror_marker_file);
+        LLAPRFile::remove(error_marker_file);
+        
+        // No new markers if another instance is running.
        if(anotherInstanceRunning()) 
        {
                return;
        }
        
-        fMarker = ll_apr_file_open(mMarkerFileName, LL_APR_RB);         
-        if (fMarker != NULL)
-        {
-                apr_file_close(fMarker);
-                gLastExecEvent = LAST_EXEC_FROZE;
-                LL_INFOS("MarkerFile") << "Exec marker found: program froze on previous execution" << LL_ENDL;
-        }
        // Create the marker file for this execution & lock it
-        mMarkerFile =  ll_apr_file_open(mMarkerFileName, LL_APR_W);
+        apr_status_t s;
-        if (mMarkerFile)
+        s = mMarkerFile.open(mMarkerFileName, LL_APR_W, gAPRPoolp);     
+        if (s == APR_SUCCESS && mMarkerFile.getFileHandle())
        {
                LL_DEBUGS("MarkerFile") << "Marker file created." << LL_ENDL;
        }
@@ -2517,9 +2569,9 @@ void LLAppViewer::initMarkerFile()
                LL_INFOS("MarkerFile") << "Failed to create marker file." << LL_ENDL;
                return;
        }
-        if (apr_file_lock(mMarkerFile, APR_FLOCK_NONBLOCK | APR_FLOCK_EXCLUSIVE) != APR_SUCCESS) 
+        if (apr_file_lock(mMarkerFile.getFileHandle(), APR_FLOCK_NONBLOCK | APR_FLOCK_EXCLUSIVE) != APR_SUCCESS) 
        {
-                apr_file_close(mMarkerFile);
+                mMarkerFile.close() ;
                LL_INFOS("MarkerFile") << "Marker file cannot be locked." << LL_ENDL;
                return;
        }
@@ -2530,14 +2582,14 @@ void LLAppViewer::initMarkerFile()
 void LLAppViewer::removeMarkerFile(bool leave_logout_marker)
 {
        LL_DEBUGS("MarkerFile") << "removeMarkerFile()" << LL_ENDL;
-        if (mMarkerFile != NULL)
+        if (mMarkerFile.getFileHandle())
        {
-                ll_apr_file_remove( mMarkerFileName );
+                mMarkerFile.close() ;
-                mMarkerFile = NULL;
+                LLAPRFile::remove( mMarkerFileName );
        }
        if (mLogoutMarkerFile != NULL && !leave_logout_marker)
        {
-                ll_apr_file_remove( mLogoutMarkerFileName );
+                LLAPRFile::remove( mLogoutMarkerFileName );
                mLogoutMarkerFile = NULL;
        }
 }
@@ -2564,6 +2616,7 @@ void LLAppViewer::requestQuit()
        effectp->setPositionGlobal(gAgent.getPositionGlobal());
        effectp->setColor(LLColor4U(gAgent.getEffectColor()));
        LLHUDManager::getInstance()->sendEffects();
+        effectp->markDead() ;//remove it.
        // Attempt to close all floaters that might be
        // editing things.
@@ -2579,32 +2632,34 @@ void LLAppViewer::requestQuit()
        mQuitRequested = true;
 }
-static void finish_quit(S32 option, void *userdata)
+static bool finish_quit(const LLSD& notification, const LLSD& response)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
        if (option == 0)
        {
                LLAppViewer::instance()->requestQuit();
        }
+        return false;
 }
+static LLNotificationFunctorRegistration finish_quit_reg("ConfirmQuit", finish_quit);
 void LLAppViewer::userQuit()
 {
-        gViewerWindow->alertXml("ConfirmQuit", finish_quit, NULL);
+        LLNotifications::instance().add("ConfirmQuit");
 }
-static void finish_early_exit(S32 option, void* userdata)
+static bool finish_early_exit(const LLSD& notification, const LLSD& response)
 {
        LLAppViewer::instance()->forceQuit();
+        return false;
 }
-void LLAppViewer::earlyExit(const std::string& msg)
+void LLAppViewer::earlyExit(const std::string& name, const LLSD& substitutions)
 {
-        llwarns << "app_early_exit: " << msg << llendl;
+        llwarns << "app_early_exit: " << name << llendl;
        gDoDisconnect = TRUE;
-//      LLStringUtil::format_map_t args;
+        LLNotifications::instance().add(name, substitutions, LLSD(), finish_early_exit);
-//      args["[MESSAGE]"] = mesg;
-//      gViewerWindow->alertXml("AppEarlyExit", args, finish_early_exit);
-        LLAlertDialog::showCritical(msg, finish_early_exit, NULL);
 }
 void LLAppViewer::forceExit(S32 arg)
@@ -2621,6 +2676,75 @@ void LLAppViewer::abortQuit()
        mQuitRequested = false;
 }
+void LLAppViewer::migrateCacheDirectory()
+{
+#if LL_WINDOWS || LL_DARWIN
+        // NOTE: (Nyx) as of 1.21, cache for mac is moving to /library/caches/SecondLife from
+        // /library/application support/SecondLife/cache This should clear/delete the old dir.
+        // As of 1.23 the Windows cache moved from
+        //   C:\Documents and Settings\James\Application Support\SecondLife\cache
+        // to
+        //   C:\Documents and Settings\James\Local Settings\Application Support\SecondLife
+        //
+        // The Windows Vista equivalent is from
+        //   C:\Users\James\AppData\Roaming\SecondLife\cache
+        // to
+        //   C:\Users\James\AppData\Local\SecondLife
+        //
+        // Note the absence of \cache on the second path.  James.
+        // Only do this once per fresh install of this version.
+        if (gSavedSettings.getBOOL("MigrateCacheDirectory"))
+        {
+                gSavedSettings.setBOOL("MigrateCacheDirectory", FALSE);
+                std::string delimiter = gDirUtilp->getDirDelimiter();
+                std::string old_cache_dir = gDirUtilp->getOSUserAppDir() + delimiter + "cache";
+                std::string new_cache_dir = gDirUtilp->getCacheDir(true);
+                if (gDirUtilp->fileExists(old_cache_dir))
+                {
+                        llinfos << "Migrating cache from " << old_cache_dir << " to " << new_cache_dir << llendl;
+                        // Migrate inventory cache to avoid pain to inventory database after mass update
+                        S32 file_count = 0;
+                        std::string file_name;
+                        std::string mask = delimiter + "*.*";
+                        while (gDirUtilp->getNextFileInDir(old_cache_dir, mask, file_name, false))
+                        {
+                                if (file_name == "." || file_name == "..") continue;
+                                std::string source_path = old_cache_dir + delimiter + file_name;
+                                std::string dest_path = new_cache_dir + delimiter + file_name;
+                                if (!LLFile::rename(source_path, dest_path))
+                                {
+                                        file_count++;
+                                }
+                        }
+                        llinfos << "Moved " << file_count << " files" << llendl;
+                        // Nuke the old cache
+                        gDirUtilp->setCacheDir(old_cache_dir);
+                        purgeCache();
+                        gDirUtilp->setCacheDir(new_cache_dir);
+#if LL_DARWIN
+                        // Clean up Mac files not deleted by removing *.*
+                        std::string ds_store = old_cache_dir + "/.DS_Store";
+                        if (gDirUtilp->fileExists(ds_store))
+                        {
+                                LLFile::remove(ds_store);
+                        }
+#endif
+                        if (LLFile::rmdir(old_cache_dir) != 0)
+                        {
+                                llwarns << "could not delete old cache directory " << old_cache_dir << llendl;
+                        }
+                }
+        }
+#endif // LL_WINDOWS || LL_DARWIN
+}
 bool LLAppViewer::initCache()
 {
        mPurgeCache = false;
@@ -2642,37 +2766,8 @@ bool LLAppViewer::initCache()
                }
        }
        
-        // Delete old cache directory
+        // We have moved the location of the cache directory over time.
-#ifdef LL_DARWIN
+        migrateCacheDirectory();
-        if (LL_VERSION_MAJOR >= 1 && LL_VERSION_MINOR >= 21)
-        {
-                if (gLastRunVersion != gCurrentVersion)
-                {
-                        // NOTE: (Nyx) as of 1.21, cache for mac is moving to /library/caches/SecondLife from
-                        // /library/application support/SecondLife/cache This should clear/delete the old dir.
-                        std::string cache_dir = gDirUtilp->getOSUserAppDir();
-                        std::string new_cache_dir = gDirUtilp->getOSCacheDir();
-                        cache_dir = cache_dir + "/cache";
-                        new_cache_dir = new_cache_dir + "/" + gSecondLife;
-                        if (gDirUtilp->fileExists(cache_dir))
-                        {
-                                gDirUtilp->setCacheDir(cache_dir);
-                                purgeCache();
-                                gDirUtilp->setCacheDir(new_cache_dir);
-                                std::string ds_store = cache_dir + "/.DS_Store";
-                                if (gDirUtilp->fileExists(ds_store.c_str()))
-                                {
-                                        LLFile::remove(ds_store.c_str());
-                                }
-                                if (LLFile::remove(cache_dir.c_str()) != 0)
-                                {
-                                        llwarns << "could not delete old cache directory" << llendl;
-                                }
-                        }
-                }
-        }
-#endif
        // Setup and verify the cache location
        std::string cache_location = gSavedSettings.getString("CacheLocation");
@@ -2878,18 +2973,22 @@ const std::string& LLAppViewer::getWindowTitle() const
 }
 // Callback from a dialog indicating user was logged out.  
-void finish_disconnect(S32 option, void* userdata)
+bool finish_disconnect(const LLSD& notification, const LLSD& response)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
        if (1 == option)
        {
        LLAppViewer::instance()->forceQuit();
        }
+        return false;
 }
 // Callback from an early disconnect dialog, force an exit
-void finish_forced_disconnect(S32 /* option */, void* /* userdata */)
+bool finish_forced_disconnect(const LLSD& notification, const LLSD& response)
 {
        LLAppViewer::instance()->forceQuit();
+        return false;
 }
@@ -2909,19 +3008,19 @@ void LLAppViewer::forceDisconnect(const std::string& mesg)
                big_reason = mesg;
        }
-        LLStringUtil::format_map_t args;
+        LLSD args;
        gDoDisconnect = TRUE;
        if (LLStartUp::getStartupState() < STATE_STARTED)
        {
                // Tell users what happened
-                args["[ERROR_MESSAGE]"] = big_reason;
+                args["ERROR_MESSAGE"] = big_reason;
-                gViewerWindow->alertXml("ErrorMessage", args, finish_forced_disconnect);
+                LLNotifications::instance().add("ErrorMessage", args, LLSD(), &finish_forced_disconnect);
        }
        else
        {
-                args["[MESSAGE]"] = big_reason;
+                args["MESSAGE"] = big_reason;
-                gViewerWindow->alertXml("YouHaveBeenLoggedOut", args, finish_disconnect );
+                LLNotifications::instance().add("YouHaveBeenLoggedOut", args, LLSD(), &finish_disconnect );
        }
 }
@@ -3190,6 +3289,7 @@ void LLAppViewer::idle()
            //
    
            gFrameStats.start(LLFrameStats::IDLE_NETWORK);
+                stop_glerror();
                idleNetwork();
            stop_glerror();
                
@@ -3497,7 +3597,10 @@ void LLAppViewer::sendLogoutRequest()
                //Set internal status variables and marker files
                gLogoutInProgress = TRUE;
                mLogoutMarkerFileName = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,LOGOUT_MARKER_FILE_NAME);
-                mLogoutMarkerFile =  ll_apr_file_open(mLogoutMarkerFileName, LL_APR_W);
+                
+                LLAPRFile outfile ;
+                outfile.open(mLogoutMarkerFileName, LL_APR_W);
+                mLogoutMarkerFile =  outfile.getFileHandle() ;
                if (mLogoutMarkerFile)
                {
                        llinfos << "Created logout marker file " << mLogoutMarkerFileName << llendl;
@@ -3506,7 +3609,7 @@ void LLAppViewer::sendLogoutRequest()
                else
                {
                        llwarns << "Cannot create logout marker file " << mLogoutMarkerFileName << llendl;
-                }
+                }               
        }
 }
@@ -3524,6 +3627,8 @@ static F32 CheckMessagesMaxTime = CHECK_MESSAGES_DEFAULT_MAX_TIME;
 void LLAppViewer::idleNetwork()
 {
        pingMainloopTimeout("idleNetwork");
+        LLError::LLCallStacks::clear() ;
+        llpushcallstacks ;
        gObjectList.mNumNewObjects = 0;
        S32 total_decoded = 0;
@@ -3534,7 +3639,7 @@ void LLAppViewer::idleNetwork()
                
                // deal with any queued name requests and replies.
                gCacheName->processPending();
+                llpushcallstacks ;
                LLTimer check_message_timer;
                //  Read all available packets from network 
                stop_glerror();
@@ -3606,16 +3711,16 @@ void LLAppViewer::idleNetwork()
                        gPrintMessagesThisFrame = FALSE;
                }
        }
+        llpushcallstacks ;
        gObjectList.mNumNewObjectsStat.addValue(gObjectList.mNumNewObjects);
        // Retransmit unacknowledged packets.
        gXferManager->retransmitUnackedPackets();
        gAssetStorage->checkForTimeouts();
+        llpushcallstacks ;
        gViewerThrottle.updateDynamicThrottle();
+        llpushcallstacks ;
        // Check that the circuit between the viewer and the agent's current
        // region is still alive
        LLViewerRegion *agent_region = gAgent.getRegion();
@@ -3631,6 +3736,7 @@ void LLAppViewer::idleNetwork()
                mAgentRegionLastID = this_region_id;
                mAgentRegionLastAlive = this_region_alive;
        }
+        llpushcallstacks ;
 }
 void LLAppViewer::disconnectViewer()
@@ -3659,6 +3765,35 @@ void LLAppViewer::disconnectViewer()
                {
                        gFloaterView->restoreAll();
                }
+                std::list<LLFloater*> floaters_to_close;
+                for(LLView::child_list_const_iter_t it = gFloaterView->getChildList()->begin();
+                        it != gFloaterView->getChildList()->end();
+                        ++it)
+                {
+                        // The following names are defined in the 
+                        // floater_image_preview.xml
+                        // floater_sound_preview.xml
+                        // floater_animation_preview.xml
+                        // files.
+                        LLFloater* fl = static_cast<LLFloater*>(*it);
+                        if(fl 
+                                && (fl->getName() == "Image Preview"
+                                || fl->getName() == "Sound Preview"
+                                || fl->getName() == "Animation Preview"
+                                ))
+                        {
+                                floaters_to_close.push_back(fl);
+                        }
+                }
+                
+                while(!floaters_to_close.empty())
+                {
+                        LLFloater* fl = floaters_to_close.front();
+                        floaters_to_close.pop_front();
+                        fl->close();
+                }
        }
        if (LLSelectMgr::getInstance())
@@ -3688,6 +3823,9 @@ void LLAppViewer::disconnectViewer()
        // Now we just ask the LLWorld singleton to cleanly shut down.
        LLWorld::getInstance()->destroyClass();
+        // call all self-registered classes
+        LLDestroyClassList::instance().fireCallbacks();
        cleanup_xfer_manager();
        gDisconnected = TRUE;
 }
author	Jacek Antonelli	2009-08-29 17:44:38 -0500
committer	Jacek Antonelli	2009-08-29 22:49:51 -0500
commit	6a5aab98892df74f60743f5b789959c9593d6647 (patch)
tree	62da18f8540879ed01e12eeb0ce49375474272e4 /linden/indra/newview/llappviewer.cpp
parent	Merge branch 'mac-openal-url' into next (diff)
parent	Converted 1.23 XUI files to unix line endings. (diff)
download	meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.zip meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.gz meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.bz2 meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.xz