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, 46 insertions, 23 deletions

diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 2cecd89..7ec5da2 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.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,
@@ -50,6 +51,7 @@
 #include "llfocusmgr.h"
 #include "llbutton.h"
 #include "llcombobox.h"
+#include "lleconomy.h"
 #include "llsliderctrl.h"
 #include "llspinctrl.h"
 #include "llviewercontrol.h"
@@ -235,7 +237,7 @@ LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) :
         mImageScaled[0] = FALSE;
         mImageScaled[1] = FALSE;
 
-        mMaxImageSize = MAX_IMAGE_SIZE ;
+        mMaxImageSize = MAX_SNAPSHOT_IMAGE_SIZE ;
         mKeepAspectRatio = gSavedSettings.getBOOL("KeepAspectForSnapshot") ;
         mThumbnailUpdateLock = FALSE ;
         mThumbnailUpToDate   = FALSE ;
@@ -254,13 +256,13 @@ LLSnapshotLivePreview::~LLSnapshotLivePreview()
 
 void LLSnapshotLivePreview::setMaxImageSize(S32 size) 
 {
-        if(size < MAX_IMAGE_SIZE)
+        if(size < MAX_SNAPSHOT_IMAGE_SIZE)
         {
                 mMaxImageSize = size;
         }
         else
         {
-                mMaxImageSize = MAX_IMAGE_SIZE ;
+                mMaxImageSize = MAX_SNAPSHOT_IMAGE_SIZE ;
         }
 }
 
@@ -370,7 +372,7 @@ void LLSnapshotLivePreview::drawPreviewRect(S32 offset_x, S32 offset_y)
         glLineWidth(2.0f * line_width) ;
         LLColor4 color(0.0f, 0.0f, 0.0f, 1.0f) ;
         gl_rect_2d( mPreviewRect.mLeft + offset_x, mPreviewRect.mTop + offset_y,
-                        mPreviewRect.mRight + offset_x, mPreviewRect.mBottom + offset_y, color, FALSE ) ;
+                                mPreviewRect.mRight + offset_x, mPreviewRect.mBottom + offset_y, color, FALSE ) ;
         glLineWidth(line_width) ;
 
         //draw four alpha rectangles to cover areas outside of the snapshot image
@@ -384,20 +386,20 @@ void LLSnapshotLivePreview::drawPreviewRect(S32 offset_x, S32 offset_y)
                         dwr = mThumbnailWidth - mPreviewRect.getWidth() - dwl ;
 
                         gl_rect_2d(mPreviewRect.mLeft + offset_x - dwl, mPreviewRect.mTop + offset_y,
-                        mPreviewRect.mLeft + offset_x, mPreviewRect.mBottom + offset_y, alpha_color, TRUE ) ;
+                                mPreviewRect.mLeft + offset_x, mPreviewRect.mBottom + offset_y, alpha_color, TRUE ) ;
                         gl_rect_2d( mPreviewRect.mRight + offset_x, mPreviewRect.mTop + offset_y,
-                        mPreviewRect.mRight + offset_x + dwr, mPreviewRect.mBottom + offset_y, alpha_color, TRUE ) ;
+                                mPreviewRect.mRight + offset_x + dwr, mPreviewRect.mBottom + offset_y, alpha_color, TRUE ) ;
                 }
 
                 if(mThumbnailHeight > mPreviewRect.getHeight())
                 {
                         S32 dh = (mThumbnailHeight - mPreviewRect.getHeight()) >> 1 ;
                         gl_rect_2d(mPreviewRect.mLeft + offset_x - dwl, mPreviewRect.mBottom + offset_y ,
-                        mPreviewRect.mRight + offset_x + dwr, mPreviewRect.mBottom + offset_y - dh, alpha_color, TRUE ) ;
+                                mPreviewRect.mRight + offset_x + dwr, mPreviewRect.mBottom + offset_y - dh, alpha_color, TRUE ) ;
 
                         dh = mThumbnailHeight - mPreviewRect.getHeight() - dh ;
                         gl_rect_2d( mPreviewRect.mLeft + offset_x - dwl, mPreviewRect.mTop + offset_y + dh,
-                        mPreviewRect.mRight + offset_x + dwr, mPreviewRect.mTop + offset_y, alpha_color, TRUE ) ;
+                                mPreviewRect.mRight + offset_x + dwr, mPreviewRect.mTop + offset_y, alpha_color, TRUE ) ;
                 }
         }
 }
@@ -507,7 +509,8 @@ void LLSnapshotLivePreview::draw()
                                 gGL.end();
                         }
 
-                        if (mShineAnimTimer.getElapsedTimeF32() > SHINE_TIME)
+                        // if we're at the end of the animation, stop
+                        if (shine_interp >= 1.f)
                         {
                                 mShineAnimTimer.stop();
                         }
