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, 265 insertions, 61 deletions

diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index 4a00a48..9f07e0f 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.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,
@@ -32,7 +33,10 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llfloaterhtmlhelp.h"
+#include "llfloaterhtml.h"
 
+#include "llchat.h"
+#include "llfloaterchat.h"
 #include "llparcel.h"
 #include "lluictrlfactory.h"
 #include "llwebbrowserctrl.h"
@@ -40,6 +44,7 @@
 #include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
 #include "llweb.h"
+#include "lltrans.h"
 #include "llui.h"
 #include "roles_constants.h"
 
@@ -49,13 +54,6 @@
 #include "llviewerparcelmedia.h"
 #include "llcombobox.h"
 
-#include "llchat.h"
-#include "lllineeditor.h"
-#include "llfloaterchat.h"
-#include "lltrans.h"
-
-// static
-LLFloaterMediaBrowser* LLFloaterMediaBrowser::sInstance = NULL;
 
 LLFloaterMediaBrowser::LLFloaterMediaBrowser(const LLSD& media_data)
 {
@@ -64,9 +62,7 @@ LLFloaterMediaBrowser::LLFloaterMediaBrowser(const LLSD& media_data)
 
 void LLFloaterMediaBrowser::draw()
 {
-        BOOL url_exists = !mAddressCombo->getValue().asString().empty();
-        childSetEnabled("go", url_exists);
-        childSetEnabled("set_home", url_exists);
+        childSetEnabled("go", !mAddressCombo->getValue().asString().empty());
         LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
         if(parcel)
         {
@@ -92,8 +88,6 @@ BOOL LLFloaterMediaBrowser::postBuild()
         childSetAction("close", onClickClose, this);
         childSetAction("open_browser", onClickOpenWebBrowser, this);
         childSetAction("assign", onClickAssign, this);
-        childSetAction("home", onClickHome, this);
-        childSetAction("set_home", onClickSetHome, this);
 
         buildURLHistory();
         return TRUE;
@@ -124,7 +118,7 @@ void LLFloaterMediaBrowser::buildURLHistory()
 
 void LLFloaterMediaBrowser::onClose(bool app_quitting)
 {
-        //setVisible(FALSE)
+        //setVisible(FALSE);
         destroy();
 }
 
@@ -156,55 +150,14 @@ void LLFloaterMediaBrowser::onLocationChange( const EventType& eventIn )
         childSetEnabled("back", mBrowser->canNavigateBack());
         childSetEnabled("forward", mBrowser->canNavigateForward());
         childSetEnabled("reload", TRUE);
-        gSavedSettings.setString("BrowserLastVisited", truncated_url);
 }
 
 LLFloaterMediaBrowser* LLFloaterMediaBrowser::showInstance(const LLSD& media_url)
 {
-        LLFloaterMediaBrowser* sInstance = LLUISingleton<LLFloaterMediaBrowser, VisibilityPolicy<LLFloater> >::showInstance(media_url);
-
-        sInstance->openMedia(media_url.asString());
-        return sInstance;
-}
-
-//static
-void LLFloaterMediaBrowser::toggle()
-{
-        bool visible = LLFloaterMediaBrowser::instanceVisible();
-        LLFloaterMediaBrowser* self = sInstance->getInstance();
-
-        if(visible && self)
-        {
-                self->close();
-        }
-        else
-        {
-                //Show home url if new session, last visited if not
-                std::string last_url = gSavedSettings.getString("BrowserLastVisited");
-                if(last_url.empty()) 
-                        last_url = gSavedSettings.getString("BrowserHome");
-                showInstance(last_url);
-        }
-}
+        LLFloaterMediaBrowser* floaterp = LLUISingleton<LLFloaterMediaBrowser, VisibilityPolicy<LLFloater> >::showInstance(media_url);
 
-//static
-void LLFloaterMediaBrowser::helpF1()
-{
-        std::string url = gSavedSettings.getString("HelpSupportURL");
-        std::string* url_copy = new std::string(url);
- 
-    gViewerWindow->alertXml("ClickOpenF1Help", onClickF1HelpLoadURL, url_copy);
-}
- 
-// static
-void LLFloaterMediaBrowser::onClickF1HelpLoadURL(S32 option, void* userdata)
-{
-  std::string* urlp = (std::string*)userdata;
-  if (0 == option)
-  {
-    showInstance(urlp->c_str());
-  }
-  delete urlp;
+        floaterp->openMedia(media_url.asString());
+        return floaterp;
 }
 
 //static 
@@ -285,8 +238,211 @@ void LLFloaterMediaBrowser::onClickAssign(void* user_data)
         LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel, true );
         // now check for video
         LLViewerParcelMedia::update( parcel );
+
+
 }
 
