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

1 files changed, 208 insertions, 80 deletions

diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 77833c3..cc94529 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.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,
@@ -61,6 +62,7 @@
 #include "llviewerregion.h"
 #include "llviewerwindow.h"
 #include "llworldmap.h"
+#include "lltexturefetch.h"
 #include "llappviewer.h"                                // Only for constants!
 #include "lltrans.h"
 
@@ -82,12 +84,14 @@ LLUIImagePtr LLWorldMapView::sInfohubImage = NULL;
 LLUIImagePtr LLWorldMapView::sHomeImage = NULL;
 LLUIImagePtr LLWorldMapView::sEventImage = NULL;
 LLUIImagePtr LLWorldMapView::sEventMatureImage = NULL;
+LLUIImagePtr LLWorldMapView::sEventAdultImage = NULL;
 
 LLUIImagePtr LLWorldMapView::sTrackCircleImage = NULL;
 LLUIImagePtr LLWorldMapView::sTrackArrowImage = NULL;
 
 LLUIImagePtr LLWorldMapView::sClassifiedsImage = NULL;
 LLUIImagePtr LLWorldMapView::sForSaleImage = NULL;
+LLUIImagePtr LLWorldMapView::sForSaleAdultImage = NULL;
 
 F32 LLWorldMapView::sThresholdA = 48.f;
 F32 LLWorldMapView::sThresholdB = 96.f;
@@ -124,11 +128,15 @@ void LLWorldMapView::initClass()
         sInfohubImage =                 LLUI::getUIImage("map_infohub.tga");
         sEventImage =                   LLUI::getUIImage("map_event.tga");
         sEventMatureImage =             LLUI::getUIImage("map_event_mature.tga");
+        // To Do: update the image resource for adult events.
+        sEventAdultImage =              LLUI::getUIImage("map_event_adult.tga");
 
         sTrackCircleImage =             LLUI::getUIImage("map_track_16.tga");
         sTrackArrowImage =              LLUI::getUIImage("direction_arrow.tga");
         sClassifiedsImage =             LLUI::getUIImage("icon_top_pick.tga");
         sForSaleImage =                 LLUI::getUIImage("icon_for_sale.tga");
+        // To Do: update the image resource for adult lands on sale.
+        sForSaleAdultImage =    LLUI::getUIImage("icon_for_sale_adult.tga");
         
         sStringsMap["loading"] = LLTrans::getString("texture_loading");
         sStringsMap["offline"] = LLTrans::getString("worldmap_offline");
@@ -148,11 +156,13 @@ void LLWorldMapView::cleanupClass()
         sHomeImage = NULL;
         sEventImage = NULL;
         sEventMatureImage = NULL;
+        sEventAdultImage = NULL;
 
         sTrackCircleImage = NULL;
         sTrackArrowImage = NULL;
         sClassifiedsImage = NULL;
         sForSaleImage = NULL;
+        sForSaleAdultImage = NULL;
 }
 
 LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect )
@@ -296,8 +306,8 @@ void LLWorldMapView::draw()
 
         const S32 width = getRect().getWidth();
         const S32 height = getRect().getHeight();
-        const S32 half_width = width / 2;
-        const S32 half_height = height / 2;
+        const F32 half_width = F32(width) / 2.0f;
+        const F32 half_height = F32(height) / 2.0f;
         LLVector3d camera_global = gAgent.getCameraPositionGlobal();
 
         LLLocalClipRect clip(getLocalRect());
@@ -331,19 +341,18 @@ void LLWorldMapView::draw()
                 }
                 LLWorldMapLayer *layer = &LLWorldMap::getInstance()->mMapLayers[LLWorldMap::getInstance()->mCurrentMap][layer_idx];
                 LLViewerImage *current_image = layer->LayerImage;
-#if 1 || LL_RELEASE_FOR_DOWNLOAD
+
                 if (current_image->isMissingAsset())
                 {
                         continue; // better to draw nothing than the missing asset image
                 }
