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, 79 insertions, 60 deletions

diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 94a5372..3b724e2 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.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,
@@ -174,7 +175,7 @@ private:
 
 bool LLTextureCacheLocalFileWorker::doRead()
 {
-        S32 local_size = ll_apr_file_size(mFileName, mCache->getFileAPRPool());
+        S32 local_size = LLAPRFile::size(mFileName, mCache->getLocalAPRFilePool());
 
         if (local_size > 0 && mFileName.size() > 4)
         {
@@ -247,8 +248,9 @@ bool LLTextureCacheLocalFileWorker::doRead()
                 mDataSize = local_size;
         }
         mReadData = new U8[mDataSize];
-        S32 bytes_read = ll_apr_file_read_ex(mFileName, mCache->getFileAPRPool(),
-                                                                                 mReadData, mOffset, mDataSize);
+        
+        S32 bytes_read = LLAPRFile::readEx(mFileName, mReadData, mOffset, mDataSize, mCache->getLocalAPRFilePool());    
+
         if (bytes_read != mDataSize)
         {
 //              llwarns << "Error reading file from local cache: " << mFileName
@@ -316,11 +318,11 @@ bool LLTextureCacheRemoteWorker::doRead()
         {
                 std::string filename = mCache->getLocalFileName(mID);   
                 local_filename = filename + ".j2c";
-                local_size = ll_apr_file_size(local_filename, mCache->getFileAPRPool());
+                local_size = LLAPRFile::size(local_filename, mCache->getLocalAPRFilePool());
                 if (local_size == 0)
                 {
                         local_filename = filename + ".tga";
-                        local_size = ll_apr_file_size(local_filename, mCache->getFileAPRPool());
+                        local_size = LLAPRFile::size(local_filename, mCache->getLocalAPRFilePool());
                         if (local_size > 0)
                         {
                                 mImageFormat = IMG_CODEC_TGA;
@@ -388,8 +390,8 @@ bool LLTextureCacheRemoteWorker::doRead()
                         mDataSize = local_size;
                 }
                 mReadData = new U8[mDataSize];
-                S32 bytes_read = ll_apr_file_read_ex(local_filename, mCache->getFileAPRPool(),
-                                                                                         mReadData, mOffset, mDataSize);
+                S32 bytes_read = LLAPRFile::readEx(local_filename, 
+                                                                                         mReadData, mOffset, mDataSize, mCache->getLocalAPRFilePool());
                 if (bytes_read != mDataSize)
                 {
 //                      llwarns << "Error reading file from local cache: " << local_filename
@@ -482,8 +484,8 @@ bool LLTextureCacheRemoteWorker::doRead()
                 S32 offset = idx * TEXTURE_CACHE_ENTRY_SIZE + mOffset;
                 S32 size = TEXTURE_CACHE_ENTRY_SIZE - mOffset;
                 mReadData = new U8[size];
-                S32 bytes_read = ll_apr_file_read_ex(mCache->mHeaderDataFileName, mCache->getFileAPRPool(),
-                                                                                         mReadData, offset, size);
+                S32 bytes_read = LLAPRFile::readEx(mCache->mHeaderDataFileName, 
+                                                                                         mReadData, offset, size, mCache->getLocalAPRFilePool());
                 if (bytes_read != size)
                 {
 //                      llwarns << "LLTextureCacheWorker: "  << mID
@@ -509,7 +511,7 @@ bool LLTextureCacheRemoteWorker::doRead()
                 if (mFileHandle == LLLFSThread::nullHandle())
                 {
                         std::string filename = mCache->getTextureFileName(mID);
-                        S32 filesize = ll_apr_file_size(filename, mCache->getFileAPRPool());
+                        S32 filesize = LLAPRFile::size(filename, mCache->getLocalAPRFilePool());
                         if (filesize > mOffset)
                         {
                                 S32 datasize = TEXTURE_CACHE_ENTRY_SIZE + filesize;
@@ -568,7 +570,7 @@ bool LLTextureCacheRemoteWorker::doRead()
                 }
 #else
                 std::string filename = mCache->getTextureFileName(mID);
-                S32 filesize = ll_apr_file_size(filename, mCache->getFileAPRPool());
+                S32 filesize = LLAPRFile::size(filename, mCache->getLocalAPRFilePool());
                 S32 bytes_read = 0;
                 if (filesize > mOffset)
                 {
@@ -588,9 +590,10 @@ bool LLTextureCacheRemoteWorker::doRead()
                                 delete[] mReadData;
                         }
                         mReadData = data;
-                        bytes_read = ll_apr_file_read_ex(filename, mCache->getFileAPRPool(),
+                        bytes_read = LLAPRFile::readEx(filename, 
                                                                                          mReadData + data_offset,
-                                                                                         file_offset, file_size);
+                                                                                         file_offset, file_size,
+                                                                                         mCache->getLocalAPRFilePool());
                         if (bytes_read != file_size)
                         {
 //                              llwarns << "LLTextureCacheWorker: "  << mID
@@ -693,8 +696,7 @@ bool LLTextureCacheRemoteWorker::doWrite()
                 llassert_always(mOffset < TEXTURE_CACHE_ENTRY_SIZE);
                 S32 offset = idx * TEXTURE_CACHE_ENTRY_SIZE + mOffset;
                 S32 size = TEXTURE_CACHE_ENTRY_SIZE - mOffset;
-                S32 bytes_written = ll_apr_file_write_ex(mCache->mHeaderDataFileName, mCache->getFileAPRPool(),
-                                                                                                 mWriteData, offset, size);
+                S32 bytes_written = LLAPRFile::writeEx(mCache->mHeaderDataFileName, mWriteData, offset, size, mCache->getLocalAPRFilePool());           
 
                 if (bytes_written <= 0)
                 {
@@ -769,9 +771,11 @@ bool LLTextureCacheRemoteWorker::doWrite()
                 if (file_size > 0 && mCache->appendToTextureEntryList(mID, file_size))
                 {
                         std::string filename = mCache->getTextureFileName(mID);
-                        bytes_written = ll_apr_file_write_ex(filename, mCache->getFileAPRPool(),
+                        
+                        bytes_written = LLAPRFile::writeEx(filename, 
                                                                                                  mWriteData + data_offset,
-                                                                                                 file_offset, file_size);
+                                                                                                 file_offset, file_size,
+                                                                                                 mCache->getLocalAPRFilePool());
                         if (bytes_written <= 0)
                         {
                                 mDataSize = -1; // failed
@@ -792,13 +796,14 @@ bool LLTextureCacheRemoteWorker::doWrite()
 //virtual
 bool LLTextureCacheWorker::doWork(S32 param)
 {
+// *TODO reenable disabled apr_pool usage disabled due to maint-render-9 merge breakage -brad
         //allocate a new local apr_pool
-        LLAPRPool pool ;
+//      LLAPRPool pool ;
 
         //save the current mFileAPRPool to avoid breaking anything.
-        apr_pool_t* old_pool = mCache->getFileAPRPool() ;
+//      apr_pool_t* old_pool = mCache->getFileAPRPool() ;
         //make mFileAPRPool to point to the local one
-        mCache->setFileAPRPool(pool.getAPRPool()) ;
+//      mCache->setFileAPRPool(pool.getAPRPool()) ;
 
         bool res = false;
         if (param == 0) // read
@@ -815,7 +820,7 @@ bool LLTextureCacheWorker::doWork(S32 param)
         }
 
         //set mFileAPRPool back, the local one will be released automatically.
-        mCache->setFileAPRPool(old_pool) ;
+//      mCache->setFileAPRPool(old_pool) ;
 
         return res;
 }
@@ -879,22 +884,20 @@ void LLTextureCacheWorker::endWork(S32 param, bool aborted)
 
 LLTextureCache::LLTextureCache(bool threaded)
         : LLWorkerThread("TextureCache", threaded),
-          mWorkersMutex(getAPRPool()),
-          mHeaderMutex(getAPRPool()),
-          mListMutex(getAPRPool()),
-          mFileAPRPool(NULL),
+          mWorkersMutex(NULL),
+          mHeaderMutex(NULL),
+          mListMutex(NULL),
           mReadOnly(FALSE),
           mTexturesSizeTotal(0),
           mDoPurge(FALSE)
 {
-        apr_pool_create(&mFileAPRPool, NULL);
 }
 
 LLTextureCache::~LLTextureCache()
 {
         purgeTextureFilesTimeSliced(TRUE); // force-flush all pending file deletes
 
-        apr_pool_destroy(mFileAPRPool);
+        // apr_pool_destroy(mFileAPRPool);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -970,8 +973,10 @@ bool LLTextureCache::appendToTextureEntryList(const LLUUID& id, S32 bodysize)
                 {
                         llassert_always(bodysize > 0);
                         Entry* entry = new Entry(id, bodysize, time(NULL));
-                        ll_apr_file_write_ex(mTexturesDirEntriesFileName, getFileAPRPool(),
-                                                                 (U8*)entry, -1, 1*sizeof(Entry));
+
+                        LLAPRFile::writeEx(mTexturesDirEntriesFileName,
+                                                                 (U8*)entry, -1, 1*sizeof(Entry),
+                                                                 getLocalAPRFilePool());                        
                         delete entry;
                         if (iter != mTexturesSizeMap.end())
                         {
@@ -1019,8 +1024,8 @@ void LLTextureCache::purgeCache(ELLPath location)
         {
                 setDirNames(location);
         
-                ll_apr_file_remove(mHeaderEntriesFileName, NULL);
-                ll_apr_file_remove(mHeaderDataFileName, NULL);
+                LLAPRFile::remove(mHeaderEntriesFileName, getLocalAPRFilePool());
+                LLAPRFile::remove(mHeaderDataFileName, getLocalAPRFilePool());
         }
         purgeAllTextures(true);
 }
@@ -1082,15 +1087,16 @@ struct lru_data
 };
 
 // Called from either the main thread or the worker thread
-void LLTextureCache::readHeaderCache(apr_pool_t* poolp)
+void LLTextureCache::readHeaderCache()
 {
         LLMutexLock lock(&mHeaderMutex);
         mHeaderEntriesInfo.mVersion = 0.f;
         mHeaderEntriesInfo.mEntries = 0;
-        if (ll_apr_file_exists(mHeaderEntriesFileName, poolp))
+        if (LLAPRFile::isExist(mHeaderEntriesFileName, getLocalAPRFilePool()))
         {
-                ll_apr_file_read_ex(mHeaderEntriesFileName, poolp,
-                                                        (U8*)&mHeaderEntriesInfo, 0, sizeof(EntriesInfo));
+                LLAPRFile::readEx(mHeaderEntriesFileName,
+                                                        (U8*)&mHeaderEntriesInfo, 0, sizeof(EntriesInfo),
+                                                        getLocalAPRFilePool());
         }
         if (mHeaderEntriesInfo.mVersion != sHeaderCacheVersion)
         {
@@ -1098,8 +1104,10 @@ void LLTextureCache::readHeaderCache(apr_pool_t* poolp)
                 {
                         // Info with 0 entries
                         mHeaderEntriesInfo.mVersion = sHeaderCacheVersion;
-                        ll_apr_file_write_ex(mHeaderEntriesFileName, poolp,
-                                                                 (U8*)&mHeaderEntriesInfo, 0, sizeof(EntriesInfo));
+
+                        LLAPRFile::writeEx(mHeaderEntriesFileName, 
+                                                                 (U8*)&mHeaderEntriesInfo, 0, sizeof(EntriesInfo),
+                                                                 getLocalAPRFilePool());
                 }
         }
         else
@@ -1108,8 +1116,11 @@ void LLTextureCache::readHeaderCache(apr_pool_t* poolp)
                 if (num_entries)
                 {
                         Entry* entries = new Entry[num_entries];
-                        ll_apr_file_read_ex(mHeaderEntriesFileName, poolp,
-                                                                (U8*)entries, sizeof(EntriesInfo), num_entries*sizeof(Entry));
+                        {
+                                LLAPRFile::readEx(mHeaderEntriesFileName, 
+                                                                (U8*)entries, sizeof(EntriesInfo), num_entries*sizeof(Entry),
+                                                                getLocalAPRFilePool());
+                        }
                         typedef std::set<lru_data*, lru_data::Compare> lru_set_t;
                         lru_set_t lru;
                         for (S32 i=0; i<num_entries; i++)
@@ -1154,7 +1165,7 @@ void LLTextureCache::purgeAllTextures(bool purge_directories)
                                 LLFile::rmdir(dirname);
                         }
                 }
-                ll_apr_file_remove(mTexturesDirEntriesFileName, NULL);
+                LLAPRFile::remove(mTexturesDirEntriesFileName, getLocalAPRFilePool());
                 if (purge_directories)
                 {
                         LLFile::rmdir(mTexturesDirName);
@@ -1175,7 +1186,7 @@ void LLTextureCache::purgeTextures(bool validate)
 
         LLMutexLock lock(&mHeaderMutex);
         
-        S32 filesize = ll_apr_file_size(mTexturesDirEntriesFileName, NULL);
+        S32 filesize = LLAPRFile::size(mTexturesDirEntriesFileName, getLocalAPRFilePool());
         S32 num_entries = filesize / sizeof(Entry);
         if (num_entries * (S32)sizeof(Entry) != filesize)
         {
@@ -1189,8 +1200,9 @@ void LLTextureCache::purgeTextures(bool validate)
         }
         
         Entry* entries = new Entry[num_entries];
-        S32 bytes_read = ll_apr_file_read_ex(mTexturesDirEntriesFileName, NULL,
-                                                                                 (U8*)entries, 0, num_entries*sizeof(Entry));
+        S32 bytes_read = LLAPRFile::readEx(mTexturesDirEntriesFileName, 
+                                                                                 (U8*)entries, 0, num_entries*sizeof(Entry),
+                                                                                 getLocalAPRFilePool());        
         if (bytes_read != filesize)
         {
                 LL_WARNS("TextureCache") << "Bad cache file (2): " << mTexturesDirEntriesFileName << " Purging." << LL_ENDL;
@@ -1249,7 +1261,7 @@ void LLTextureCache::purgeTextures(bool validate)
                         if (uuididx == validate_idx)
                         {
                                 LL_DEBUGS("TextureCache") << "Validating: " << filename << "Size: " << entries[idx].mSize << LL_ENDL;
-                                S32 bodysize = ll_apr_file_size(filename, NULL);
+                                S32 bodysize = LLAPRFile::size(filename, getLocalAPRFilePool());
                                 if (bodysize != entries[idx].mSize)
                                 {
                                         LL_WARNS("TextureCache") << "TEXTURE CACHE BODY HAS BAD SIZE: " << bodysize << " != " << entries[idx].mSize
@@ -1283,9 +1295,10 @@ void LLTextureCache::purgeTextures(bool validate)
                 << num_entries << " (" << num_entries*sizeof(Entry)/1024 << "KB)"
                 << LL_ENDL;
         
-        ll_apr_file_remove(mTexturesDirEntriesFileName, NULL);
-        ll_apr_file_write_ex(mTexturesDirEntriesFileName, NULL,
-                                                 (U8*)&entries[0], 0, num_entries*sizeof(Entry));
+        LLAPRFile::remove(mTexturesDirEntriesFileName, getLocalAPRFilePool());
+        LLAPRFile::writeEx(mTexturesDirEntriesFileName, 
+                                                 (U8*)&entries[0], 0, num_entries*sizeof(Entry),
+                                                 getLocalAPRFilePool());
         
         mTexturesSizeTotal = 0;
         mTexturesSizeMap.clear();
@@ -1332,7 +1345,7 @@ void LLTextureCache::purgeTextureFilesTimeSliced(BOOL force_all)
         for (LLTextureCache::filename_list_t::iterator iter = mFilesToDelete.begin(); iter!=mFilesToDelete.end(); ) 
         {       
                 LLTextureCache::filename_list_t::iterator iter2 = iter++;
-                ll_apr_file_remove(*iter2, NULL);
+                LLAPRFile::remove(*iter2, NULL);
                 mFilesToDelete.erase(iter2);
                 howmany++;
 
@@ -1402,8 +1415,9 @@ S32 LLTextureCache::getHeaderCacheEntry(const LLUUID& id, bool touch, S32* image
                                 idx = mHeaderEntriesInfo.mEntries++;
                                 mHeaderIDMap[id] = idx;
                                 // Update Info
-                                ll_apr_file_write_ex(mHeaderEntriesFileName, getFileAPRPool(),
-                                                                        (U8*)&mHeaderEntriesInfo, 0, sizeof(EntriesInfo));
+                                LLAPRFile::writeEx(mHeaderEntriesFileName, 
+                                                                        (U8*)&mHeaderEntriesInfo, 0, sizeof(EntriesInfo),
+                                                                        getLocalAPRFilePool());
                         }
                         else if (!mLRU.empty())
                         {
@@ -1428,8 +1442,9 @@ S32 LLTextureCache::getHeaderCacheEntry(const LLUUID& id, bool touch, S32* image
                                 llassert_always(imagesize && *imagesize > 0);
                                 Entry* entry = new Entry(id, *imagesize, time(NULL));
                                 S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry);
-                                ll_apr_file_write_ex(mHeaderEntriesFileName, getFileAPRPool(),
-                                                                         (U8*)entry, offset, sizeof(Entry));
+                                LLAPRFile::writeEx(mHeaderEntriesFileName, 
+                                                                         (U8*)entry, offset, sizeof(Entry),
+                                                                         getLocalAPRFilePool());
                                 delete entry;
                         }
                         else if (imagesize)
@@ -1437,15 +1452,17 @@ S32 LLTextureCache::getHeaderCacheEntry(const LLUUID& id, bool touch, S32* image
                                 // Get the image size
                                 Entry entry;
                                 S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry);
-                                ll_apr_file_read_ex(mHeaderEntriesFileName, getFileAPRPool(),
-                                                                        (U8*)&entry, offset, sizeof(Entry));
+
+                                LLAPRFile::readEx(mHeaderEntriesFileName, 
+                                                                        (U8*)&entry, offset, sizeof(Entry),
+                                                                        getLocalAPRFilePool());
                                 *imagesize = entry.mSize;
                         }
                 }
         }
         if (retry)
         {
-                readHeaderCache(getFileAPRPool()); // updates the lru
+                readHeaderCache(); // updates the lru
                 llassert_always(!mLRU.empty() || mHeaderEntriesInfo.mEntries < sCacheMaxEntries);
                 idx = getHeaderCacheEntry(id, touch, imagesize); // assert above ensures no inf. recursion
         }
@@ -1519,7 +1536,7 @@ LLTextureCache::handle_t LLTextureCache::writeToCache(const LLUUID& id, U32 prio
         {
                 // NOTE: This may cause an occasional hiccup,
                 //  but it really needs to be done on the control thread
-                //  (i.e. here)
+                //  (i.e. here)         
                 purgeTextures(false);
                 mDoPurge = FALSE;
         }
@@ -1589,8 +1606,10 @@ bool LLTextureCache::removeHeaderCacheEntry(const LLUUID& id)
                 {
                         Entry* entry = new Entry(id, -1, time(NULL));
                         S32 offset = sizeof(EntriesInfo) + idx * sizeof(Entry);
-                        ll_apr_file_write_ex(mHeaderEntriesFileName, NULL,
-                                                                 (U8*)entry, offset, sizeof(Entry));
+
+                        LLAPRFile::writeEx(mHeaderEntriesFileName,
+                                                                 (U8*)entry, offset, sizeof(Entry),
+                                                                 getLocalAPRFilePool());                        
                         delete entry;
                         mLRU[idx] = id;
                         mHeaderIDMap.erase(id);
@@ -1607,7 +1626,7 @@ void LLTextureCache::removeFromCache(const LLUUID& id)
         if (!mReadOnly)
         {
                 removeHeaderCacheEntry(id);
-                ll_apr_file_remove(getTextureFileName(id), NULL);
+                LLAPRFile::remove(getTextureFileName(id), getLocalAPRFilePool());
         }
 }