+void LLFloaterMediaBrowser::openMedia(const std::string& media_url)
+{
+        mBrowser->setHomePageUrl(media_url);
+        mBrowser->navigateTo(media_url);
+}
+
+LLViewerHtmlHelp gViewerHtmlHelp;
+
+class LLFloaterHtmlHelp :
+        public LLFloater,
+        public LLWebBrowserCtrlObserver
+{
+public:
+        LLFloaterHtmlHelp(std::string start_url, std::string title);
+        virtual ~LLFloaterHtmlHelp();
+        
+        virtual void onClose( bool app_quitting );
+        virtual void draw();
+        
+        static void show(std::string url, std::string title);
+        static void onClickBack( void* data );
+        static void onClickHome( void* data );
+        static void onClickForward( void* data );
+        static void onClickClose( void* data );
+        
+        // browser observer impls
+        virtual void onStatusTextChange( const EventType& eventIn );
+        virtual void onLocationChange( const EventType& eventIn );
+        
+        // used for some stats logging - will be removed at some point
+        static BOOL sFloaterOpened;
+
+        static bool onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response);
+
+protected:
+        LLWebBrowserCtrl* mWebBrowser;
+        static LLFloaterHtmlHelp* sInstance;
+        LLButton* mBackButton;
+        LLButton* mForwardButton;
+        LLButton* mCloseButton;
+        LLTextBox* mStatusText;
+        std::string mStatusTextContents;
+        std::string mCurrentUrl;
+        std::string mSupportUrl;
+};
+
+LLFloaterHtmlHelp* LLFloaterHtmlHelp::sInstance = 0;
+
+BOOL LLFloaterHtmlHelp::sFloaterOpened = FALSE;
+
+////////////////////////////////////////////////////////////////////////////////
+//
+LLFloaterHtmlHelp::LLFloaterHtmlHelp(std::string start_url, std::string title)
+:       LLFloater( std::string("HTML Help") ),
+        mWebBrowser( 0 ),
+        mStatusTextContents( LLStringUtil::null ),
+        mCurrentUrl( LLStringUtil::null )
+{
+        sInstance = this;
+                
+        // create floater from its XML definition
+        LLUICtrlFactory::getInstance()->buildFloater( this, "floater_html_help.xml" );
+                
+        childSetAction("back_btn", onClickBack, this);
+        childSetAction("home_btn", onClickHome, this);
+        childSetAction("forward_btn", onClickForward, this);
+
+        if (!title.empty())
+        {
+                setTitle(title);
+        }
+
+        mWebBrowser = getChild<LLWebBrowserCtrl>("html_help_browser" );
+        if ( mWebBrowser )
+        {
+                // observe browser control events
+                mWebBrowser->addObserver( this );
+
+                if (start_url != "")
+                {
+                        mWebBrowser->navigateTo( start_url );
+                }
+                else
+                {
+                        // if the last page we were at before the client was closed is valid, go there and
+                        // override what is in the XML file
+                        // (not when the window was closed - it's only ever hidden - not closed)
+                        std::string lastPageUrl = gSavedSettings.getString( "HtmlHelpLastPage" );
+                        if ( lastPageUrl != "" )
+                        {
+                                mWebBrowser->navigateTo( lastPageUrl );
+                        };
+                }
+        };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+LLFloaterHtmlHelp::~LLFloaterHtmlHelp()
+{
+        // stop observing browser events
+        if ( mWebBrowser )
+        {
+                mWebBrowser->remObserver( this );
+        };
+
+        // save position of floater
+        gSavedSettings.setRect( "HtmlHelpRect", getRect() );
+
+        // save the location we were at when SL closed 
+        gSavedSettings.setString( "HtmlHelpLastPage", mCurrentUrl );
+
+        sInstance = 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual 
+void LLFloaterHtmlHelp::draw()
+{
+        // enable/disable buttons depending on state
+        if ( mWebBrowser )
+        {
+                bool enable_back = mWebBrowser->canNavigateBack();      
+                childSetEnabled( "back_btn", enable_back );
+
+                bool enable_forward = mWebBrowser->canNavigateForward();        
+                childSetEnabled( "forward_btn", enable_forward );
+        };
+
+        LLFloater::draw();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterHtmlHelp::show(std::string url, std::string title)
+{
+        LLFloaterHtml* floater_html = LLFloaterHtml::getInstance();
+        floater_html->setVisible(FALSE);
+        
+        if (url.empty())
+        {
+                url = floater_html->getSupportUrl();
+        }
+
+        if (gSavedSettings.getBOOL("UseExternalBrowser"))
+        {
+        LLSD payload;
+        payload["url"] = url;
+                
+            LLNotifications::instance().add("ClickOpenF1Help", LLSD(), payload, onClickF1HelpLoadURL);      
+        }
+        else
+        {
+            // don't wait, just do it
+        LLWeb::loadURL(url);
+        }
+}
+
+// static 
+bool LLFloaterHtmlHelp::onClickF1HelpLoadURL(const LLSD& notification, const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if (option == 0)
+        {
+                LLWeb::loadURL(notification["payload"]["url"].asString());
+        }
+        return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterHtmlHelp::onClose( bool app_quitting )
+{
+        setVisible( false );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterHtmlHelp::onClickClose( void* data )
+{
+        LLFloaterHtmlHelp* self = ( LLFloaterHtmlHelp* )data;
+
+        self->setVisible( false );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterHtmlHelp::onClickBack( void* data )
+{
+        LLFloaterHtmlHelp* self = ( LLFloaterHtmlHelp* )data;
+        if ( self )
+        {
+                if ( self->mWebBrowser )
+                {
+                        self->mWebBrowser->navigateBack();
+                };
+        };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
 void LLFloaterMediaBrowser::onClickHome(void* user_data)
 {
         LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
@@ -315,8 +471,56 @@ void LLFloaterMediaBrowser::onClickSetHome(void* user_data)
         }
 }
 
-void LLFloaterMediaBrowser::openMedia(const std::string& media_url)
+////////////////////////////////////////////////////////////////////////////////
+// 
+void LLFloaterHtmlHelp::onClickForward( void* data )
 {
-        mBrowser->setHomePageUrl(media_url);
-        mBrowser->navigateTo(media_url);
+        LLFloaterHtmlHelp* self = ( LLFloaterHtmlHelp* )data;
+        if ( self )
+        {
+                if ( self->mWebBrowser )
+                {
+                        self->mWebBrowser->navigateForward();
+                };
+        };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterHtmlHelp::onStatusTextChange( const EventType& eventIn )
+{
+        mStatusTextContents = std::string( eventIn.getStringValue() );
+
+        childSetText("status_text", mStatusTextContents);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void LLFloaterHtmlHelp::onLocationChange( const EventType& eventIn )
+{
+        llinfos << "MOZ> Location changed to " << eventIn.getStringValue() << llendl;
+        mCurrentUrl = std::string( eventIn.getStringValue() );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+LLViewerHtmlHelp::LLViewerHtmlHelp()
+{
+        LLUI::setHtmlHelp(this);
+}
+
+LLViewerHtmlHelp::~LLViewerHtmlHelp()
+{
+        LLUI::setHtmlHelp(NULL);
+}
+
+void LLViewerHtmlHelp::show()
+{
+        LLFloaterHtmlHelp::show("", "");
+}
+
+void LLViewerHtmlHelp::show(std::string url)
+{
+        std::string title;      // empty
+        LLFloaterHtmlHelp::show(url, title);
 }