-#endif
                 
                 LLVector3d origin_global((F64)layer->LayerExtents.mLeft * REGION_WIDTH_METERS, (F64)layer->LayerExtents.mBottom * REGION_WIDTH_METERS, 0.f);
 
                 // Find x and y position relative to camera's center.
                 LLVector3d rel_region_pos = origin_global - camera_global;
-                S32 relative_x = lltrunc((rel_region_pos.mdV[0] / REGION_WIDTH_METERS) * gMapScale);
-                S32 relative_y = lltrunc((rel_region_pos.mdV[1] / REGION_WIDTH_METERS) * gMapScale);
+                F32 relative_x = (rel_region_pos.mdV[0] / REGION_WIDTH_METERS) * gMapScale;
+                F32 relative_y = (rel_region_pos.mdV[1] / REGION_WIDTH_METERS) * gMapScale;
 
                 F32 pix_width = gMapScale*(layer->LayerExtents.getWidth() + 1);
                 F32 pix_height = gMapScale*(layer->LayerExtents.getHeight() + 1);
@@ -418,34 +427,28 @@ void LLWorldMapView::draw()
         gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
         gGL.setColorMask(true, true);
 
-#if 1
+        // there used to be an #if 1 here, but it was uncommented; perhaps marking a block of code?
         F32 sim_alpha = 1.f;
 
         // Draw one image per region, centered on the camera position.