@@ -876,9 +879,17 @@ BOOL LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                         }
 
                         previewp->mViewerImage[previewp->mCurImageIndex] = new LLImageGL(scaled, FALSE);
-                        previewp->mViewerImage[previewp->mCurImageIndex]->setMipFilterNearest(previewp->getSnapshotType() != SNAPSHOT_TEXTURE);
-                        gGL.getTexUnit(0)->bind(previewp->mViewerImage[previewp->mCurImageIndex]);
-                        previewp->mViewerImage[previewp->mCurImageIndex]->setClamp(TRUE, TRUE);
+                        LLPointer<LLImageGL> curr_preview_image = previewp->mViewerImage[previewp->mCurImageIndex];
+                        gGL.getTexUnit(0)->bind(curr_preview_image);
+                        if (previewp->getSnapshotType() != SNAPSHOT_TEXTURE)
+                        {
+                                curr_preview_image->setFilteringOption(LLTexUnit::TFO_POINT);
+                        }
+                        else
+                        {
+                                curr_preview_image->setFilteringOption(LLTexUnit::TFO_ANISOTROPIC);
+                        }
+                        curr_preview_image->setAddressMode(LLTexUnit::TAM_CLAMP);
 
                         previewp->mSnapshotUpToDate = TRUE;
                         previewp->generateThumbnailImage(TRUE) ;
@@ -967,20 +978,26 @@ void LLSnapshotLivePreview::saveTexture()
                 gAgent.buildLocationString(pos_string);
                 std::string who_took_it;
                 gAgent.buildFullname(who_took_it);
+                LLAssetStorage::LLStoreAssetCallback callback = NULL;
+                S32 expected_upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
+                void *userdata = NULL;
                 upload_new_resource(tid,        // tid
-                                                        LLAssetType::AT_TEXTURE,
-                                                        "Snapshot : " + pos_string,
-                                                        "Taken by " + who_took_it + " at " + pos_string,
-                                                        0,
-                                                        LLAssetType::AT_SNAPSHOT_CATEGORY,
-                                                        LLInventoryType::IT_SNAPSHOT,
-                                                        PERM_ALL,
-                                                        "Snapshot : " + pos_string);
+                                    LLAssetType::AT_TEXTURE,
+                                    "Snapshot : " + pos_string,
+                                    "Taken by " + who_took_it + " at " + pos_string,
+                                    0,
+                                    LLAssetType::AT_SNAPSHOT_CATEGORY,
+                                    LLInventoryType::IT_SNAPSHOT,
+                                    PERM_ALL,  // Note: Snapshots to inventory is a special case of content upload
+                                    PERM_NONE, // that ignores the user's premissions preferences and continues to
+                                    PERM_NONE, // always use these fairly permissive hard-coded initial perms. - MG
+                                    "Snapshot : " + pos_string,
+                                    callback, expected_upload_cost, userdata);
                 gViewerWindow->playSnapshotAnimAndSound();
         }
         else
         {
-                gViewerWindow->alertXml("ErrorEncodingSnapshot");
+                LLNotifications::instance().add("ErrorEncodingSnapshot");
                 llwarns << "Error encoding snapshot" << llendl;
         }
 
@@ -1288,6 +1305,9 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
         LLLocale locale(LLLocale::USER_LOCALE);
         std::string bytes_string;
         LLResMgr::getInstance()->getIntegerString(bytes_string, (previewp->getDataSize()) >> 10 );
+        S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
+        floater->childSetLabelArg("texture", "[AMOUNT]", llformat("%d",upload_cost));
+        floater->childSetLabelArg("upload_btn", "[AMOUNT]", llformat("%d",upload_cost));
         floater->childSetTextArg("file_size_label", "[SIZE]", got_snap ? bytes_string : floater->getString("unknown"));
         floater->childSetColor("file_size_label", 
                 shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD 
@@ -1462,7 +1482,7 @@ void LLFloaterSnapshot::Impl::onClickMore(void* data)
                 if(getPreviewView(view))
                 {
                         getPreviewView(view)->setThumbnailImageSize() ;
-        }
+                }
         }
 }
 void LLFloaterSnapshot::Impl::onClickLess(void* data)
@@ -2194,6 +2214,8 @@ void LLFloaterSnapshot::draw()
 void LLFloaterSnapshot::onClose(bool app_quitting)
 {
         gSnapshotFloaterView->setEnabled(FALSE);
+        // Set invisible so it doesn't eat tooltips. JC
+        gSnapshotFloaterView->setVisible(FALSE);
         destroy();
 }
 
@@ -2222,6 +2244,7 @@ void LLFloaterSnapshot::show(void*)
         sInstance->open();              /* Flawfinder: ignore */
         sInstance->focusFirstItem(FALSE);
         gSnapshotFloaterView->setEnabled(TRUE);
+        gSnapshotFloaterView->setVisible(TRUE);
         gSnapshotFloaterView->adjustToFitScreen(sInstance, FALSE);
 }