Merged SL 1.23.4 into Imprudence.

Conflicts: linden/doc/contributions.txt linden/indra/CMakeLists.txt linden/indra/cmake/APR.cmake linden/indra/cmake/CopyWinLibs.cmake linden/indra/cmake/OPENAL.cmake linden/indra/develop.py linden/indra/llaudio/audioengine.cpp linden/indra/llcommon/indra_constants.h linden/indra/llcommon/llversionviewer.h linden/indra/llcrashlogger/llcrashlogger.cpp linden/indra/llmedia/llmediaimplgstreamer.cpp linden/indra/llmedia/llmediaimplgstreamer.h linden/indra/llmedia/llmediaimplgstreamer_syms.cpp linden/indra/llmedia/llmediaimplgstreamer_syms.h linden/indra/llmedia/llmediaimplgstreamer_syms_raw.inc linden/indra/llmedia/llmediamanager.cpp linden/indra/llmessage/llassetstorage.cpp linden/indra/llui/lltexteditor.cpp linden/indra/llvfs/lldir.cpp linden/indra/newview/CMakeLists.txt linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/app_settings/logcontrol.xml linden/indra/newview/app_settings/settings.xml linden/indra/newview/installers/windows/installer_template.nsi linden/indra/newview/llagent.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llcallingcard.cpp linden/indra/newview/llfilepicker.cpp linden/indra/newview/llfloateractivespeakers.cpp linden/indra/newview/llfloateravatarpicker.cpp linden/indra/newview/llfloaterbulkpermission.cpp linden/indra/newview/llfloaterbulkpermission.h linden/indra/newview/llfloaterchat.cpp linden/indra/newview/llfloatergodtools.cpp linden/indra/newview/llfloaterhtmlhelp.cpp linden/indra/newview/llfloatertools.cpp linden/indra/newview/llfloatertools.h linden/indra/newview/llfloatertopobjects.cpp linden/indra/newview/llinventorybridge.cpp linden/indra/newview/llinventoryview.cpp linden/indra/newview/llnetmap.cpp linden/indra/newview/llnetmap.h linden/indra/newview/llpanelland.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/llpanelobject.cpp linden/indra/newview/llprefsim.cpp linden/indra/newview/lltexturecache.cpp linden/indra/newview/lltoolbrush.cpp linden/indra/newview/llvieweraudio.cpp linden/indra/newview/llviewermenu.cpp linden/indra/newview/llviewermessage.cpp linden/indra/newview/llviewerparcelmedia.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/llwebbrowserctrl.cpp linden/indra/newview/llworldmapview.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/colors_base.xml linden/indra/newview/skins/default/xui/de/floater_active_speakers.xml linden/indra/newview/skins/default/xui/de/floater_instant_message_ad_hoc.xml linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml linden/indra/newview/skins/default/xui/de/floater_joystick.xml linden/indra/newview/skins/default/xui/de/floater_mute_object.xml linden/indra/newview/skins/default/xui/de/floater_sim_release_message.xml linden/indra/newview/skins/default/xui/de/panel_media_controls.xml linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/de/strings.xml linden/indra/newview/skins/default/xui/de/teleport_strings.xml linden/indra/newview/skins/default/xui/en-us/alerts.xml linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml linden/indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml linden/indra/newview/skins/default/xui/en-us/floater_chatterbox.xml linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml linden/indra/newview/skins/default/xui/en-us/floater_tools.xml linden/indra/newview/skins/default/xui/en-us/menu_login.xml linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml linden/indra/newview/skins/default/xui/en-us/notify.xml linden/indra/newview/skins/default/xui/en-us/panel_bars.xml linden/indra/newview/skins/default/xui/en-us/panel_groups.xml linden/indra/newview/skins/default/xui/en-us/panel_media_controls.xml linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/en-us/strings.xml linden/indra/newview/skins/default/xui/es/alerts.xml linden/indra/newview/skins/default/xui/es/floater_about.xml linden/indra/newview/skins/default/xui/es/floater_about_land.xml linden/indra/newview/skins/default/xui/es/floater_animation_preview.xml linden/indra/newview/skins/default/xui/es/floater_auction.xml linden/indra/newview/skins/default/xui/es/floater_avatar_picker.xml linden/indra/newview/skins/default/xui/es/floater_avatar_textures.xml linden/indra/newview/skins/default/xui/es/floater_build_options.xml linden/indra/newview/skins/default/xui/es/floater_bumps.xml linden/indra/newview/skins/default/xui/es/floater_buy_contents.xml linden/indra/newview/skins/default/xui/es/floater_buy_currency.xml linden/indra/newview/skins/default/xui/es/floater_buy_land.xml linden/indra/newview/skins/default/xui/es/floater_buy_object.xml linden/indra/newview/skins/default/xui/es/floater_chat_history.xml linden/indra/newview/skins/default/xui/es/floater_choose_group.xml linden/indra/newview/skins/default/xui/es/floater_clothing.xml linden/indra/newview/skins/default/xui/es/floater_color_picker.xml linden/indra/newview/skins/default/xui/es/floater_critical.xml linden/indra/newview/skins/default/xui/es/floater_customize.xml linden/indra/newview/skins/default/xui/es/floater_directory.xml linden/indra/newview/skins/default/xui/es/floater_gesture.xml linden/indra/newview/skins/default/xui/es/floater_group_info.xml linden/indra/newview/skins/default/xui/es/floater_html.xml linden/indra/newview/skins/default/xui/es/floater_im.xml linden/indra/newview/skins/default/xui/es/floater_image_preview.xml linden/indra/newview/skins/default/xui/es/floater_import.xml linden/indra/newview/skins/default/xui/es/floater_instant_message.xml linden/indra/newview/skins/default/xui/es/floater_inventory.xml linden/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml linden/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml linden/indra/newview/skins/default/xui/es/floater_land_holdings.xml linden/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml linden/indra/newview/skins/default/xui/es/floater_moveview.xml linden/indra/newview/skins/default/xui/es/floater_mute.xml linden/indra/newview/skins/default/xui/es/floater_name_description.xml linden/indra/newview/skins/default/xui/es/floater_new_im.xml linden/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml linden/indra/newview/skins/default/xui/es/floater_openobject.xml linden/indra/newview/skins/default/xui/es/floater_pay.xml linden/indra/newview/skins/default/xui/es/floater_pay_object.xml linden/indra/newview/skins/default/xui/es/floater_postcard.xml linden/indra/newview/skins/default/xui/es/floater_preferences.xml linden/indra/newview/skins/default/xui/es/floater_preview_animation.xml linden/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml linden/indra/newview/skins/default/xui/es/floater_preview_gesture.xml linden/indra/newview/skins/default/xui/es/floater_preview_notecard.xml linden/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml linden/indra/newview/skins/default/xui/es/floater_preview_sound.xml linden/indra/newview/skins/default/xui/es/floater_preview_texture.xml linden/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml linden/indra/newview/skins/default/xui/es/floater_price_for_listing.xml linden/indra/newview/skins/default/xui/es/floater_profile.xml linden/indra/newview/skins/default/xui/es/floater_report_abuse.xml linden/indra/newview/skins/default/xui/es/floater_script_debug.xml linden/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml linden/indra/newview/skins/default/xui/es/floater_script_preview.xml linden/indra/newview/skins/default/xui/es/floater_script_queue.xml linden/indra/newview/skins/default/xui/es/floater_script_search.xml linden/indra/newview/skins/default/xui/es/floater_sell_land.xml linden/indra/newview/skins/default/xui/es/floater_settings_debug.xml linden/indra/newview/skins/default/xui/es/floater_snapshot.xml linden/indra/newview/skins/default/xui/es/floater_sound_preview.xml linden/indra/newview/skins/default/xui/es/floater_telehub.xml linden/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml linden/indra/newview/skins/default/xui/es/floater_tools.xml linden/indra/newview/skins/default/xui/es/floater_top_objects.xml linden/indra/newview/skins/default/xui/es/floater_tos.xml linden/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml linden/indra/newview/skins/default/xui/es/floater_world_map.xml linden/indra/newview/skins/default/xui/es/menu_inventory.xml linden/indra/newview/skins/default/xui/es/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/es/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/es/menu_pie_land.xml linden/indra/newview/skins/default/xui/es/menu_pie_object.xml linden/indra/newview/skins/default/xui/es/menu_pie_self.xml linden/indra/newview/skins/default/xui/es/menu_viewer.xml linden/indra/newview/skins/default/xui/es/notify.xml linden/indra/newview/skins/default/xui/es/panel_avatar.xml linden/indra/newview/skins/default/xui/es/panel_avatar_classified.xml linden/indra/newview/skins/default/xui/es/panel_avatar_pick.xml linden/indra/newview/skins/default/xui/es/panel_chat_bar.xml linden/indra/newview/skins/default/xui/es/panel_classified.xml linden/indra/newview/skins/default/xui/es/panel_event.xml linden/indra/newview/skins/default/xui/es/panel_group.xml linden/indra/newview/skins/default/xui/es/panel_group_finder.xml linden/indra/newview/skins/default/xui/es/panel_group_general.xml linden/indra/newview/skins/default/xui/es/panel_group_invite.xml linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml linden/indra/newview/skins/default/xui/es/panel_group_notices.xml linden/indra/newview/skins/default/xui/es/panel_group_roles.xml linden/indra/newview/skins/default/xui/es/panel_group_voting.xml linden/indra/newview/skins/default/xui/es/panel_land_covenant.xml linden/indra/newview/skins/default/xui/es/panel_login.xml linden/indra/newview/skins/default/xui/es/panel_overlaybar.xml linden/indra/newview/skins/default/xui/es/panel_place.xml linden/indra/newview/skins/default/xui/es/panel_place_small.xml linden/indra/newview/skins/default/xui/es/panel_preferences_audio.xml linden/indra/newview/skins/default/xui/es/panel_preferences_chat.xml linden/indra/newview/skins/default/xui/es/panel_preferences_general.xml linden/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/es/panel_preferences_im.xml linden/indra/newview/skins/default/xui/es/panel_preferences_input.xml linden/indra/newview/skins/default/xui/es/panel_preferences_network.xml linden/indra/newview/skins/default/xui/es/panel_preferences_popups.xml linden/indra/newview/skins/default/xui/es/panel_region_covenant.xml linden/indra/newview/skins/default/xui/es/panel_region_debug.xml linden/indra/newview/skins/default/xui/es/panel_region_estate.xml linden/indra/newview/skins/default/xui/es/panel_region_general.xml linden/indra/newview/skins/default/xui/es/panel_region_terrain.xml linden/indra/newview/skins/default/xui/es/panel_region_texture.xml linden/indra/newview/skins/default/xui/es/panel_scrolling_param.xml linden/indra/newview/skins/default/xui/es/panel_status_bar.xml linden/indra/newview/skins/default/xui/es/panel_toolbar.xml linden/indra/newview/skins/default/xui/es/panel_top_pick.xml linden/indra/newview/skins/default/xui/fr/alerts.xml linden/indra/newview/skins/default/xui/fr/floater_about.xml linden/indra/newview/skins/default/xui/fr/floater_about_land.xml linden/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml linden/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml linden/indra/newview/skins/default/xui/fr/floater_beacons.xml linden/indra/newview/skins/default/xui/fr/floater_buy_contents.xml linden/indra/newview/skins/default/xui/fr/floater_buy_currency.xml linden/indra/newview/skins/default/xui/fr/floater_buy_land.xml linden/indra/newview/skins/default/xui/fr/floater_chat_history.xml linden/indra/newview/skins/default/xui/fr/floater_clothing.xml linden/indra/newview/skins/default/xui/fr/floater_customize.xml linden/indra/newview/skins/default/xui/fr/floater_directory.xml linden/indra/newview/skins/default/xui/fr/floater_god_tools.xml linden/indra/newview/skins/default/xui/fr/floater_group_info.xml linden/indra/newview/skins/default/xui/fr/floater_html.xml linden/indra/newview/skins/default/xui/fr/floater_im.xml linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml linden/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml linden/indra/newview/skins/default/xui/fr/floater_inventory.xml linden/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml linden/indra/newview/skins/default/xui/fr/floater_joystick.xml linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml linden/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml linden/indra/newview/skins/default/xui/fr/floater_media_browser.xml linden/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml linden/indra/newview/skins/default/xui/fr/floater_name_description.xml linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml linden/indra/newview/skins/default/xui/fr/floater_profile.xml linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml linden/indra/newview/skins/default/xui/fr/floater_script_search.xml linden/indra/newview/skins/default/xui/fr/floater_sell_land.xml linden/indra/newview/skins/default/xui/fr/floater_snapshot.xml linden/indra/newview/skins/default/xui/fr/floater_sound_preview.xml linden/indra/newview/skins/default/xui/fr/floater_tools.xml linden/indra/newview/skins/default/xui/fr/floater_top_objects.xml linden/indra/newview/skins/default/xui/fr/floater_world_map.xml linden/indra/newview/skins/default/xui/fr/menu_inventory.xml linden/indra/newview/skins/default/xui/fr/menu_login.xml linden/indra/newview/skins/default/xui/fr/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/fr/menu_pie_object.xml linden/indra/newview/skins/default/xui/fr/menu_viewer.xml linden/indra/newview/skins/default/xui/fr/notify.xml linden/indra/newview/skins/default/xui/fr/panel_audio.xml linden/indra/newview/skins/default/xui/fr/panel_avatar.xml linden/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml linden/indra/newview/skins/default/xui/fr/panel_classified.xml linden/indra/newview/skins/default/xui/fr/panel_event.xml linden/indra/newview/skins/default/xui/fr/panel_friends.xml linden/indra/newview/skins/default/xui/fr/panel_group_general.xml linden/indra/newview/skins/default/xui/fr/panel_group_invite.xml linden/indra/newview/skins/default/xui/fr/panel_group_land_money.xml linden/indra/newview/skins/default/xui/fr/panel_group_roles.xml linden/indra/newview/skins/default/xui/fr/panel_login.xml linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml linden/indra/newview/skins/default/xui/fr/panel_media_remote_expanded.xml linden/indra/newview/skins/default/xui/fr/panel_overlaybar.xml linden/indra/newview/skins/default/xui/fr/panel_place.xml linden/indra/newview/skins/default/xui/fr/panel_place_small.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_general.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_im.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_input.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_network.xml linden/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/fr/panel_region_covenant.xml linden/indra/newview/skins/default/xui/fr/panel_region_debug.xml linden/indra/newview/skins/default/xui/fr/panel_region_general.xml linden/indra/newview/skins/default/xui/fr/panel_voice_controls.xml linden/indra/newview/skins/default/xui/fr/role_actions.xml linden/indra/newview/skins/default/xui/fr/strings.xml linden/indra/newview/skins/default/xui/fr/teleport_strings.xml linden/indra/newview/skins/default/xui/ja/floater_active_speakers.xml linden/indra/newview/skins/default/xui/ja/floater_html.xml linden/indra/newview/skins/default/xui/ja/floater_instant_message_ad_hoc.xml linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml linden/indra/newview/skins/default/xui/ja/floater_joystick.xml linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml linden/indra/newview/skins/default/xui/ja/floater_windlight_options.xml linden/indra/newview/skins/default/xui/ja/menu_login.xml linden/indra/newview/skins/default/xui/ja/panel_friends.xml linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml linden/indra/newview/skins/default/xui/ja/panel_media_remote_expanded.xml linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/ja/panel_speaker_controls.xml linden/indra/newview/skins/default/xui/ja/strings.xml linden/indra/newview/skins/default/xui/ja/teleport_strings.xml linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml linden/indra/newview/skins/default/xui/pt/alerts.xml linden/indra/newview/skins/default/xui/pt/floater_about.xml linden/indra/newview/skins/default/xui/pt/floater_about_land.xml linden/indra/newview/skins/default/xui/pt/floater_active_speakers.xml linden/indra/newview/skins/default/xui/pt/floater_animation_preview.xml linden/indra/newview/skins/default/xui/pt/floater_auction.xml linden/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml linden/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml linden/indra/newview/skins/default/xui/pt/floater_beacons.xml linden/indra/newview/skins/default/xui/pt/floater_build_options.xml linden/indra/newview/skins/default/xui/pt/floater_bumps.xml linden/indra/newview/skins/default/xui/pt/floater_buy_contents.xml linden/indra/newview/skins/default/xui/pt/floater_buy_currency.xml linden/indra/newview/skins/default/xui/pt/floater_buy_land.xml linden/indra/newview/skins/default/xui/pt/floater_buy_object.xml linden/indra/newview/skins/default/xui/pt/floater_chat_history.xml linden/indra/newview/skins/default/xui/pt/floater_clothing.xml linden/indra/newview/skins/default/xui/pt/floater_color_picker.xml linden/indra/newview/skins/default/xui/pt/floater_critical.xml linden/indra/newview/skins/default/xui/pt/floater_customize.xml linden/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml linden/indra/newview/skins/default/xui/pt/floater_directory.xml linden/indra/newview/skins/default/xui/pt/floater_env_settings.xml linden/indra/newview/skins/default/xui/pt/floater_gesture.xml linden/indra/newview/skins/default/xui/pt/floater_god_tools.xml linden/indra/newview/skins/default/xui/pt/floater_group_info.xml linden/indra/newview/skins/default/xui/pt/floater_im.xml linden/indra/newview/skins/default/xui/pt/floater_image_preview.xml linden/indra/newview/skins/default/xui/pt/floater_inspect.xml linden/indra/newview/skins/default/xui/pt/floater_instant_message.xml linden/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.xml linden/indra/newview/skins/default/xui/pt/floater_instant_message_group.xml linden/indra/newview/skins/default/xui/pt/floater_inventory.xml linden/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml linden/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml linden/indra/newview/skins/default/xui/pt/floater_joystick.xml linden/indra/newview/skins/default/xui/pt/floater_lagmeter.xml linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml linden/indra/newview/skins/default/xui/pt/floater_landmark_ctrl.xml linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml linden/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml linden/indra/newview/skins/default/xui/pt/floater_media_browser.xml linden/indra/newview/skins/default/xui/pt/floater_moveview.xml linden/indra/newview/skins/default/xui/pt/floater_mute.xml linden/indra/newview/skins/default/xui/pt/floater_mute_object.xml linden/indra/newview/skins/default/xui/pt/floater_name_description.xml linden/indra/newview/skins/default/xui/pt/floater_new_outfit_dialog.xml linden/indra/newview/skins/default/xui/pt/floater_openobject.xml linden/indra/newview/skins/default/xui/pt/floater_pay.xml linden/indra/newview/skins/default/xui/pt/floater_postcard.xml linden/indra/newview/skins/default/xui/pt/floater_preferences.xml linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml linden/indra/newview/skins/default/xui/pt/floater_preview_classified.xml linden/indra/newview/skins/default/xui/pt/floater_preview_event.xml linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml linden/indra/newview/skins/default/xui/pt/floater_preview_sound.xml linden/indra/newview/skins/default/xui/pt/floater_preview_url.xml linden/indra/newview/skins/default/xui/pt/floater_price_for_listing.xml linden/indra/newview/skins/default/xui/pt/floater_profile.xml linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml linden/indra/newview/skins/default/xui/pt/floater_script_queue.xml linden/indra/newview/skins/default/xui/pt/floater_script_search.xml linden/indra/newview/skins/default/xui/pt/floater_sell_land.xml linden/indra/newview/skins/default/xui/pt/floater_settings_debug.xml linden/indra/newview/skins/default/xui/pt/floater_sim_release_message.xml linden/indra/newview/skins/default/xui/pt/floater_snapshot.xml linden/indra/newview/skins/default/xui/pt/floater_sound_preview.xml linden/indra/newview/skins/default/xui/pt/floater_telehub.xml linden/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml linden/indra/newview/skins/default/xui/pt/floater_tools.xml linden/indra/newview/skins/default/xui/pt/floater_top_objects.xml linden/indra/newview/skins/default/xui/pt/floater_tos.xml linden/indra/newview/skins/default/xui/pt/floater_url_entry.xml linden/indra/newview/skins/default/xui/pt/floater_water.xml linden/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml linden/indra/newview/skins/default/xui/pt/floater_windlight_options.xml linden/indra/newview/skins/default/xui/pt/floater_world_map.xml linden/indra/newview/skins/default/xui/pt/menu_inventory.xml linden/indra/newview/skins/default/xui/pt/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/pt/menu_pie_land.xml linden/indra/newview/skins/default/xui/pt/menu_pie_object.xml linden/indra/newview/skins/default/xui/pt/menu_viewer.xml linden/indra/newview/skins/default/xui/pt/notify.xml linden/indra/newview/skins/default/xui/pt/panel_account_details.xml linden/indra/newview/skins/default/xui/pt/panel_account_planning.xml linden/indra/newview/skins/default/xui/pt/panel_account_transactions.xml linden/indra/newview/skins/default/xui/pt/panel_audio_device.xml linden/indra/newview/skins/default/xui/pt/panel_avatar.xml linden/indra/newview/skins/default/xui/pt/panel_avatar_classified.xml linden/indra/newview/skins/default/xui/pt/panel_avatar_pick.xml linden/indra/newview/skins/default/xui/pt/panel_chat_bar.xml linden/indra/newview/skins/default/xui/pt/panel_classified.xml linden/indra/newview/skins/default/xui/pt/panel_event.xml linden/indra/newview/skins/default/xui/pt/panel_friends.xml linden/indra/newview/skins/default/xui/pt/panel_group.xml linden/indra/newview/skins/default/xui/pt/panel_group_finder.xml linden/indra/newview/skins/default/xui/pt/panel_group_general.xml linden/indra/newview/skins/default/xui/pt/panel_group_invite.xml linden/indra/newview/skins/default/xui/pt/panel_group_land_money.xml linden/indra/newview/skins/default/xui/pt/panel_group_notices.xml linden/indra/newview/skins/default/xui/pt/panel_group_roles.xml linden/indra/newview/skins/default/xui/pt/panel_group_voting.xml linden/indra/newview/skins/default/xui/pt/panel_land_covenant.xml linden/indra/newview/skins/default/xui/pt/panel_login.xml linden/indra/newview/skins/default/xui/pt/panel_overlaybar.xml linden/indra/newview/skins/default/xui/pt/panel_place.xml linden/indra/newview/skins/default/xui/pt/panel_place_small.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_audio.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_general.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_im.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_input.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_network.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_popups.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_voice.xml linden/indra/newview/skins/default/xui/pt/panel_preferences_web.xml linden/indra/newview/skins/default/xui/pt/panel_region_covenant.xml linden/indra/newview/skins/default/xui/pt/panel_region_debug.xml linden/indra/newview/skins/default/xui/pt/panel_region_estate.xml linden/indra/newview/skins/default/xui/pt/panel_region_general.xml linden/indra/newview/skins/default/xui/pt/panel_region_terrain.xml linden/indra/newview/skins/default/xui/pt/panel_region_texture.xml linden/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml linden/indra/newview/skins/default/xui/pt/panel_speaker_controls.xml linden/indra/newview/skins/default/xui/pt/panel_status_bar.xml linden/indra/newview/skins/default/xui/pt/panel_toolbar.xml linden/indra/newview/skins/default/xui/pt/panel_top_pick.xml linden/indra/newview/skins/default/xui/pt/panel_voice_controls.xml linden/indra/newview/skins/default/xui/pt/panel_voice_enable.xml linden/indra/newview/skins/default/xui/pt/panel_voice_options.xml linden/indra/newview/skins/default/xui/pt/strings.xml linden/indra/newview/skins/default/xui/pt/teleport_strings.xml linden/indra/newview/skins/default/xui/zh/floater_env_settings.xml linden/indra/newview/skins/default/xui/zh/floater_instant_message_ad_hoc.xml linden/indra/newview/skins/default/xui/zh/floater_lagmeter.xml linden/indra/newview/skins/default/xui/zh/floater_landmark_ctrl.xml linden/indra/newview/skins/default/xui/zh/floater_post_process.xml linden/indra/newview/skins/default/xui/zh/floater_settings_debug.xml linden/indra/newview/skins/default/xui/zh/floater_windlight_options.xml linden/indra/newview/skins/default/xui/zh/menu_pie_attachment.xml linden/indra/newview/skins/default/xui/zh/menu_pie_avatar.xml linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml linden/indra/newview/skins/default/xui/zh/menu_viewer.xml linden/indra/newview/skins/default/xui/zh/panel_avatar.xml linden/indra/newview/skins/default/xui/zh/panel_friends.xml linden/indra/newview/skins/default/xui/zh/panel_group_general.xml linden/indra/newview/skins/default/xui/zh/panel_group_invite.xml linden/indra/newview/skins/default/xui/zh/panel_group_land_money.xml linden/indra/newview/skins/default/xui/zh/panel_group_notices.xml linden/indra/newview/skins/default/xui/zh/panel_group_roles.xml linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml linden/indra/newview/skins/default/xui/zh/panel_region_covenant.xml linden/indra/newview/skins/default/xui/zh/panel_speaker_controls.xml linden/indra/newview/skins/default/xui/zh/panel_voice_options.xml linden/indra/newview/skins/default/xui/zh/strings.xml linden/indra/newview/skins/silver/colors_base.xml linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml linden/indra/newview/skins/silver/xui/en-us/floater_directory.xml linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml linden/indra/newview/viewer_manifest.py linden/install.xml
author: Jacek Antonelli 2009-08-29 17:44:38 -0500
committer: Jacek Antonelli 2009-08-29 22:49:51 -0500
commit: 6a5aab98892df74f60743f5b789959c9593d6647 (patch)
tree: 62da18f8540879ed01e12eeb0ce49375474272e4 /linden/indra/newview/llviewermenu.cpp
parent: Merge branch 'mac-openal-url' into next (diff)
parent: Converted 1.23 XUI files to unix line endings. (diff)
download: meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.zip
meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.gz
meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.bz2
meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.xz
1 files changed, 403 insertions, 315 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 2940bdd..e9bd756 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1,3 +1,4 @@
 /** 
 * @file llviewermenu.cpp
 * @brief Builds menus out of items.
@@ -17,7 +18,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,
@@ -101,12 +103,16 @@
 #include "llfloatereditui.h"
 #include "llfloaterchatterbox.h"
 #include "llfloaterfriends.h"
+#include "llfloaterfonttest.h"
 #include "llfloatergesture.h"
 #include "llfloatergodtools.h"
 #include "llfloatergroupinfo.h"
 #include "llfloatergroupinvite.h"
 #include "llfloatergroups.h"
-#include "llfloaterhtmlhelp.h"
+#include "llfloaterhtml.h"
+#include "llfloaterhtmlcurrency.h"
+#include "llfloaterhtmlhelp.h"                  // gViewerHtmlHelp
+#include "llfloaterhtmlsimple.h"
 #include "llfloaterhud.h"
 #include "llfloaterinspect.h"
 #include "llfloaterlagmeter.h"
@@ -116,6 +122,7 @@
 #include "llfloatermute.h"
 #include "llfloateropenobject.h"
 #include "llfloaterpermissionsmgr.h"
+#include "llfloaterperms.h"
 #include "llfloaterpostprocess.h"
 #include "llfloaterpreference.h"
 #include "llfloaterregioninfo.h"
@@ -184,6 +191,7 @@
 #include "llviewercamera.h"
 #include "llviewergenericmessage.h"
 #include "llviewergesture.h"
+#include "llviewerimagelist.h"  // gImageList
 #include "llviewerinventory.h"
 #include "llviewermenufile.h"   // init_menu_file()
 #include "llviewermessage.h"
@@ -207,9 +215,11 @@
 #include "llwlanimator.h"
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
+#include "llfloaternotificationsconsole.h"
 #include "lltexlayer.h"
+using namespace LLVOAvatarDefines;
 void init_client_menu(LLMenuGL* menu);
 void init_server_menu(LLMenuGL* menu);
@@ -283,9 +293,6 @@ typedef LLMemberListener<LLView> view_listener_t;
 void handle_leave_group(void *);
 // File Menu
-const char* upload_pick(void* data);
-void handle_upload(void* data);
-//void handle_upload_object(void* data);
 void handle_compress_image(void*);
 BOOL enable_save_as(void *);
@@ -294,6 +301,8 @@ void handle_dump_group_info(void *);
 void handle_dump_capabilities_info(void *);
 void handle_dump_focus(void*);
+// Advanced->Consoles menu
+void handle_show_notifications_console(void*);
 void handle_region_dump_settings(void*);
 void handle_region_dump_temp_asset_data(void*);
 void handle_region_clear_temp_asset_data(void*);
@@ -307,7 +316,7 @@ void label_sit_or_stand(std::string& label, void*);
 // declarations handle this mess.
 BOOL enable_take();
 void handle_take();
-void confirm_take(S32 option, void* data);
+bool confirm_take(const LLSD& notification, const LLSD& response);
 BOOL enable_buy(void*); 
 void handle_buy(void *);
 void handle_buy_object(LLSaleInfo sale_info);
@@ -329,7 +338,6 @@ void handle_agent_stop_moving(void*);
 void print_packets_lost(void*);
 void drop_packet(void*);
 void velocity_interpolate( void* data );
-void update_fov(S32 increments);
 void toggle_wind_audio(void);
 void toggle_water_audio(void);
 void handle_rebake_textures(void*);
@@ -358,7 +366,8 @@ void run_vectorize_perf_test(void *)
 // Debug UI
 void handle_web_search_demo(void*);
-void handle_slurl_test(void*);
+void handle_web_browser_test(void*);
+void handle_buy_currency_test(void*);
 void handle_save_to_xml(void*);
 void handle_load_from_xml(void*);
@@ -465,7 +474,6 @@ BOOL enable_grab_texture(void*);
 void handle_dump_region_object_cache(void*);
 BOOL menu_ui_enabled(void *user_data);
-void check_toggle_control( LLUICtrl *, void* user_data );
 BOOL menu_check_control( void* user_data);
 void menu_toggle_variable( void* user_data );
 BOOL menu_check_variable( void* user_data);
@@ -652,7 +660,7 @@ void init_menus()
    gViewerWindow->setMenuBackgroundColor(false, 
        LLViewerLogin::getInstance()->isInProductionGrid());
-        // *TODO:Get the cost info from the server
+        // Assume L$10 for now, the server will tell us the real cost at login
        const std::string upload_cost("10");
        gMenuHolder->childSetLabelArg("Upload Image", "[COST]", upload_cost);
        gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost);
@@ -747,7 +755,16 @@ void init_client_menu(LLMenuGL* menu)
                                                                                (void*)gDebugView->mMemoryView,
                                                                                  '0', MASK_CONTROL|MASK_SHIFT ) );
 #endif
+                
                sub->appendSeparator();
+                
+                // Debugging view for unified notifications
+                sub->append(new LLMenuItemCallGL("Notifications Console...",
+                                                 &handle_show_notifications_console, NULL, NULL, '5', MASK_CONTROL|MASK_SHIFT ));
+                
+                sub->appendSeparator();
                sub->append(new LLMenuItemCallGL("Region Info to Debug Console", 
                        &handle_region_dump_settings, NULL));
                sub->append(new LLMenuItemCallGL("Group Info to Debug Console",
@@ -942,13 +959,6 @@ void init_client_menu(LLMenuGL* menu)
                                                                                &menu_check_control,
                                                                                (void*)"SaveMinidump"));
-        // TomY Temporary menu item so we can test this floater
-        menu->append(new LLMenuItemCheckGL("Clothing...", 
-                                                                                                &handle_clothing,
-                                                                                                NULL,
-                                                                                                NULL,
-                                                                                                NULL));
        menu->append(new LLMenuItemCallGL("Debug Settings...", LLFloaterSettingsDebug::show, NULL, NULL));
        menu->append(new LLMenuItemCheckGL("View Admin Options", &handle_admin_override_toggle, NULL, &check_admin_override, NULL, 'V', MASK_CONTROL | MASK_ALT));
@@ -991,6 +1001,7 @@ void init_debug_world_menu(LLMenuGL* menu)
 void handle_export_menus_to_xml(void*)
 {
        LLFilePicker& picker = LLFilePicker::instance();
        if(!picker.getSaveFile(LLFilePicker::FFSAVE_XML))
        {
@@ -1012,7 +1023,14 @@ extern BOOL gDebugSelectMgr;
 void init_debug_ui_menu(LLMenuGL* menu)
 {
-        menu->append(new LLMenuItemCallGL("SLURL Test", &handle_slurl_test));
+        menu->append(new LLMenuItemCheckGL("Rotate Mini-Map", menu_toggle_control, NULL, menu_check_control, (void*)"MiniMapRotate"));
+        menu->append(new LLMenuItemCheckGL("Use default system color picker", menu_toggle_control, NULL, menu_check_control, (void*)"UseDefaultColorPicker"));
+        menu->append(new LLMenuItemCheckGL("Show search panel in overlay bar", menu_toggle_control, NULL, menu_check_control, (void*)"ShowSearchBar"));
+        menu->appendSeparator();
+        menu->append(new LLMenuItemCallGL("Web Browser Test", &handle_web_browser_test));
+        // commented out until work is complete: DEV-32268
+        // menu->append(new LLMenuItemCallGL("Buy Currency Test", &handle_buy_currency_test));
        menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui));
        menu->append(new LLMenuItemCallGL( "Dump SelectMgr", &dump_select_mgr));
        menu->append(new LLMenuItemCallGL( "Dump Inventory", &dump_inventory));
@@ -1036,6 +1054,7 @@ void init_debug_ui_menu(LLMenuGL* menu)
        menu->appendSeparator();
        menu->append(new LLMenuItemCheckGL("Show Time", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowTime"));
        menu->append(new LLMenuItemCheckGL("Show Render Info", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderInfo"));
+        menu->append(new LLMenuItemCheckGL("Show Matrices", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderMatrices"));
        menu->append(new LLMenuItemCheckGL("Show Color Under Cursor", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowColor"));
        
        menu->createJumpKeys();
@@ -1044,6 +1063,7 @@ void init_debug_ui_menu(LLMenuGL* menu)
 void init_debug_xui_menu(LLMenuGL* menu)
 {
        menu->append(new LLMenuItemCallGL("Floater Test...", LLFloaterTest::show));
+        menu->append(new LLMenuItemCallGL("Font Test...", LLFloaterFontTest::show));
        menu->append(new LLMenuItemCallGL("Export Menus to XML...", handle_export_menus_to_xml));
        menu->append(new LLMenuItemCallGL("Edit UI...", LLFloaterEditUI::show));        
        menu->append(new LLMenuItemCallGL("Load from XML...", handle_load_from_xml));
@@ -1173,6 +1193,9 @@ void init_debug_rendering_menu(LLMenuGL* menu)
        sub_menu->append(new LLMenuItemCheckGL("Octree",        &LLPipeline::toggleRenderDebug, NULL,
                                                                                                        &LLPipeline::toggleRenderDebugControl,
                                                                                                        (void*)LLPipeline::RENDER_DEBUG_OCTREE));
+        sub_menu->append(new LLMenuItemCheckGL("Shadow Frusta", &LLPipeline::toggleRenderDebug, NULL,
+                                                                                                        &LLPipeline::toggleRenderDebugControl,
+                                                                                                        (void*)LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA));
        sub_menu->append(new LLMenuItemCheckGL("Occlusion",     &LLPipeline::toggleRenderDebug, NULL,
                                                                                                        &LLPipeline::toggleRenderDebugControl,
                                                                                                        (void*)LLPipeline::RENDER_DEBUG_OCCLUSION));
@@ -1298,8 +1321,6 @@ void init_debug_rendering_menu(LLMenuGL* menu)
        menu->createJumpKeys();
 }
-extern BOOL gDebugAvatarRotation;
 void init_debug_avatar_menu(LLMenuGL* menu)
 {
        LLMenuGL* sub_menu = new LLMenuGL("Grab Baked Texture");
@@ -1344,9 +1365,15 @@ void init_debug_avatar_menu(LLMenuGL* menu)
        //menu->append(new LLMenuItemToggleGL("Show Attachment Points", &LLVOAvatar::sShowAttachmentPoints));
        //diabling collision plane due to DEV-14477 -brad
        //menu->append(new LLMenuItemToggleGL("Show Collision Plane", &LLVOAvatar::sShowFootPlane));
-        menu->append(new LLMenuItemToggleGL("Show Collision Skeleton", &LLVOAvatar::sShowCollisionVolumes));
+        menu->append(new LLMenuItemCheckGL("Show Collision Skeleton",
-        menu->append(new LLMenuItemToggleGL( "Display Agent Target", &LLAgent::sDebugDisplayTarget));
+                                                                           &LLPipeline::toggleRenderDebug, NULL,
-        menu->append(new LLMenuItemToggleGL( "Debug Rotation", &gDebugAvatarRotation));
+                                                                           &LLPipeline::toggleRenderDebugControl,
+                                                                           (void*)LLPipeline::RENDER_DEBUG_AVATAR_VOLUME));
+        menu->append(new LLMenuItemCheckGL("Display Agent Target",
+                                                                           &LLPipeline::toggleRenderDebug, NULL,
+                                                                           &LLPipeline::toggleRenderDebugControl,
+                                                                           (void*)LLPipeline::RENDER_DEBUG_AGENT_TARGET));
+        menu->append(new LLMenuItemToggleGL( "Debug Rotation", &LLVOAvatar::sDebugAvatarRotation));
        menu->append(new LLMenuItemCallGL("Dump Attachments", handle_dump_attachments));
        menu->append(new LLMenuItemCallGL("Refresh Appearance", handle_rebake_textures, NULL, NULL, 'R', MASK_ALT | MASK_CONTROL ));
 #ifndef LL_RELEASE_FOR_DOWNLOAD
@@ -1358,11 +1385,12 @@ void init_debug_avatar_menu(LLMenuGL* menu)
 void init_debug_baked_texture_menu(LLMenuGL* menu)
 {
-        menu->append(new LLMenuItemCallGL("Iris", handle_grab_texture, enable_grab_texture, (void*) LLVOAvatar::TEX_EYES_BAKED));
+        menu->append(new LLMenuItemCallGL("Iris", handle_grab_texture, enable_grab_texture, (void*) TEX_EYES_BAKED));
-        menu->append(new LLMenuItemCallGL("Head", handle_grab_texture, enable_grab_texture, (void*) LLVOAvatar::TEX_HEAD_BAKED));
+        menu->append(new LLMenuItemCallGL("Head", handle_grab_texture, enable_grab_texture, (void*) TEX_HEAD_BAKED));
-        menu->append(new LLMenuItemCallGL("Upper Body", handle_grab_texture, enable_grab_texture, (void*) LLVOAvatar::TEX_UPPER_BAKED));
+        menu->append(new LLMenuItemCallGL("Upper Body", handle_grab_texture, enable_grab_texture, (void*) TEX_UPPER_BAKED));
-        menu->append(new LLMenuItemCallGL("Lower Body", handle_grab_texture, enable_grab_texture, (void*) LLVOAvatar::TEX_LOWER_BAKED));
+        menu->append(new LLMenuItemCallGL("Lower Body", handle_grab_texture, enable_grab_texture, (void*) TEX_LOWER_BAKED));
-        menu->append(new LLMenuItemCallGL("Skirt", handle_grab_texture, enable_grab_texture, (void*) LLVOAvatar::TEX_SKIRT_BAKED));
+        menu->append(new LLMenuItemCallGL("Skirt", handle_grab_texture, enable_grab_texture, (void*) TEX_SKIRT_BAKED));
+        menu->append(new LLMenuItemCallGL("Hair", handle_grab_texture, enable_grab_texture, (void*) TEX_HAIR_BAKED));
        menu->createJumpKeys();
 }
@@ -1570,15 +1598,20 @@ class LLObjectEnableTouch : public view_listener_t
                // Update label based on the node touch name if available.
                LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
+                std::string touch_text;
                if (node && node->mValid && !node->mTouchName.empty())
                {
-                        gMenuHolder->childSetText("Object Touch", node->mTouchName);
+                        touch_text =  node->mTouchName;
                }
                else
                {
-                        gMenuHolder->childSetText("Object Touch", userdata["data"].asString());
+                        touch_text = userdata["data"].asString();
                }
+                gMenuHolder->childSetText("Object Touch", touch_text);
+                gMenuHolder->childSetText("Attachment Object Touch", touch_text);
                return true;
        }
 };
@@ -2146,9 +2179,10 @@ class LLGoToObject : public view_listener_t
 //---------------------------------------------------------------------------
 // Parcel freeze, eject, etc.
 //---------------------------------------------------------------------------
-void callback_freeze(S32 option, void* data)
+bool callback_freeze(const LLSD& notification, const LLSD& response)
 {
-        LLUUID* avatar_id = (LLUUID*) data;
+        LLUUID avatar_id = notification["payload"]["avatar_id"].asUUID();
+        S32 option = LLNotification::getSelectedOption(notification, response);
        if (0 == option || 1 == option)
        {
@@ -2160,7 +2194,7 @@ void callback_freeze(S32 option, void* data)
                }
                LLMessageSystem* msg = gMessageSystem;
-                LLViewerObject* avatar = gObjectList.findObject(*avatar_id);
+                LLViewerObject* avatar = gObjectList.findObject(avatar_id);
                if (avatar)
                {
@@ -2169,16 +2203,15 @@ void callback_freeze(S32 option, void* data)
                        msg->addUUID("AgentID", gAgent.getID());
                        msg->addUUID("SessionID", gAgent.getSessionID());
                        msg->nextBlock("Data");
-                        msg->addUUID("TargetID", *avatar_id );
+                        msg->addUUID("TargetID", avatar_id );
                        msg->addU32("Flags", flags );
                        msg->sendReliable( avatar->getRegion()->getHost() );
                }
        }
+        return false;
-        delete avatar_id;
-        avatar_id = NULL;
 }
 class LLAvatarFreeze : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -2186,23 +2219,25 @@ class LLAvatarFreeze : public view_listener_t
                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                if( avatar )
                {
-                        LLUUID* avatar_id = new LLUUID( avatar->getID() );
                        std::string fullname = avatar->getFullname();
+                        LLSD payload;
+                        payload["avatar_id"] = avatar->getID();
                        if (!fullname.empty())
                        {
-                                LLStringUtil::format_map_t args;
+                                LLSD args;
-                                args["[AVATAR_NAME]"] = fullname;
+                                args["AVATAR_NAME"] = fullname;
-                                gViewerWindow->alertXml("FreezeAvatarFullname",
+                                LLNotifications::instance().add("FreezeAvatarFullname",
                                                        args,
-                                                        callback_freeze,
+                                                        payload,
-                                                        (void*)avatar_id);
+                                                        callback_freeze);
                        }
                        else
                        {
-                                gViewerWindow->alertXml("FreezeAvatar",
+                                LLNotifications::instance().add("FreezeAvatar",
-                                                        callback_freeze,
+                                                        LLSD(),
-                                                        (void*)avatar_id);
+                                                        payload,
+                                                        callback_freeze);
                        }
                }
                return true;
@@ -2248,26 +2283,16 @@ class LLAvatarDebug : public view_listener_t
        }
 };
-struct MenuCallbackData
+bool callback_eject(const LLSD& notification, const LLSD& response)
-{
-        bool ban_enabled;
-        LLUUID avatar_id;
-};
-void callback_eject(S32 option, void* data)
 {
-        MenuCallbackData *callback_data = (MenuCallbackData*)data;
+        S32 option = LLNotification::getSelectedOption(notification, response);
-        if (!callback_data)
-        {
-                return;
-        }
        if (2 == option)
        {
-                // Cancle button.
+                // Cancel button.
-                return;
+                return false;
        }
-        LLUUID avatar_id = callback_data->avatar_id;
+        LLUUID avatar_id = notification["payload"]["avatar_id"].asUUID();
-        bool ban_enabled = callback_data->ban_enabled;
+        bool ban_enabled = notification["payload"]["ban_enabled"].asBoolean();
        if (0 == option)
        {
@@ -2309,10 +2334,7 @@ void callback_eject(S32 option, void* data)
                        msg->sendReliable( avatar->getRegion()->getHost() );
                }
        }
+        return false;
-        delete callback_data;
-        callback_data = NULL;
 }
 class LLAvatarEject : public view_listener_t
@@ -2322,8 +2344,8 @@ class LLAvatarEject : public view_listener_t
                LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                if( avatar )
                {
-                        MenuCallbackData *data = new MenuCallbackData;
+                        LLSD payload;
-                        (*data).avatar_id = avatar->getID();
+                        payload["avatar_id"] = avatar->getID();
                        std::string fullname = avatar->getFullname();
                        const LLVector3d& pos = avatar->getPositionGlobal();
@@ -2331,40 +2353,42 @@ class LLAvatarEject : public view_listener_t
                        
                        if (LLViewerParcelMgr::getInstance()->isParcelOwnedByAgent(parcel,GP_LAND_MANAGE_BANNED))
                        {
-                                (*data).ban_enabled = true;
+                payload["ban_enabled"] = true;
                                if (!fullname.empty())
                                {
-                                        LLStringUtil::format_map_t args;
+                                LLSD args;
-                                        args["[AVATAR_NAME]"] = fullname;
+                                args["AVATAR_NAME"] = fullname;
-                                        gViewerWindow->alertXml("EjectAvatarFullname",
+                                LLNotifications::instance().add("EjectAvatarFullname",
-                                                args,
+                                                        args,
-                                                callback_eject,
+                                                        payload,
-                                                (void*)data);
+                                                        callback_eject);
                                }
                                else
                                {
-                                        gViewerWindow->alertXml("EjectAvatar",
+                                LLNotifications::instance().add("EjectAvatarFullname",
-                                                callback_eject,
+                                                        LLSD(),
-                                                (void*)data);
+                                                        payload,
+                                                        callback_eject);
                                }
                        }
                        else
                        {
-                                (*data).ban_enabled = false;
+                payload["ban_enabled"] = false;
                                if (!fullname.empty())
                                {
-                                        LLStringUtil::format_map_t args;
+                                LLSD args;
-                                        args["[AVATAR_NAME]"] = fullname;
+                                args["AVATAR_NAME"] = fullname;
-                                        gViewerWindow->alertXml("EjectAvatarFullnameNoBan",
+                                LLNotifications::instance().add("EjectAvatarFullnameNoBan",
-                                                args,
+                                                        args,
-                                                callback_eject,
+                                                        payload,
-                                                (void*)data);
+                                                        callback_eject);
                                }
                                else
                                {
-                                        gViewerWindow->alertXml("EjectAvatarNoBan",
+                                LLNotifications::instance().add("EjectAvatarNoBan",
-                                                callback_eject,
+                                                        LLSD(),
-                                                (void*)data);
+                                                        payload,
+                                                        callback_eject);
                                }
                        }
                }
@@ -2411,13 +2435,16 @@ class LLAvatarGiveCard : public view_listener_t
                if(dest && dest->isAvatar())
                {
                        bool found_name = false;
-                        LLStringUtil::format_map_t args;
+                        LLSD args;
+                        LLSD old_args;
                        LLNameValue* nvfirst = dest->getNVPair("FirstName");
                        LLNameValue* nvlast = dest->getNVPair("LastName");
                        if(nvfirst && nvlast)
                        {
-                                args["[FIRST]"] = nvfirst->getString();
+                                args["FIRST"] = nvfirst->getString();
-                                args["[LAST]"] = nvlast->getString();
+                                args["LAST"] = nvlast->getString();
+                                old_args["FIRST"] = nvfirst->getString();
+                                old_args["LAST"] = nvlast->getString();
                                found_name = true;
                        }
                        LLViewerRegion* region = dest->getRegion();
@@ -2439,11 +2466,11 @@ class LLAvatarGiveCard : public view_listener_t
                                transaction_id.generate();
                                msg->addUUIDFast(_PREHASH_TransactionID, transaction_id);
                                msg->sendReliable(dest_host);
-                                LLNotifyBox::showXml("OfferedCard", args);
+                                LLNotifications::instance().add("OfferedCard", args);
                        }
                        else
                        {
-                                gViewerWindow->alertXml("CantOfferCallingCard", args);
+                                LLNotifications::instance().add("CantOfferCallingCard", old_args);
                        }
                }
                return true;
@@ -2460,8 +2487,9 @@ void login_done(S32 which, void *user)
 }
-void callback_leave_group(S32 option, void *userdata)
+bool callback_leave_group(const LLSD& notification, const LLSD& response)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
        if (option == 0)
        {
                LLMessageSystem *msg = gMessageSystem;
@@ -2474,15 +2502,16 @@ void callback_leave_group(S32 option, void *userdata)
                msg->addUUIDFast(_PREHASH_GroupID, gAgent.mGroupID );
                gAgent.sendReliableMessage();
        }
+        return false;
 }
 void handle_leave_group(void *)
 {
        if (gAgent.getGroupID() != LLUUID::null)
        {
-                LLStringUtil::format_map_t args;
+                LLSD args;
-                args["[GROUP]"] = gAgent.mGroupName;
+                args["GROUP"] = gAgent.mGroupName;
-                gViewerWindow->alertXml("GroupLeaveConfirmMember", args, callback_leave_group);
+                LLNotifications::instance().add("GroupLeaveConfirmMember", args, LLSD(), callback_leave_group);
        }
 }
@@ -2545,7 +2574,7 @@ void handle_buy_object(LLSaleInfo sale_info)
 {
        if(!LLSelectMgr::getInstance()->selectGetAllRootsValid())
        {
-                LLNotifyBox::showXml("UnableToBuyWhileDownloading");
+                LLNotifications::instance().add("UnableToBuyWhileDownloading");
                return;
        }
@@ -2554,7 +2583,7 @@ void handle_buy_object(LLSaleInfo sale_info)
        BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
        if (!owners_identical)
        {
-                LLNotifyBox::showXml("CannotBuyObjectsFromDifferentOwners");
+                LLNotifications::instance().add("CannotBuyObjectsFromDifferentOwners");
                return;
        }
@@ -2564,7 +2593,7 @@ void handle_buy_object(LLSaleInfo sale_info)
        valid &= LLSelectMgr::getInstance()->selectGetAggregatePermissions(ag_perm);
        if(!valid || !sale_info.isForSale() || !perm.allowTransferTo(gAgent.getID()))
        {
-                LLNotifyBox::showXml("ObjectNotForSale");
+                LLNotifications::instance().add("ObjectNotForSale");
                return;
        }
@@ -2617,6 +2646,11 @@ void handle_region_dump_settings(void*)
        }
 }
+void handle_show_notifications_console(void *)
+{
+        LLFloaterNotificationConsole::showInstance();
+}
 void handle_dump_group_info(void *)
 {
        llinfos << "group   " << gAgent.mGroupName << llendl;
@@ -2710,22 +2744,22 @@ void set_god_level(U8 god_level)
        // inventory in items may change in god mode
        gObjectList.dirtyAllObjectInventory();
-    if(gViewerWindow)
+        if(gViewerWindow)
-    {
+        {
-        gViewerWindow->setMenuBackgroundColor(god_level > GOD_NOT,
+            gViewerWindow->setMenuBackgroundColor(god_level > GOD_NOT,
            LLViewerLogin::getInstance()->isInProductionGrid());
-    }
+        }
+    
-    LLStringUtil::format_map_t args;
+        LLSD args;
        if(god_level > GOD_NOT)
        {
-                args["[LEVEL]"] = llformat("%d",(S32)god_level);
+                args["LEVEL"] = llformat("%d",(S32)god_level);
-                LLNotifyBox::showXml("EnteringGodMode", args);
+                LLNotifications::instance().add("EnteringGodMode", args);
        }
        else
        {
-                args["[LEVEL]"] = llformat("%d",(S32)old_god_level);
+                args["LEVEL"] = llformat("%d",(S32)old_god_level);
-                LLNotifyBox::showXml("LeavingGodMode", args);
+                LLNotifications::instance().add("LeavingGodMode", args);
        }
@@ -2850,13 +2884,13 @@ void request_friendship(const LLUUID& dest_id)
        if(dest && dest->isAvatar())
        {
                std::string fullname;
-                LLStringUtil::format_map_t args;
+                LLSD args;
                LLNameValue* nvfirst = dest->getNVPair("FirstName");
                LLNameValue* nvlast = dest->getNVPair("LastName");
                if(nvfirst && nvlast)
                {
-                        args["[FIRST]"] = nvfirst->getString();
+                        args["FIRST"] = nvfirst->getString();
-                        args["[LAST]"] = nvlast->getString();
+                        args["LAST"] = nvlast->getString();
                        fullname = nvfirst->getString();
                        fullname += " ";
                        fullname += nvlast->getString();
@@ -2867,7 +2901,7 @@ void request_friendship(const LLUUID& dest_id)
                }
                else
                {
-                        gViewerWindow->alertXml("CantOfferFriendship");
+                        LLNotifications::instance().add("CantOfferFriendship");
                }
        }
 }
@@ -2877,12 +2911,10 @@ class LLEditEnableCustomizeAvatar : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                LLVOAvatar* avatar = gAgent.getAvatarObject();
+                bool new_value = (gAgent.getAvatarObject() && 
+                                                  gAgent.getAvatarObject()->isFullyLoaded() &&
-                bool enabled = ((avatar && avatar->isFullyLoaded()) &&
+                                                  gAgent.areWearablesLoaded());
-                                   (gAgent.getWearablesLoaded()));
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(enabled);
                return true;
        }
 };
@@ -3069,86 +3101,6 @@ void velocity_interpolate( void* data )
 }
-void update_fov(S32 increments)
-{
-        F32 old_fov = LLViewerCamera::getInstance()->getDefaultFOV();
-        // for each increment, FoV is 20% bigger
-        F32 new_fov = old_fov * pow(1.2f, increments);
-        // cap the FoV
-        new_fov = llclamp(new_fov, MIN_FIELD_OF_VIEW, MAX_FIELD_OF_VIEW);
-        if (new_fov != old_fov)
-        {
-                LLMessageSystem* msg = gMessageSystem;
-                msg->newMessageFast(_PREHASH_AgentFOV);
-                msg->nextBlockFast(_PREHASH_AgentData);
-                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                msg->addU32Fast(_PREHASH_CircuitCode, gMessageSystem->mOurCircuitCode);
-                msg->nextBlockFast(_PREHASH_FOVBlock);
-                msg->addU32Fast(_PREHASH_GenCounter, 0);
-                msg->addF32Fast(_PREHASH_VerticalAngle, new_fov);
-                gAgent.sendReliableMessage();
-                // force agent to update dirty patches
-                LLViewerCamera::getInstance()->setDefaultFOV(new_fov);
-                LLViewerCamera::getInstance()->setView(new_fov);
-        }
-}
-class LLViewZoomOut : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                update_fov(1);
-                return true;
-        }
-};
-class LLViewZoomIn : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                update_fov(-1);
-                return true;
-        }
-};
-class LLViewZoomDefault : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                F32 old_fov = LLViewerCamera::getInstance()->getView();
-                // for each increment, FoV is 20% bigger
-                F32 new_fov = DEFAULT_FIELD_OF_VIEW;
-                if (new_fov != old_fov)
-                {
-                        LLMessageSystem* msg = gMessageSystem;
-                        msg->newMessageFast(_PREHASH_AgentFOV);
-                        msg->nextBlockFast(_PREHASH_AgentData);
-                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                        msg->addU32Fast(_PREHASH_CircuitCode, gMessageSystem->mOurCircuitCode);
-                        msg->nextBlockFast(_PREHASH_FOVBlock);
-                        msg->addU32Fast(_PREHASH_GenCounter, 0);
-                        msg->addF32Fast(_PREHASH_VerticalAngle, new_fov);
-                        gAgent.sendReliableMessage();
-                        // force agent to update dirty patches
-                        LLViewerCamera::getInstance()->setDefaultFOV(new_fov);
-                        LLViewerCamera::getInstance()->setView(new_fov);
-                }
-                return true;
-        }
-};
 void toggle_wind_audio(void)
 {
        if (gAudiop)
@@ -3188,7 +3140,7 @@ void handle_reset_view()
        if( (CAMERA_MODE_CUSTOMIZE_AVATAR == gAgent.getCameraMode()) && gFloaterCustomize )
        {
                // Show dialog box if needed.
-                gFloaterCustomize->askToSaveAllIfDirty( reset_view_final, NULL );
+                gFloaterCustomize->askToSaveIfDirty( reset_view_final, NULL );
        }
        else
        {
@@ -3277,7 +3229,7 @@ void disabled_duplicate(void*)
 {
        if (LLSelectMgr::getInstance()->getSelection()->getPrimaryObject())
        {
-                LLNotifyBox::showXml("CopyFailed");
+                LLNotifications::instance().add("CopyFailed");
        }
 }
@@ -3410,7 +3362,7 @@ void handle_claim_public_land(void*)
 {
        if (LLViewerParcelMgr::getInstance()->getSelectionRegion() != gAgent.getRegion())
        {
-                LLNotifyBox::showXml("ClaimPublicLand");
+                LLNotifications::instance().add("ClaimPublicLand");
                return;
        }
@@ -3643,7 +3595,7 @@ void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
        }
        else if(!error.empty())
        {
-                gViewerWindow->alertXml(error);
+                LLNotifications::instance().add(error);
        }
 }
@@ -3670,16 +3622,13 @@ class LLObjectReturn : public view_listener_t
                
                mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
-                gViewerWindow->alertXml("ReturnToOwner",
+                LLNotifications::instance().add("ReturnToOwner", LLSD(), LLSD(), boost::bind(&LLObjectReturn::onReturnToOwner, this, _1, _2));
-                        onReturnToOwner,
-                        (void*)this);
                return true;
        }
-        static void onReturnToOwner(S32 option, void* data)
+        bool onReturnToOwner(const LLSD& notification, const LLSD& response)
        {
-                LLObjectReturn* object_return = (LLObjectReturn*)data;
+                S32 option = LLNotification::getSelectedOption(notification, response);
                if (0 == option)
                {
                        // Ignore category ID for this derez destination.
@@ -3687,7 +3636,8 @@ class LLObjectReturn : public view_listener_t
                }
                // drop reference to current selection
-                object_return->mObjectSelection = NULL;
+                mObjectSelection = NULL;
+                return false;
        }
 protected:
@@ -3824,48 +3774,46 @@ void handle_take()
        {
                category_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_OBJECT);
        }
-        LLUUID* cat_id = new LLUUID(category_id);
+        LLSD payload;
+        payload["folder_id"] = category_id;
+        LLNotification::Params params("ConfirmObjectTakeLock");
+        params.payload(payload)
+                .functor(confirm_take);
        if(locked_but_takeable_object ||
           !you_own_everything)
        {
                if(locked_but_takeable_object && you_own_everything)
                {
-                        gViewerWindow->alertXml("ConfirmObjectTakeLock",
+                        params.name("ConfirmObjectTakeLock");
-                        confirm_take,
-                        (void*)cat_id);
                }
                else if(!locked_but_takeable_object && !you_own_everything)
                {
-                        gViewerWindow->alertXml("ConfirmObjectTakeNoOwn",
+                        params.name("ConfirmObjectTakeNoOwn");
-                        confirm_take,
-                        (void*)cat_id);
                }
                else
                {
-                        gViewerWindow->alertXml("ConfirmObjectTakeLockNoOwn",
+                        params.name("ConfirmObjectTakeLockNoOwn");
-                        confirm_take,
-                        (void*)cat_id);
                }
+        
+                LLNotifications::instance().add(params);
        }
        else
        {
-                confirm_take(0, (void*)cat_id);
+                LLNotifications::instance().forceResponse(params, 0);
        }
 }
-void confirm_take(S32 option, void* data)
+bool confirm_take(const LLSD& notification, const LLSD& response)
 {
-        LLUUID* cat_id = (LLUUID*)data;
+        S32 option = LLNotification::getSelectedOption(notification, response);
-        if(!cat_id) return;
        if(enable_take() && (option == 0))
        {
-                derez_objects(DRD_TAKE_INTO_AGENT_INVENTORY, *cat_id);
+                derez_objects(DRD_TAKE_INTO_AGENT_INVENTORY, notification["payload"]["folder_id"].asUUID());
        }
-        delete cat_id;
+        return false;
 }
 // You can take an item when it is public and transferrable, or when
@@ -3936,13 +3884,67 @@ class LLToolsEnableTake : public view_listener_t
        }
 };
-void callback_show_buy_currency(S32 option, void*)
+// This is a small helper function to determine if we have a buy or a
+// take in the selection. This method is to help with the aliasing
+// problems of putting buy and take in the same pie menu space. After
+// a fair amont of discussion, it was determined to prefer buy over
+// take. The reasoning follows from the fact that when users walk up
+// to buy something, they will click on one or more items. Thus, if
+// anything is for sale, it becomes a buy operation, and the server
+// will group all of the buy items, and copyable/modifiable items into
+// one package and give the end user as much as the permissions will
+// allow. If the user wanted to take something, they will select fewer
+// and fewer items until only 'takeable' items are left. The one
+// exception is if you own everything in the selection that is for
+// sale, in this case, you can't buy stuff from yourself, so you can
+// take it.
+// return value = TRUE if selection is a 'buy'.
+//                FALSE if selection is a 'take'
+BOOL is_selection_buy_not_take()
+{
+        for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
+                 iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
+        {
+                LLSelectNode* node = *iter;
+                LLViewerObject* obj = node->getObject();
+                if(obj && !(obj->permYouOwner()) && (node->mSaleInfo.isForSale()))
+                {
+                        // you do not own the object and it is for sale, thus,
+                        // it's a buy
+                        return TRUE;
+                }
+        }
+        return FALSE;
+}
+S32 selection_price()
+{
+        S32 total_price = 0;
+        for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
+                 iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
+        {
+                LLSelectNode* node = *iter;
+                LLViewerObject* obj = node->getObject();
+                if(obj && !(obj->permYouOwner()) && (node->mSaleInfo.isForSale()))
+                {
+                        // you do not own the object and it is for sale.
+                        // Add its price.
+                        total_price += node->mSaleInfo.getSalePrice();
+                }
+        }
+        return total_price;
+}
+bool callback_show_buy_currency(const LLSD& notification, const LLSD& response)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
        if (0 == option)
        {
                llinfos << "Loading page " << BUY_CURRENCY_URL << llendl;
                LLWeb::loadURL(BUY_CURRENCY_URL);
        }
+        return false;
 }
@@ -3957,14 +3959,13 @@ void show_buy_currency(const char* extra)
        }
        mesg << "Go to " << BUY_CURRENCY_URL << "\nfor information on purchasing currency?";
-        LLStringUtil::format_map_t args;
+        LLSD args;
        if (extra != NULL)
        {
-                args["[EXTRA]"] = extra;
+                args["EXTRA"] = extra;
        }
-        args["[URL]"] = BUY_CURRENCY_URL;
+        args["URL"] = BUY_CURRENCY_URL;
-        gViewerWindow->alertXml("PromptGoToCurrencyPage", args, 
+        LLNotifications::instance().add("PromptGoToCurrencyPage", args, LLSD(), callback_show_buy_currency);
-                callback_show_buy_currency);
 }
 void handle_buy_currency(void*)
@@ -4028,18 +4029,6 @@ BOOL sitting_on_selection()
        return (avatar->mIsSitting && avatar->getRoot() == root_object);
 }
-class LLToolsSaveToInventory : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                if(enable_save_into_inventory(NULL))
-                {
-                        derez_objects(DRD_SAVE_INTO_AGENT_INVENTORY, LLUUID::null);
-                }
-                return true;
-        }
-};
 class LLToolsSaveToObjectInventory : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -4144,29 +4133,29 @@ class LLToolsLink : public view_listener_t
        {
                if(!LLSelectMgr::getInstance()->selectGetAllRootsValid())
                {
-                        LLNotifyBox::showXml("UnableToLinkWhileDownloading");
+                        LLNotifications::instance().add("UnableToLinkWhileDownloading");
                        return true;
                }
                S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
                if (object_count > MAX_CHILDREN_PER_TASK + 1)
                {
-                        LLStringUtil::format_map_t args;
+                        LLSD args;
-                        args["[COUNT]"] = llformat("%d", object_count);
+                        args["COUNT"] = llformat("%d", object_count);
                        int max = MAX_CHILDREN_PER_TASK+1;
-                        args["[MAX]"] = llformat("%d", max);
+                        args["MAX"] = llformat("%d", max);
-                        gViewerWindow->alertXml("UnableToLinkObjects", args);
+                        LLNotifications::instance().add("UnableToLinkObjects", args);
                        return true;
                }
                if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() < 2)
                {
-                        gViewerWindow->alertXml("CannotLinkIncompleteSet");
+                        LLNotifications::instance().add("CannotLinkIncompleteSet");
                        return true;
                }
                if(!LLSelectMgr::getInstance()->selectGetRootsModify())
                {
-                        gViewerWindow->alertXml("CannotLinkModify");
+                        LLNotifications::instance().add("CannotLinkModify");
                        return true;
                }
                LLUUID owner_id;
@@ -4176,7 +4165,7 @@ class LLToolsLink : public view_listener_t
                        // we don't actually care if you're the owner, but novices are
                        // the most likely to be stumped by this one, so offer the
                        // easiest and most likely solution.
-                        gViewerWindow->alertXml("CannotLinkDifferentOwners");
+                        LLNotifications::instance().add("CannotLinkDifferentOwners");
                        return true;
                }
                LLSelectMgr::getInstance()->sendLink();
@@ -4423,6 +4412,16 @@ void handle_force_delete(void*)
        LLSelectMgr::getInstance()->selectForceDelete();
 }
+class LLViewEnableJoystickFlycam : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = (gSavedSettings.getBOOL("JoystickEnabled") && gSavedSettings.getBOOL("JoystickFlycamEnabled"));
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
 class LLViewEnableLastChatter : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -4741,7 +4740,7 @@ class LLWorldSetBusy : public view_listener_t
                else
                {
                        gAgent.setBusy();
-                        gViewerWindow->alertXml("BusyModeSet");
+                        LLNotifications::instance().add("BusyModeSet");
                }
                return true;
        }
@@ -4767,7 +4766,7 @@ class LLWorldCreateLandmark : public view_listener_t
                if (!agent_parcel->getAllowLandmark()
                        && !LLViewerParcelMgr::isParcelOwnedByAgent(agent_parcel, GP_LAND_ALLOW_LANDMARK))
                {
-                        gViewerWindow->alertXml("CannotCreateLandmarkNotOwner");
+                        LLNotifications::instance().add("CannotCreateLandmarkNotOwner");
                        return true;
                }
@@ -4881,16 +4880,14 @@ class LLAvatarAddFriend : public view_listener_t
        }
 };
-void complete_give_money(S32 option, void* user_data)
+bool complete_give_money(const LLSD& notification, const LLSD& response, LLObjectSelectionHandle handle)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
        if (option == 0)
        {
                gAgent.clearBusy();
        }
-        LLObjectSelectionHandle handle(*(LLObjectSelectionHandle*)user_data);
-        delete (LLObjectSelectionHandle*)user_data;
        LLViewerObject* objectp = handle->getPrimaryObject();
        // Show avatar's name if paying attachment
@@ -4916,19 +4913,22 @@ void complete_give_money(S32 option, void* user_data)
                        LLFloaterPay::payViaObject(&give_money, objectp->getID());
                }
        }
+        return false;
 }
 bool handle_give_money_dialog()
 {
-        LLObjectSelectionHandle* handlep = new LLObjectSelectionHandle(LLSelectMgr::getInstance()->getSelection());
+        LLNotification::Params params("BusyModePay");
+        params.functor(boost::bind(complete_give_money, _1, _2, LLSelectMgr::getInstance()->getSelection()));
        if (gAgent.getBusy())
        {
                // warn users of being in busy mode during a transaction
-                gViewerWindow->alertXml("BusyModePay", complete_give_money, handlep);
+                LLNotifications::instance().add(params);
        }
        else
        {
-                complete_give_money(1, handlep);
+                LLNotifications::instance().forceResponse(params, 1);
        }
        return true;
 }
@@ -5079,7 +5079,7 @@ class LLShowFloater : public view_listener_t
                }
                else if (floater_name == "appearance")
                {
-                        if (gAgent.getWearablesLoaded())
+                        if (gAgent.areWearablesLoaded())
                        {
                                gAgent.changeCameraToCustomizeAvatar();
                        }
@@ -5130,7 +5130,7 @@ class LLShowFloater : public view_listener_t
                }
                else if (floater_name == "stat bar")
                {
-                        gDebugView->mFloaterStatsp->setVisible(!gDebugView->mFloaterStatsp->getVisible());
+                        LLFloaterStats::toggleInstance();
                }
                else if (floater_name == "my land")
                {
@@ -5217,6 +5217,10 @@ class LLShowFloater : public view_listener_t
                {
                        LLFloaterBeacons::toggleInstance(LLSD());
                }
+                else if (floater_name == "perm prefs")
+                {
+                        LLFloaterPerms::toggleInstance(LLSD());
+                }
                return true;
        }
 };
@@ -5262,7 +5266,7 @@ class LLFloaterVisible : public view_listener_t
                }
                else if (floater_name == "stat bar")
                {
-                        new_value = gDebugView->mFloaterStatsp->getVisible();
+                        new_value = LLFloaterStats::instanceVisible();
                }
                else if (floater_name == "active speakers")
                {
@@ -5282,14 +5286,14 @@ class LLFloaterVisible : public view_listener_t
        }
 };
-void callback_show_url(S32 option, void* data)
+bool callback_show_url(const LLSD& notification, const LLSD& response)
 {
-        std::string* urlp = (std::string*)data;
+        S32 option = LLNotification::getSelectedOption(notification, response);
        if (0 == option)
        {
-                LLWeb::loadURL(*urlp);
+                LLWeb::loadURL(notification["payload"]["url"].asString());
        }
-        delete urlp;
+        return false;
 }
 class LLPromptShowURL : public view_listener_t
@@ -5302,8 +5306,17 @@ class LLPromptShowURL : public view_listener_t
                {
                        std::string alert = param.substr(0, offset);
                        std::string url = param.substr(offset+1);
-                        std::string* url_copy = new std::string(url);
-                        gViewerWindow->alertXml(alert, callback_show_url, url_copy);
+                        if(gSavedSettings.getBOOL("UseExternalBrowser"))
+                        { 
+                        LLSD payload;
+                        payload["url"] = url;
+                        LLNotifications::instance().add(alert, LLSD(), payload, callback_show_url);
+                        }
+                        else
+                        {
+                        LLWeb::loadURL(url);
+                        }
                }
                else
                {
@@ -5313,6 +5326,39 @@ class LLPromptShowURL : public view_listener_t
        }
 };
+bool callback_show_file(const LLSD& notification, const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if (0 == option)
+        {
+                LLWeb::loadURL(notification["payload"]["url"]);
+        }
+        return false;
+}
+class LLPromptShowFile : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string param = userdata.asString();
+                std::string::size_type offset = param.find(",");
+                if (offset != param.npos)
+                {
+                        std::string alert = param.substr(0, offset);
+                        std::string file = param.substr(offset+1);
+                        LLSD payload;
+                        payload["url"] = file;
+                        LLNotifications::instance().add(alert, LLSD(), payload, callback_show_file);
+                }
+                else
+                {
+                        llinfos << "PromptShowFile invalid parameters! Expecting \"ALERT,FILE\"." << llendl;
+                }
+                return true;
+        }
+};
 class LLShowAgentProfile : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -5401,7 +5447,6 @@ class LLLandEdit : public view_listener_t
                LLViewerParcelMgr::getInstance()->selectParcelAt( LLToolPie::getInstance()->getPick().mPosGlobal );
-                gFloaterTools->showMore(TRUE);
                gFloaterView->bringToFront( gFloaterTools );
                // Switch to land edit toolset
@@ -5712,8 +5757,7 @@ class LLAttachmentEnableDrop : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-                LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+                BOOL can_build   = gAgent.isGodlike() || (LLViewerParcelMgr::getInstance()->agentCanBuild());
-                BOOL can_build   = gAgent.isGodlike() || (parcel && parcel->getAllowModify());
                //Add an inventory observer to only allow dropping the newly attached item
                //once it exists in your inventory.  Look at Jira 2422.
@@ -5944,11 +5988,11 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
        {
                if ( !func.scripted )
                {
-                        gViewerWindow->alertXml(noscriptmsg);
+                        LLNotifications::instance().add(noscriptmsg);
                }
                else if ( !func.modifiable )
                {
-                        gViewerWindow->alertXml(nomodmsg);
+                        LLNotifications::instance().add(nomodmsg);
                }
                else
                {
@@ -6169,13 +6213,6 @@ class LLToggleControl : public view_listener_t
        }
 };
-// As above, but can be a callback from a LLCheckboxCtrl
-void check_toggle_control( LLUICtrl *, void* user_data )
-{
-        BOOL checked = gSavedSettings.getBOOL( static_cast<char*>(user_data) );
-        gSavedSettings.setBOOL( static_cast<char*>(user_data), !checked );
-}
 BOOL menu_check_control( void* user_data)
 {
        return gSavedSettings.getBOOL((char*)user_data);
@@ -6402,16 +6439,6 @@ BOOL enable_save_into_inventory(void*)
        return FALSE;
 }
-class LLToolsEnableSaveToInventory : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                bool new_value = enable_save_into_inventory(NULL);
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                return true;
-        }
-};
 BOOL enable_save_into_task_inventory(void*)
 {
        LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
@@ -6724,12 +6751,12 @@ void handle_debug_avatar_textures(void*)
 void handle_grab_texture(void* data)
 {
-        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex)((intptr_t)data);
+        ETextureIndex index = (ETextureIndex)((intptr_t)data);
        LLVOAvatar* avatar = gAgent.getAvatarObject();
        if ( avatar )
        {
                const LLUUID& asset_id = avatar->grabLocalTexture(index);
-                llinfos << "Adding baked texture " << asset_id << " to inventory." << llendl;
+                LL_INFOS("texture") << "Adding baked texture " << asset_id << " to inventory." << llendl;
                LLAssetType::EType asset_type = LLAssetType::AT_TEXTURE;
                LLInventoryType::EType inv_type = LLInventoryType::IT_TEXTURE;
                LLUUID folder_id(gInventory.findCategoryUUIDForType(asset_type));
@@ -6738,21 +6765,24 @@ void handle_grab_texture(void* data)
                        std::string name = "Baked ";
                        switch (index)
                        {
-                        case LLVOAvatar::TEX_EYES_BAKED:
+                        case TEX_EYES_BAKED:
                                name.append("Iris");
                                break;
-                        case LLVOAvatar::TEX_HEAD_BAKED:
+                        case TEX_HEAD_BAKED:
                                name.append("Head");
                                break;
-                        case LLVOAvatar::TEX_UPPER_BAKED:
+                        case TEX_UPPER_BAKED:
                                name.append("Upper Body");
                                break;
-                        case LLVOAvatar::TEX_LOWER_BAKED:
+                        case TEX_LOWER_BAKED:
                                name.append("Lower Body");
                                break;
-                        case LLVOAvatar::TEX_SKIRT_BAKED:
+                        case TEX_SKIRT_BAKED:
                                name.append("Skirt");
                                break;
+                        case TEX_HAIR_BAKED:
+                                name.append("Hair");
+                                break;
                        default:
                                name.append("Unknown");
                                break;
@@ -6814,7 +6844,7 @@ void handle_grab_texture(void* data)
 BOOL enable_grab_texture(void* data)
 {
-        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex)((intptr_t)data);
+        ETextureIndex index = (ETextureIndex)((intptr_t)data);
        LLVOAvatar* avatar = gAgent.getAvatarObject();
        if ( avatar )
        {
@@ -6965,7 +6995,7 @@ void handle_save_to_xml(void*)
        LLFloater* frontmost = gFloaterView->getFrontmost();
        if (!frontmost)
        {
-        gViewerWindow->alertXml("NoFrontmostFloater");
+        LLNotifications::instance().add("NoFrontmostFloater");
                return;
        }
@@ -6998,10 +7028,52 @@ void handle_load_from_xml(void*)
        }
 }
-void handle_slurl_test(void*)
+void handle_web_browser_test(void*)
 {
-        std::string test_slurl = "http://secondlife.com/app/search/slurls.html";
+        const bool open_links_externally = false;
-        LLFloaterMediaBrowser::showInstance(test_slurl);
+        const bool open_app_slurls = true;
+        LLFloaterHtml::getInstance()->show(
+                "http://secondlife.com/app/search/slurls.html",
+                "Web Browser Test", 
+                open_links_externally, 
+                open_app_slurls);
+}
+void handle_buy_currency_test(void*)
+{
+        std::string url =
+                "http://sarahd-sl-13041.webdev.lindenlab.com/app/lindex/index.php?agent_id=[AGENT_ID]&secure_session_id=[SESSION_ID]&lang=[LANGUAGE]";
+        LLStringUtil::format_map_t replace;
+        replace["[AGENT_ID]"] = gAgent.getID().asString();
+        replace["[SESSION_ID]"] = gAgent.getSecureSessionID().asString();
+        // *TODO: Replace with call to LLUI::getLanguage() after windows-setup
+        // branch merges in. JC
+        std::string language = "en-us";
+        language = gSavedSettings.getString("Language");
+        if (language.empty() || language == "default")
+        {
+                language = gSavedSettings.getString("InstallLanguage");
+        }
+        if (language.empty() || language == "default")
+        {
+                language = gSavedSettings.getString("SystemLanguage");
+        }
+        if (language.empty() || language == "default")
+        {
+                language = "en-us";
+        }
+        replace["[LANGUAGE]"] = language;
+        LLStringUtil::format(url, replace);
+        llinfos << "buy currency url " << url << llendl;
+        LLFloaterHtmlCurrency* floater = LLFloaterHtmlCurrency::showInstance(url);
+        // Needed so we can use secondlife:///app/floater/self/close SLURLs
+        floater->setTrusted(true);
+        floater->center();
 }
 void handle_rebake_textures(void*)
@@ -9495,6 +9567,24 @@ static void addMenu(view_listener_t *menu, const char *name)
 void initialize_menus()
 {
+        // A parameterized event handler used as ctrl-8/9/0 zoom controls below.
+        class LLZoomer : public view_listener_t
+        {
+        public:
+                // The "mult" parameter says whether "val" is a multiplier or used to set the value.
+                LLZoomer(F32 val, bool mult=true) : mVal(val), mMult(mult) {}
+                bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+                {
+                        F32 new_fov_rad = mMult ? LLViewerCamera::getInstance()->getDefaultFOV() * mVal : mVal;
+                        LLViewerCamera::getInstance()->setDefaultFOV(new_fov_rad);
+                        gSavedSettings.setF32("CameraAngle", LLViewerCamera::getInstance()->getView()); // setView may have clamped it.
+                        return true;
+                }
+        private:
+                F32 mVal;
+                bool mMult;
+        };
        // File menu
        init_menu_file();
@@ -9535,14 +9625,14 @@ void initialize_menus()
        addMenu(new LLViewHighlightTransparent(), "View.HighlightTransparent");
        addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType");
        addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments");
-        addMenu(new LLViewZoomOut(), "View.ZoomOut");
+        addMenu(new LLZoomer(1.2f), "View.ZoomOut");
-        addMenu(new LLViewZoomIn(), "View.ZoomIn");
+        addMenu(new LLZoomer(1/1.2f), "View.ZoomIn");
-        addMenu(new LLViewZoomDefault(), "View.ZoomDefault");
+        addMenu(new LLZoomer(DEFAULT_FIELD_OF_VIEW, false), "View.ZoomDefault");
        addMenu(new LLViewFullscreen(), "View.Fullscreen");
-        addMenu(new LLViewToggleAdvanced(), "View.ToggleAdvanced");
+        addMenu(new LLViewDefaultUISize(), "View.DefaultUISize");
        addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
+        addMenu(new LLViewEnableJoystickFlycam(), "View.EnableJoystickFlycam");
        addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
        addMenu(new LLViewCheckBuildMode(), "View.CheckBuildMode");
@@ -9596,7 +9686,6 @@ void initialize_menus()
        addMenu(new LLToolsLookAtSelection(), "Tools.LookAtSelection");
        addMenu(new LLToolsTake(), "Tools.Take");
        addMenu(new LLToolsTakeCopy(), "Tools.TakeCopy");
-        addMenu(new LLToolsSaveToInventory(), "Tools.SaveToInventory");
        addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory");
        addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction");
        addMenu(new LLToolsSetBulkPerms(), "Tools.SetBulkPerms");
@@ -9606,7 +9695,6 @@ void initialize_menus()
        addMenu(new LLToolsEnableUnlink(), "Tools.EnableUnlink");
        addMenu(new LLToolsEnableTake(), "Tools.EnableTake");
        addMenu(new LLToolsEnableTakeCopy(), "Tools.EnableTakeCopy");
-        addMenu(new LLToolsEnableSaveToInventory(), "Tools.SaveToInventory");
        addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.SaveToObjectInventory");
        /*addMenu(new LLToolsVisibleBuyObject(), "Tools.VisibleBuyObject");
author	Jacek Antonelli	2009-08-29 17:44:38 -0500
committer	Jacek Antonelli	2009-08-29 22:49:51 -0500
commit	6a5aab98892df74f60743f5b789959c9593d6647 (patch)
tree	62da18f8540879ed01e12eeb0ce49375474272e4 /linden/indra/newview/llviewermenu.cpp
parent	Merge branch 'mac-openal-url' into next (diff)
parent	Converted 1.23 XUI files to unix line endings. (diff)
download	meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.zip meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.gz meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.bz2 meta-impy-6a5aab98892df74f60743f5b789959c9593d6647.tar.xz