+        const S32 MAX_SIMULTANEOUS_TEX = 100;
+        const S32 MAX_REQUEST_PER_TICK = 5;
+        const S32 MIN_REQUEST_PER_TICK = 1;
+        S32 textures_requested_this_tick = 0;
+
         for (LLWorldMap::sim_info_map_t::iterator it = LLWorldMap::getInstance()->mSimInfoMap.begin();
                  it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
         {
                 U64 handle = (*it).first;
                 LLSimInfo* info = (*it).second;
 
-                if (info->mCurrentImage.isNull())
-                {
-                        info->mCurrentImage = gImageList.getImage(info->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE);
-                }
-                if (info->mOverlayImage.isNull() && info->mMapImageID[2].notNull())
-                {
-                        info->mOverlayImage = gImageList.getImage(info->mMapImageID[2], MIPMAP_TRUE, FALSE);
-                        gGL.getTexUnit(0)->bind(info->mOverlayImage.get());
-                        info->mOverlayImage->setClamp(TRUE, TRUE);
-                }
-                
                 LLViewerImage* simimage = info->mCurrentImage;
                 LLViewerImage* overlayimage = info->mOverlayImage;
 
                 if (gMapScale < SIM_MAP_SCALE)
                 {
-                        simimage->setBoostLevel(0);
-                        if (overlayimage) overlayimage->setBoostLevel(0);
+                        if (simimage != NULL) simimage->setBoostLevel(0);
+                        if (overlayimage != NULL) overlayimage->setBoostLevel(0);
                         continue;
                 }
                 
@@ -454,8 +457,8 @@ void LLWorldMapView::draw()
 
                 // Find x and y position relative to camera's center.
                 LLVector3d rel_region_pos = origin_global - camera_global;
-                S32 relative_x = lltrunc((rel_region_pos.mdV[0] / REGION_WIDTH_METERS) * gMapScale);
-                S32 relative_y = lltrunc((rel_region_pos.mdV[1] / REGION_WIDTH_METERS) * gMapScale);
+                F32 relative_x = (rel_region_pos.mdV[0] / REGION_WIDTH_METERS) * gMapScale;
+                F32 relative_y = (rel_region_pos.mdV[1] / REGION_WIDTH_METERS) * gMapScale;
 
                 // When the view isn't panned, 0,0 = center of rectangle
                 F32 bottom =    sPanY + half_height + relative_y;
@@ -476,6 +479,7 @@ void LLWorldMapView::draw()
 
                 bool sim_visible =
                         (gMapScale >= map_scale_cutoff) &&
+                        (simimage != NULL) &&
                         (simimage->getHasGLTexture());
 
                 if (sim_visible)
@@ -502,11 +506,38 @@ void LLWorldMapView::draw()
                         right < 0.f ||
                         left > width )
                 {
-                        simimage->setBoostLevel(0);
-                        if (overlayimage) overlayimage->setBoostLevel(0);
+                        if (simimage != NULL) simimage->setBoostLevel(0);
+                        if (overlayimage != NULL) overlayimage->setBoostLevel(0);
                         continue;
                 }
 
+                if (info->mCurrentImage.isNull())
+                {
+                        if ((textures_requested_this_tick < MIN_REQUEST_PER_TICK) ||
+                                ((LLAppViewer::getTextureFetch()->getNumRequests() < MAX_SIMULTANEOUS_TEX) &&
+                                 (textures_requested_this_tick < MAX_REQUEST_PER_TICK)))
+                        {
+                                textures_requested_this_tick++;
+                                info->mCurrentImage = gImageList.getImage(info->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE);
+                info->mCurrentImage->setAddressMode(LLTexUnit::TAM_CLAMP);
+                                simimage = info->mCurrentImage;
+                                gGL.getTexUnit(0)->bind(simimage);
+                        }
+                }
+                if (info->mOverlayImage.isNull() && info->mMapImageID[2].notNull())
+                {
+                        if ((textures_requested_this_tick < MIN_REQUEST_PER_TICK) ||
+                                ((LLAppViewer::getTextureFetch()->getNumRequests() < MAX_SIMULTANEOUS_TEX) &&
+                                 (textures_requested_this_tick < MAX_REQUEST_PER_TICK)))
+                        {
+                                textures_requested_this_tick++;
+                                info->mOverlayImage = gImageList.getImage(info->mMapImageID[2], MIPMAP_TRUE, FALSE);
+                                info->mOverlayImage->setAddressMode(LLTexUnit::TAM_CLAMP);
+                                overlayimage = info->mOverlayImage;
+                                gGL.getTexUnit(0)->bind(overlayimage);
+                        }
+                }
+
                 mVisibleRegions.push_back(handle);
                 // See if the agents need updating
                 if (current_time - info->mAgentsUpdateTime > AGENTS_UPDATE_TIME)
@@ -521,10 +552,13 @@ void LLWorldMapView::draw()
                 center_global.mdV[VY] += 128.0;
 
                 S32 draw_size = llround(gMapScale);
-                simimage->setBoostLevel(LLViewerImage::BOOST_MAP);
-                simimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
+                if (simimage != NULL)
+                {
+                        simimage->setBoostLevel(LLViewerImage::BOOST_MAP);
+                        simimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
+                }
 
-                if (overlayimage)
+                if (overlayimage != NULL)
                 {
                         overlayimage->setBoostLevel(LLViewerImage::BOOST_MAP);
                         overlayimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
@@ -537,7 +571,8 @@ void LLWorldMapView::draw()
                         // Draw using the texture.  If we don't clamp we get artifact at
                         // the edge.
                         LLGLSUIDefault gls_ui;
-                        gGL.getTexUnit(0)->bind(simimage);
+                        if (simimage != NULL)
+                                gGL.getTexUnit(0)->bind(simimage);
 
                         gGL.setSceneBlendType(LLRender::BT_ALPHA);
                         F32 alpha = sim_alpha * info->mAlpha;
@@ -606,7 +641,11 @@ void LLWorldMapView::draw()
                         gGL.end();
                 }
 
-                // If this is mature, and you are not, draw a line across it
+                // As part of the AO project, we no longer want to draw access indicators;
+                // it's too complicated to get all the rules straight and will only 
+                // cause confusion.
+                /**********************
+                 // If this is mature, and you are not, draw a line across it
                 if (info->mAccess != SIM_ACCESS_DOWN
                         && info->mAccess > SIM_ACCESS_PG
                         && gAgent.isTeen())
@@ -622,9 +661,10 @@ void LLWorldMapView::draw()
                                 gGL.vertex2f(right, top);
                         gGL.end();
                 }
+                 **********************/
 
                 // Draw the region name in the lower left corner
-                LLFontGL* font = LLFontGL::sSansSerifSmall;
+                LLFontGL* font = LLFontGL::getFontSansSerifSmall();
 
                 std::string mesg;
                 if (gMapScale < sThresholdA)
@@ -663,7 +703,8 @@ void LLWorldMapView::draw()
                         
                         // If map texture is still loading,
                         // display "Loading" placeholder text.
-                        if (simimage->getDiscardLevel() != 1 &&
+                        if ((simimage != NULL) &&
+                                simimage->getDiscardLevel() != 1 &&
                                 simimage->getDiscardLevel() != 0)
                         {
                                 font->renderUTF8(
@@ -677,10 +718,10 @@ void LLWorldMapView::draw()
                         }
                 }
         }
-#endif
+        // #endif used to be here
 
 
-#if 1
+        // there used to be an #if 1 here, but it was uncommented; perhaps marking a block of code?
         // Draw background rectangle
         LLGLSUIDefault gls_ui;
         {
@@ -716,9 +757,18 @@ void LLWorldMapView::draw()
         if (gSavedSettings.getBOOL("MapShowLandForSale"))
         {
                 drawGenericItems(LLWorldMap::getInstance()->mLandForSale, sForSaleImage);
+                // for 1.23, we're showing normal land and adult land in the same UI; you don't
+                // get a choice about which ones you want. If you're currently asking for adult
+                // content and land you'll get the adult land.
+                if (gAgent.canAccessAdult())
+                {
+                        drawGenericItems(LLWorldMap::getInstance()->mLandForSaleAdult, sForSaleAdultImage);
+                }
         }
-
-        if (gSavedSettings.getBOOL("MapShowEvents"))
+        
+        if (gSavedSettings.getBOOL("MapShowEvents") ||
+                gSavedSettings.getBOOL("ShowMatureEvents") ||
+                gSavedSettings.getBOOL("ShowAdultEvents") )
         {
                 drawEvents();
         }
@@ -735,7 +785,7 @@ void LLWorldMapView::draw()
                         TRUE, 
                         "You are here", 
                         "", 
-                        llround(LLFontGL::sSansSerifSmall->getLineHeight())); // offset vertically by one line, to avoid overlap with target tracking
+                        llround(LLFontGL::getFontSansSerifSmall()->getLineHeight())); // offset vertically by one line, to avoid overlap with target tracking
         }
 
         // Show your viewing angle
@@ -781,7 +831,7 @@ void LLWorldMapView::draw()
                         drawTracking( LLWorldMap::getInstance()->mUnknownLocation, loading_color, TRUE, "Loading...", "");
                 }
         }
-#endif
+        // #endif used to be here
         
         // turn off the scissor
         LLGLDisable no_scissor(GL_SCISSOR_TEST);
@@ -928,17 +978,25 @@ void LLWorldMapView::drawAgents()
 
 void LLWorldMapView::drawEvents()
 {
-    BOOL show_mature = gSavedSettings.getBOOL("ShowMatureEvents");
+        bool mature_enabled = gAgent.canAccessMature();
+        bool adult_enabled = gAgent.canAccessAdult();
+
+        BOOL show_pg = gSavedSettings.getBOOL("MapShowEvents");
+    BOOL show_mature = mature_enabled && gSavedSettings.getBOOL("ShowMatureEvents");
+        BOOL show_adult = adult_enabled && gSavedSettings.getBOOL("ShowAdultEvents");
 
     // First the non-selected events
     LLWorldMap::item_info_list_t::const_iterator e;
-    for (e = LLWorldMap::getInstance()->mPGEvents.begin(); e != LLWorldMap::getInstance()->mPGEvents.end(); ++e)
-    {
-        if (!e->mSelected)
-        {
-            drawGenericItem(*e, sEventImage);   
-        }
-    }
+        if (show_pg)
+        {
+                for (e = LLWorldMap::getInstance()->mPGEvents.begin(); e != LLWorldMap::getInstance()->mPGEvents.end(); ++e)
+                {
+                        if (!e->mSelected)
+                        {
+                                drawGenericItem(*e, sEventImage);   
+                        }
+                }
+        }
     if (show_mature)
     {
         for (e = LLWorldMap::getInstance()->mMatureEvents.begin(); e != LLWorldMap::getInstance()->mMatureEvents.end(); ++e)
@@ -949,15 +1007,27 @@ void LLWorldMapView::drawEvents()
             }
         }
     }
-
-    // Then the selected events
-    for (e = LLWorldMap::getInstance()->mPGEvents.begin(); e != LLWorldMap::getInstance()->mPGEvents.end(); ++e)
+        if (show_adult)
     {
-        if (e->mSelected)
+        for (e = LLWorldMap::getInstance()->mAdultEvents.begin(); e != LLWorldMap::getInstance()->mAdultEvents.end(); ++e)
         {
-            drawGenericItem(*e, sEventImage);
+            if (!e->mSelected)
+            {
+                drawGenericItem(*e, sEventAdultImage);       
+            }
         }
     }
+    // Then the selected events
+        if (show_pg)
+        {
+                for (e = LLWorldMap::getInstance()->mPGEvents.begin(); e != LLWorldMap::getInstance()->mPGEvents.end(); ++e)
+                {
+                        if (e->mSelected)
+                        {
+                                drawGenericItem(*e, sEventImage);
+                        }
+                }
+        }
     if (show_mature)
     {
         for (e = LLWorldMap::getInstance()->mMatureEvents.begin(); e != LLWorldMap::getInstance()->mMatureEvents.end(); ++e)
@@ -968,6 +1038,16 @@ void LLWorldMapView::drawEvents()
             }
         }
     }
+        if (show_adult)
+    {
+        for (e = LLWorldMap::getInstance()->mAdultEvents.begin(); e != LLWorldMap::getInstance()->mAdultEvents.end(); ++e)
+        {
+            if (e->mSelected)
+            {
+                drawGenericItem(*e, sEventAdultImage);       
+            }
+        }
+    }
 }
 
 
@@ -1033,7 +1113,7 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
         LLVector3 pos_local = globalPosToView( pos_global );
         S32 x = llround( pos_local.mV[VX] );
         S32 y = llround( pos_local.mV[VY] );
-        LLFontGL* font = LLFontGL::sSansSerifSmall;
+        LLFontGL* font = LLFontGL::getFontSansSerifSmall();
         S32 text_x = x;
         S32 text_y = (S32)(y - sTrackCircleImage->getHeight()/2 - font->getLineHeight());
 
@@ -1270,7 +1350,7 @@ void LLWorldMapView::drawIconName(F32 x_pixels,
                                                  - VERT_PAD);
 
         // render text
-        LLFontGL::sSansSerif->renderUTF8(first_line, 0,
+        LLFontGL::getFontSansSerif()->renderUTF8(first_line, 0,
                 text_x,
                 text_y,
                 color,
@@ -1278,10 +1358,10 @@ void LLWorldMapView::drawIconName(F32 x_pixels,
                 LLFontGL::TOP,
                 LLFontGL::DROP_SHADOW);
 
-        text_y -= llround(LLFontGL::sSansSerif->getLineHeight());
+        text_y -= llround(LLFontGL::getFontSansSerif()->getLineHeight());
 
         // render text
-        LLFontGL::sSansSerif->renderUTF8(second_line, 0,
+        LLFontGL::getFontSansSerif()->renderUTF8(second_line, 0,
                 text_x,
                 text_y,
                 color,
@@ -1561,6 +1641,10 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
         {
                 (*it).mSelected = FALSE;
         }
+        for (it = LLWorldMap::getInstance()->mAdultEvents.begin(); it != LLWorldMap::getInstance()->mAdultEvents.end(); ++it)
+        {
+                (*it).mSelected = FALSE;
+        }
         for (it = LLWorldMap::getInstance()->mLandForSale.begin(); it != LLWorldMap::getInstance()->mLandForSale.end(); ++it)
         {
                 (*it).mSelected = FALSE;
@@ -1581,19 +1665,34 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
                                 return;
                         }
                 }
-                if (gSavedSettings.getBOOL("ShowMatureEvents"))
+        }
+        if (gSavedSettings.getBOOL("ShowMatureEvents"))
+        {
+                for (it = LLWorldMap::getInstance()->mMatureEvents.begin(); it != LLWorldMap::getInstance()->mMatureEvents.end(); ++it)
                 {
-                        for (it = LLWorldMap::getInstance()->mMatureEvents.begin(); it != LLWorldMap::getInstance()->mMatureEvents.end(); ++it)
+                        LLItemInfo& event = *it;
+
+                        if (checkItemHit(x, y, event, id, false))
                         {
-                                LLItemInfo& event = *it;
+                                *hit_type = MAP_ITEM_MATURE_EVENT;
+                                mItemPicked = TRUE;
+                                gFloaterWorldMap->trackEvent(event);
+                                return;
+                        }
+                }
+        }
+        if (gSavedSettings.getBOOL("ShowAdultEvents"))
+        {
+                for (it = LLWorldMap::getInstance()->mAdultEvents.begin(); it != LLWorldMap::getInstance()->mAdultEvents.end(); ++it)
+                {
+                        LLItemInfo& event = *it;
 
-                                if (checkItemHit(x, y, event, id, false))
-                                {
-                                        *hit_type = MAP_ITEM_MATURE_EVENT;
-                                        mItemPicked = TRUE;
-                                        gFloaterWorldMap->trackEvent(event);
-                                        return;
-                                }
+                        if (checkItemHit(x, y, event, id, false))
+                        {
+                                *hit_type = MAP_ITEM_ADULT_EVENT;
+                                mItemPicked = TRUE;
+                                gFloaterWorldMap->trackEvent(event);
+                                return;
                         }
                 }
         }
@@ -1611,8 +1710,19 @@ void LLWorldMapView::handleClick(S32 x, S32 y, MASK mask,
                                 return;
                         }
                 }
-        }
+                
+                for (it = LLWorldMap::getInstance()->mLandForSaleAdult.begin(); it != LLWorldMap::getInstance()->mLandForSaleAdult.end(); ++it)
+                {
+                        LLItemInfo& land = *it;
 
+                        if (checkItemHit(x, y, land, id, true))
+                        {
+                                *hit_type = MAP_ITEM_LAND_FOR_SALE_ADULT;
+                                mItemPicked = TRUE;
+                                return;
+                        }
+                }
+        }
         // If we get here, we haven't clicked on an icon
 
         gFloaterWorldMap->trackLocation(pos_global);
@@ -1678,43 +1788,59 @@ BOOL LLWorldMapView::handleMouseUp( S32 x, S32 y, MASK mask )
         return FALSE;
 }
 
-void LLWorldMapView::updateBlock(S32 block_x, S32 block_y)
+U32 LLWorldMapView::updateBlock(S32 block_x, S32 block_y)
 {
+        U32 blocks_requested = 0;
         S32 offset = block_x | (block_y * MAP_BLOCK_RES);
         if (!LLWorldMap::getInstance()->mMapBlockLoaded[LLWorldMap::getInstance()->mCurrentMap][offset])
         {
 //              llinfos << "Loading Block (" << block_x << "," << block_y << ")" << llendl;
                 LLWorldMap::getInstance()->sendMapBlockRequest(block_x << 3, block_y << 3, (block_x << 3) + 7, (block_y << 3) + 7);
                 LLWorldMap::getInstance()->mMapBlockLoaded[LLWorldMap::getInstance()->mCurrentMap][offset] = TRUE;
+                blocks_requested++;
         }
+        return blocks_requested;
 }
 
-void LLWorldMapView::updateVisibleBlocks()
+U32 LLWorldMapView::updateVisibleBlocks()
 {
         if (gMapScale < SIM_MAP_SCALE)
         {
                 // We don't care what is loaded if we're zoomed out
-                return;
+                return 0;
         }
-        // check if we've loaded the 9 potentially visible zones
-        LLVector3d camera_global = gAgent.getCameraPositionGlobal();
 
+        LLVector3d camera_global = gAgent.getCameraPositionGlobal();
+        
+        F32 pixels_per_region = gMapScale;
+        const S32 width = getRect().getWidth();
+        const S32 height = getRect().getHeight();
         // Convert pan to sim coordinates
-        S32 world_center_x = S32((-sPanX / gMapScale) + (camera_global.mdV[0] / REGION_WIDTH_METERS));
-        S32 world_center_y = S32((-sPanY / gMapScale) + (camera_global.mdV[1] / REGION_WIDTH_METERS));
-
+        S32 world_center_x_lo = S32(((-sPanX - width/2) / pixels_per_region) + (camera_global.mdV[0] / REGION_WIDTH_METERS));
+        S32 world_center_x_hi = S32(((-sPanX + width/2) / pixels_per_region) + (camera_global.mdV[0] / REGION_WIDTH_METERS));
+        S32 world_center_y_lo = S32(((-sPanY - height/2) / pixels_per_region) + (camera_global.mdV[1] / REGION_WIDTH_METERS));
+        S32 world_center_y_hi = S32(((-sPanY + height/2)/ pixels_per_region) + (camera_global.mdV[1] / REGION_WIDTH_METERS));
+        
         // Find the corresponding 8x8 block
-        S32 world_block_x = world_center_x >> 3;
-        S32 world_block_y = world_center_y >> 3;
+        S32 world_block_x_lo = world_center_x_lo >> 3;
+        S32 world_block_x_hi = world_center_x_hi >> 3;
+        S32 world_block_y_lo = world_center_y_lo >> 3;
+        S32 world_block_y_hi = world_center_y_hi >> 3;
+        
+        U32 blocks_requested = 0;
+        const U32 max_blocks_requested = 9;
 
-        for (S32 block_x = llmax(world_block_x-1, 0); block_x <= llmin(world_block_x+1, MAP_BLOCK_RES-1); ++block_x)
+        for (S32 block_x = llmax(world_block_x_lo, 0); block_x <= llmin(world_block_x_hi, MAP_BLOCK_RES-1); ++block_x)
         {
-                for (S32 block_y = llmax(world_block_y-1, 0); block_y <= llmin(world_block_y+1, MAP_BLOCK_RES-1); ++block_y)
+                for (S32 block_y = llmax(world_block_y_lo, 0); block_y <= llmin(world_block_y_hi, MAP_BLOCK_RES-1); ++block_y)
                 {
-                        updateBlock(block_x, block_y);
+                        blocks_requested += updateBlock(block_x, block_y);
+                        if (blocks_requested >= max_blocks_requested)
+                                return blocks_requested;
                 }
         }
-}
+        return blocks_requested;
+} 
 
 BOOL LLWorldMapView::handleHover( S32 x, S32 y, MASK mask )
 {
@@ -1776,6 +1902,7 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
                 {
                 case MAP_ITEM_PG_EVENT:
                 case MAP_ITEM_MATURE_EVENT:
+                case MAP_ITEM_ADULT_EVENT:
                         {
                                 gFloaterWorldMap->close();
                                 // This is an ungainly hack
@@ -1788,6 +1915,7 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
                                 break;
                         }
                 case MAP_ITEM_LAND_FOR_SALE:
+                case MAP_ITEM_LAND_FOR_SALE_ADULT:
                         {
                                 gFloaterWorldMap->close();
                                 LLFloaterDirectory::showLandForSale(id);