Merged SL 1.22.11 into Imprudence 1.1 RC2.

Conflicts:
	linden/doc/contributions.txt
	linden/indra/cmake/APR.cmake
	linden/indra/cmake/CopyWinLibs.cmake
	linden/indra/cmake/LLKDU.cmake                            (removed)
	linden/indra/cmake/LLMedia.cmake
	linden/indra/cmake/OPENAL.cmake
	linden/indra/cmake/QuickTime.cmake                        (removed)
	linden/indra/develop.py
	linden/indra/lib/python/indra/base/llsd.py
	linden/indra/lib/python/indra/util/fastest_elementtree.py
	linden/indra/lib/python/indra/util/llmanifest.py
	linden/indra/lib/python/indra/util/named_query.py
	linden/indra/llaudio/CMakeLists.txt
	linden/indra/llaudio/audioengine.cpp
	linden/indra/llaudio/audioengine.h
	linden/indra/llaudio/audioengine_fmod.cpp
	linden/indra/llaudio/audioengine_fmod.h
	linden/indra/llaudio/audioengine_openal.cpp
	linden/indra/llaudio/audioengine_openal.h
	linden/indra/llaudio/listener_openal.cpp
	linden/indra/llaudio/listener_openal.h
	linden/indra/llaudio/windgen.h
	linden/indra/llcrashlogger/llcrashlogger.cpp
	linden/indra/llmedia/llmediaimplgstreamer.cpp
	linden/indra/llmedia/llmediaimplgstreamer_syms.cpp     (removed)
	linden/indra/llmedia/llmediaimplgstreamer_syms.h       (removed)
	linden/indra/llmessage/llcircuit.h
	linden/indra/llrender/llgl.cpp
	linden/indra/llrender/llrender.h
	linden/indra/llui/llfloater.cpp
	linden/indra/llui/lltexteditor.cpp
	linden/indra/llwindow/llwindowsdl.cpp
	linden/indra/mac_crash_logger/CMakeLists.txt
	linden/indra/mac_updater/CMakeLists.txt
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/installers/windows/lang_de.nsi
	linden/indra/newview/installers/windows/lang_en-us.nsi
	linden/indra/newview/installers/windows/lang_ja.nsi
	linden/indra/newview/installers/windows/lang_ko.nsi
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llaudiosourcevo.cpp
	linden/indra/newview/llfloaterabout.cpp
	linden/indra/newview/llfloaterhtml.cpp
	linden/indra/newview/llfloaterhtml.h
	linden/indra/newview/llfloaterinspect.cpp
	linden/indra/newview/llfloatersnapshot.cpp
	linden/indra/newview/llpanelgeneral.cpp
	linden/indra/newview/llpanelgeneral.h
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/llpanelobject.cpp
	linden/indra/newview/llurlhistory.cpp
	linden/indra/newview/llviewermenu.cpp
	linden/indra/newview/llviewernetwork.cpp
	linden/indra/newview/llviewernetwork.h
	linden/indra/newview/llviewerobject.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/de/floater_env_settings.xml
	linden/indra/newview/skins/default/xui/de/floater_html.xml
	linden/indra/newview/skins/default/xui/de/floater_inspect.xml
	linden/indra/newview/skins/default/xui/de/floater_instant_message_group.xml
	linden/indra/newview/skins/default/xui/de/floater_lagmeter.xml
	linden/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
	linden/indra/newview/skins/default/xui/de/floater_url_entry.xml
	linden/indra/newview/skins/default/xui/de/floater_water.xml
	linden/indra/newview/skins/default/xui/de/mime_types.xml
	linden/indra/newview/skins/default/xui/de/need_to_long.xml
	linden/indra/newview/skins/default/xui/de/need_to_translate.xml
	linden/indra/newview/skins/default/xui/de/need_to_update.xml
	linden/indra/newview/skins/default/xui/de/panel_friends.xml
	linden/indra/newview/skins/default/xui/de/panel_media_remote_expanded.xml
	linden/indra/newview/skins/default/xui/de/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/de/panel_voice_controls.xml
	linden/indra/newview/skins/default/xui/de/panel_voice_enable.xml
	linden/indra/newview/skins/default/xui/de/panel_voice_options.xml
	linden/indra/newview/skins/default/xui/de/strings.xml
	linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
	linden/indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
	linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
	linden/indra/newview/skins/default/xui/en-us/floater_lagmeter.xml
	linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
	linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
	linden/indra/newview/skins/default/xui/en-us/panel_audio_device.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.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/panel_voice_remote.xml
	linden/indra/newview/skins/default/xui/en-us/panel_voice_remote_expanded.xml
	linden/indra/newview/skins/default/xui/es/alerts.xml
	linden/indra/newview/skins/default/xui/es/floater_about_land.xml
	linden/indra/newview/skins/default/xui/es/floater_mute.xml
	linden/indra/newview/skins/default/xui/es/menu_viewer.xml
	linden/indra/newview/skins/default/xui/es/panel_group_land_money.xml
	linden/indra/newview/skins/default/xui/es/panel_preferences_general.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_active_speakers.xml
	linden/indra/newview/skins/default/xui/fr/floater_animation_preview.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_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_buy_object.xml
	linden/indra/newview/skins/default/xui/fr/floater_chat_history.xml
	linden/indra/newview/skins/default/xui/fr/floater_color_picker.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_env_settings.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_hardware_settings.xml
	linden/indra/newview/skins/default/xui/fr/floater_html.xml
	linden/indra/newview/skins/default/xui/fr/floater_image_preview.xml
	linden/indra/newview/skins/default/xui/fr/floater_import.xml
	linden/indra/newview/skins/default/xui/fr/floater_instant_message.xml
	linden/indra/newview/skins/default/xui/fr/floater_instant_message_ad_hoc.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_item_properties.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_lagmeter.xml
	linden/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
	linden/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
	linden/indra/newview/skins/default/xui/fr/floater_media_browser.xml
	linden/indra/newview/skins/default/xui/fr/floater_moveview.xml
	linden/indra/newview/skins/default/xui/fr/floater_mute.xml
	linden/indra/newview/skins/default/xui/fr/floater_mute_object.xml
	linden/indra/newview/skins/default/xui/fr/floater_name_description.xml
	linden/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
	linden/indra/newview/skins/default/xui/fr/floater_openobject.xml
	linden/indra/newview/skins/default/xui/fr/floater_pay.xml
	linden/indra/newview/skins/default/xui/fr/floater_pay_object.xml
	linden/indra/newview/skins/default/xui/fr/floater_preferences.xml
	linden/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
	linden/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
	linden/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
	linden/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml
	linden/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
	linden/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
	linden/indra/newview/skins/default/xui/fr/floater_region_info.xml
	linden/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
	linden/indra/newview/skins/default/xui/fr/floater_report_bug.xml
	linden/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml
	linden/indra/newview/skins/default/xui/fr/floater_sell_land.xml
	linden/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
	linden/indra/newview/skins/default/xui/fr/floater_skin_preview_template.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_telehub.xml
	linden/indra/newview/skins/default/xui/fr/floater_texture_ctrl.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_url_entry.xml
	linden/indra/newview/skins/default/xui/fr/floater_windlight_options.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_pie_avatar.xml
	linden/indra/newview/skins/default/xui/fr/menu_pie_land.xml
	linden/indra/newview/skins/default/xui/fr/menu_pie_self.xml
	linden/indra/newview/skins/default/xui/fr/menu_viewer.xml
	linden/indra/newview/skins/default/xui/fr/mime_types.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_audio_device.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_chat_bar.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.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_finder.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_notices.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_roles.xml
	linden/indra/newview/skins/default/xui/fr/panel_group_voting.xml
	linden/indra/newview/skins/default/xui/fr/panel_groups.xml
	linden/indra/newview/skins/default/xui/fr/panel_login.xml
	linden/indra/newview/skins/default/xui/fr/panel_master_volume.xml
	linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
	linden/indra/newview/skins/default/xui/fr/panel_media_remote.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_chat.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.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_popups.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/fr/panel_preferences_web.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_estate.xml
	linden/indra/newview/skins/default/xui/fr/panel_region_general.xml
	linden/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
	linden/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
	linden/indra/newview/skins/default/xui/fr/panel_speaker_controls.xml
	linden/indra/newview/skins/default/xui/fr/panel_status_bar.xml
	linden/indra/newview/skins/default/xui/fr/panel_toolbar.xml
	linden/indra/newview/skins/default/xui/fr/panel_voice_controls.xml
	linden/indra/newview/skins/default/xui/fr/panel_voice_enable.xml
	linden/indra/newview/skins/default/xui/fr/panel_voice_options.xml
	linden/indra/newview/skins/default/xui/fr/panel_voice_remote_expanded.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/ja/floater_hardware_settings.xml
	linden/indra/newview/skins/default/xui/ja/floater_inspect.xml
	linden/indra/newview/skins/default/xui/ja/floater_instant_message_group.xml
	linden/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
	linden/indra/newview/skins/default/xui/ja/floater_media_browser.xml
	linden/indra/newview/skins/default/xui/ja/floater_mute_object.xml
	linden/indra/newview/skins/default/xui/ja/floater_url_entry.xml
	linden/indra/newview/skins/default/xui/ja/need_to_long.xml
	linden/indra/newview/skins/default/xui/ja/need_to_translate.xml
	linden/indra/newview/skins/default/xui/ja/need_to_update.xml
	linden/indra/newview/skins/default/xui/ja/panel_audio.xml
	linden/indra/newview/skins/default/xui/ja/panel_groups.xml
	linden/indra/newview/skins/default/xui/ja/panel_preferences_voice.xml
	linden/indra/newview/skins/default/xui/ja/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/ja/strings.xml
	linden/indra/newview/skins/default/xui/ko/need_to_long.xml
	linden/indra/newview/skins/default/xui/ko/need_to_translate.xml
	linden/indra/newview/skins/default/xui/ko/need_to_update.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_animation_preview.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_build_options.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_color_picker.xml
	linden/indra/newview/skins/default/xui/pt/floater_customize.xml
	linden/indra/newview/skins/default/xui/pt/floater_directory.xml
	linden/indra/newview/skins/default/xui/pt/floater_gesture.xml
	linden/indra/newview/skins/default/xui/pt/floater_html.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_instant_message.xml
	linden/indra/newview/skins/default/xui/pt/floater_instant_message_ad_hoc.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_joystick.xml
	linden/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
	linden/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
	linden/indra/newview/skins/default/xui/pt/floater_mute.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_pay_object.xml
	linden/indra/newview/skins/default/xui/pt/floater_postcard.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
	linden/indra/newview/skins/default/xui/pt/floater_preview_notecard_keep_discard.xml
	linden/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
	linden/indra/newview/skins/default/xui/pt/floater_report_bug.xml
	linden/indra/newview/skins/default/xui/pt/floater_script_debug.xml
	linden/indra/newview/skins/default/xui/pt/floater_script_ed_panel.xml
	linden/indra/newview/skins/default/xui/pt/floater_snapshot.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_world_map.xml
	linden/indra/newview/skins/default/xui/pt/menu_inventory.xml
	linden/indra/newview/skins/default/xui/pt/menu_pie_avatar.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_avatar.xml
	linden/indra/newview/skins/default/xui/pt/panel_avatar_classified.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_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_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_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_status_bar.xml
	linden/indra/newview/skins/default/xui/pt/panel_toolbar.xml
	linden/indra/newview/skins/default/xui/pt/teleport_strings.xml
	linden/indra/newview/skins/default/xui/zh/floater_account_history.xml
	linden/indra/newview/skins/default/xui/zh/floater_god_tools.xml
	linden/indra/newview/skins/default/xui/zh/floater_html.xml
	linden/indra/newview/skins/default/xui/zh/floater_inspect.xml
	linden/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
	linden/indra/newview/skins/default/xui/zh/floater_preferences.xml
	linden/indra/newview/skins/default/xui/zh/floater_sell_land.xml
	linden/indra/newview/skins/default/xui/zh/floater_settings_debug.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_pie_self.xml
	linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
	linden/indra/newview/skins/default/xui/zh/need_to_translate.xml
	linden/indra/newview/skins/default/xui/zh/panel_account_details.xml
	linden/indra/newview/skins/default/xui/zh/panel_account_planning.xml
	linden/indra/newview/skins/default/xui/zh/panel_account_transactions.xml
	linden/indra/newview/skins/default/xui/zh/panel_avatar.xml
	linden/indra/newview/skins/default/xui/zh/panel_group.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_finder.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_group_voting.xml
	linden/indra/newview/skins/default/xui/zh/panel_preferences_audio.xml
	linden/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
	linden/indra/newview/skins/default/xui/zh/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/zh/panel_preferences_popups.xml
	linden/indra/newview/skins/default/xui/zh/panel_region_covenant.xml
	linden/indra/newview/skins/default/xui/zh/strings.xml
	linden/indra/newview/skins/default/xui/zh/strings_long.xml
	linden/indra/newview/skins/silver/xui/en-us/floater_about_land.xml
	linden/indra/newview/skins/silver/xui/en-us/panel_status_bar.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/win_updater/updater.cpp
	linden/install.xml

1 files changed, 176 insertions, 104 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index d268397..301f00b 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -80,6 +80,7 @@
 #include "llfloatertools.h"
 #include "llfloaterworldmap.h"
 #include "llgroupmgr.h"
+#include "llhomelocationresponder.h"
 #include "llhudeffectlookat.h"
 #include "llhudmanager.h"
 #include "llinventorymodel.h"
@@ -90,6 +91,7 @@
 #include "llmoveview.h"
 #include "llnotify.h"
 #include "llquantize.h"
+#include "llsdutil.h"
 #include "llselectmgr.h"
 #include "llsky.h"
 #include "llrendersphere.h"
@@ -445,7 +447,7 @@ void LLAgent::init()
         mCameraFocusOffsetTarget = LLVector4(gSavedSettings.getVector3("CameraOffsetBuild"));
         mCameraOffsetDefault = gSavedSettings.getVector3("CameraOffsetDefault");
 //      mCameraOffsetNorm = mCameraOffsetDefault;
-//      mCameraOffsetNorm.normVec();
+//      mCameraOffsetNorm.normalize();
         mCameraCollidePlane.clearVec();
         mCurrentCameraDistance = mCameraOffsetDefault.magVec();
         mTargetCameraDistance = mCurrentCameraDistance;
@@ -490,7 +492,7 @@ LLAgent::~LLAgent()
 //-----------------------------------------------------------------------------
 // resetView()
 //-----------------------------------------------------------------------------
-void LLAgent::resetView(BOOL reset_camera)
+void LLAgent::resetView(BOOL reset_camera, BOOL change_camera)
 {
         if (mAutoPilot)
         {
@@ -515,6 +517,30 @@ void LLAgent::resetView(BOOL reset_camera)
                 gMenuHolder->hideMenus();
         }
 
+        if (change_camera && !gSavedSettings.getBOOL("FreezeTime"))
+        {
+                changeCameraToDefault();
+                
+                if (LLViewerJoystick::getInstance()->getOverrideCamera())
+                {
+                        handle_toggle_flycam();
+                }
+
+                // reset avatar mode from eventual residual motion
+                if (LLToolMgr::getInstance()->inBuildMode())
+                {
+                        LLViewerJoystick::getInstance()->moveAvatar(true);
+                }
+
+                gFloaterTools->close();
+                
+                gViewerWindow->showCursor();
+
+                // Switch back to basic toolset
+                LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
+        }
+
+
         if (reset_camera && !gSavedSettings.getBOOL("FreezeTime"))
         {
                 if (!gViewerWindow->getLeftMouseDown() && cameraThirdPerson())
@@ -522,7 +548,7 @@ void LLAgent::resetView(BOOL reset_camera)
                         // leaving mouse-steer mode
                         LLVector3 agent_at_axis = getAtAxis();
                         agent_at_axis -= projected_vec(agent_at_axis, getReferenceUpVector());
-                        agent_at_axis.normVec();
+                        agent_at_axis.normalize();
                         gAgent.resetAxes(lerp(getAtAxis(), agent_at_axis, LLCriticalDamp::getInterpolant(0.3f)));
                 }
 
@@ -1033,7 +1059,7 @@ void LLAgent::slamLookAt(const LLVector3 &look_at)
 {
         LLVector3 look_at_norm = look_at;
         look_at_norm.mV[VZ] = 0.f;
-        look_at_norm.normVec();
+        look_at_norm.normalize();
         resetAxes(look_at_norm);
 }
 
@@ -1294,7 +1320,7 @@ LLQuaternion LLAgent::getQuat() const
 //-----------------------------------------------------------------------------
 // calcFocusOffset()
 //-----------------------------------------------------------------------------
-LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
+LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, LLVector3 pos_agent, S32 x, S32 y)
 {
         // calculate offset based on view direction
         BOOL is_avatar = object->isAvatar();
@@ -1305,7 +1331,7 @@ LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
 
         LLVector3 obj_dir_abs = obj_pos - LLViewerCamera::getInstance()->getOrigin();
         obj_dir_abs.rotVec(inv_obj_rot);
-        obj_dir_abs.normVec();
+        obj_dir_abs.normalize();
         obj_dir_abs.abs();
 
         LLVector3 object_extents = object->getScale();
@@ -1330,7 +1356,7 @@ LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
         {
                 normal.setVec(obj_matrix.getUpRow4());
         }
-        normal.normVec();
+        normal.normalize();
 
         LLVector3d focus_pt_global;
         // RN: should we check return value for valid pick?
@@ -1397,7 +1423,7 @@ LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
         if (!is_avatar) 
         {
                 //unproject relative clicked coordinate from window coordinate using GL
-                GLint viewport[4];
+                /*GLint viewport[4];
                 GLdouble modelview[16];
                 GLdouble projection[16];
                 GLfloat winX, winY, winZ;
@@ -1419,11 +1445,9 @@ LLVector3 LLAgent::calcFocusOffset(LLViewerObject *object, S32 x, S32 y)
                 winY = ((F32)y) * gViewerWindow->getDisplayScale().mV[VY];
                 glReadPixels( llfloor(winX), llfloor(winY), 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &winZ );
 
-                gluUnProject( winX, winY, winZ, modelview, projection, viewport, &posX, &posY, &posZ);
+                gluUnProject( winX, winY, winZ, modelview, projection, viewport, &posX, &posY, &posZ);*/
 
-                LLVector3 obj_rel((F32)posX, (F32)posY, (F32)posZ);
-                obj_rel = obj_rel * object->getRenderMatrix();
-                obj_rel -= object->getRenderPosition();
+                LLVector3 obj_rel = pos_agent - object->getRenderPosition();
                 
                 LLVector3 obj_center = LLVector3(0, 0, 0) * object->getRenderMatrix();
 
@@ -1534,7 +1558,7 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
         camera_offset_target_abs_norm.abs();
         // make sure offset is non-zero
         camera_offset_target_abs_norm.clamp(0.001f, F32_MAX);
-        camera_offset_target_abs_norm.normVec();
+        camera_offset_target_abs_norm.normalize();
 
         // find camera position relative to normalized object extents
         LLVector3 camera_offset_target_scaled = camera_offset_target_abs_norm;
@@ -1580,7 +1604,7 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
         LLVector3 object_split_axis;
         LLVector3 target_offset_scaled = target_offset_origin;
         target_offset_scaled.abs();
-        target_offset_scaled.normVec();
+        target_offset_scaled.normalize();
         target_offset_scaled.mV[VX] /= object_extents.mV[VX];
         target_offset_scaled.mV[VY] /= object_extents.mV[VY];
         target_offset_scaled.mV[VZ] /= object_extents.mV[VZ];
@@ -1703,7 +1727,7 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
         else if (cameraCustomizeAvatar())
         {
                 LLVector3d camera_offset_dir = mCameraFocusOffsetTarget;
-                camera_offset_dir.normVec();
+                camera_offset_dir.normalize();
                 mCameraFocusOffsetTarget = camera_offset_dir * rescale(fraction, 0.f, 1.f, APPEARANCE_MAX_ZOOM, APPEARANCE_MIN_ZOOM);
         }
         else
@@ -1730,7 +1754,7 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
                 }
 
                 LLVector3d camera_offset_dir = mCameraFocusOffsetTarget;
-                camera_offset_dir.normVec();
+                camera_offset_dir.normalize();
                 mCameraFocusOffsetTarget = camera_offset_dir * rescale(fraction, 0.f, 1.f, max_zoom, min_zoom);
         }
         startCameraAnimation();
@@ -1777,7 +1801,7 @@ void LLAgent::cameraOrbitOver(const F32 angle)
         else
         {
                 LLVector3 camera_offset_unit(mCameraFocusOffsetTarget);
-                camera_offset_unit.normVec();
+                camera_offset_unit.normalize();
 
                 F32 angle_from_up = acos( camera_offset_unit * getReferenceUpVector() );
 
@@ -1812,7 +1836,7 @@ void LLAgent::cameraZoomIn(const F32 fraction)
         LLVector3d      camera_offset(mCameraFocusOffsetTarget);
         LLVector3d      camera_offset_unit(mCameraFocusOffsetTarget);
         F32 min_zoom = LAND_MIN_ZOOM;
-        F32 current_distance = (F32)camera_offset_unit.normVec();
+        F32 current_distance = (F32)camera_offset_unit.normalize();
         F32 new_distance = current_distance * fraction;
 
         // Don't move through focus point
@@ -1881,7 +1905,7 @@ void LLAgent::cameraOrbitIn(const F32 meters)
         {
                 LLVector3d      camera_offset(mCameraFocusOffsetTarget);
                 LLVector3d      camera_offset_unit(mCameraFocusOffsetTarget);
-                F32 current_distance = (F32)camera_offset_unit.normVec();
+                F32 current_distance = (F32)camera_offset_unit.normalize();
                 F32 new_distance = current_distance - meters;
                 F32 min_zoom = LAND_MIN_ZOOM;
                 
@@ -1938,6 +1962,8 @@ void LLAgent::cameraPanIn(F32 meters)
         mFocusGlobal = mFocusTargetGlobal;
         // don't enforce zoom constraints as this is the only way for users to get past them easily
         updateFocusOffset();
+        // NOTE: panning movements expect the camera to move exactly with the focus target, not animated behind -Nyx
+        mCameraSmoothingLastPositionGlobal = calcCameraPositionTargetGlobal();
 }
 
 //-----------------------------------------------------------------------------
@@ -1956,6 +1982,8 @@ void LLAgent::cameraPanLeft(F32 meters)
         
         cameraZoomIn(1.f);
         updateFocusOffset();
+        // NOTE: panning movements expect the camera to move exactly with the focus target, not animated behind - Nyx
+        mCameraSmoothingLastPositionGlobal = calcCameraPositionTargetGlobal();
 }
 
 //-----------------------------------------------------------------------------
@@ -1974,6 +2002,8 @@ void LLAgent::cameraPanUp(F32 meters)
 
         cameraZoomIn(1.f);
         updateFocusOffset();
+        // NOTE: panning movements expect the camera to move exactly with the focus target, not animated behind -Nyx
+        mCameraSmoothingLastPositionGlobal = calcCameraPositionTargetGlobal();
 }
 
 //-----------------------------------------------------------------------------
@@ -2246,7 +2276,7 @@ void LLAgent::startAutoPilotGlobal(const LLVector3d &target_global, const std::s
                 mAutoPilotUseRotation = TRUE;
                 mAutoPilotTargetFacing = LLVector3::x_axis * *target_rotation;
                 mAutoPilotTargetFacing.mV[VZ] = 0.f;
-                mAutoPilotTargetFacing.normVec();
+                mAutoPilotTargetFacing.normalize();
         }
         else
         {
@@ -2369,8 +2399,8 @@ void LLAgent::autoPilot(F32 *delta_yaw)
                 at.mV[VZ] = 0.f;
                 direction.mV[VZ] = 0.f;
 
-                at.normVec();
-                F32 xy_distance = direction.normVec();
+                at.normalize();
+                F32 xy_distance = direction.normalize();
 
                 F32 yaw = 0.f;
                 if (mAutoPilotTargetDist > mAutoPilotStopDistance)
@@ -3529,7 +3559,7 @@ void LLAgent::setupSitCamera()
                 // slam agent coordinate frame to proper parent local version
                 LLVector3 at_axis = mFrameAgent.getAtAxis();
                 at_axis.mV[VZ] = 0.f;
-                at_axis.normVec();
+                at_axis.normalize();
                 resetAxes(at_axis * ~parent_rot);
         }
 }
@@ -3665,7 +3695,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
                                 // slam agent coordinate frame to proper parent local version
                                 LLVector3 at_axis = mFrameAgent.getAtAxis() * parent_rot;
                                 at_axis.mV[VZ] = 0.f;
-                                at_axis.normVec();
+                                at_axis.normalize();
                                 resetAxes(at_axis * ~parent_rot);
 
                                 local_camera_offset = local_camera_offset * mFrameAgent.getQuaternion() * parent_rot;
@@ -3686,7 +3716,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
                                         offset_dot_norm = 0.001f;
                                 }
                                 
-                                camera_distance = local_camera_offset.normVec();
+                                camera_distance = local_camera_offset.normalize();
 
                                 F32 pos_dot_norm = getPosAgentFromGlobal(frame_center_global + head_offset) * plane_normal;
                                 
@@ -3710,7 +3740,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
                         }
                         else
                         {
-                                camera_distance = local_camera_offset.normVec();
+                                camera_distance = local_camera_offset.normalize();
                         }
 
                         mTargetCameraDistance = llmax(camera_distance, MIN_CAMERA_DISTANCE);
@@ -3745,7 +3775,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
                                 {
                                         LLVector3 frame_at_axis = mFrameAgent.getAtAxis();
                                         frame_at_axis -= projected_vec(frame_at_axis, getReferenceUpVector());
-                                        frame_at_axis.normVec();
+                                        frame_at_axis.normalize();
 
                                         //transition smoothly in air mode, to avoid camera pop
                                         F32 u = (time_in_air - GROUND_TO_AIR_CAMERA_TRANSITION_START_TIME) / GROUND_TO_AIR_CAMERA_TRANSITION_TIME;
@@ -3932,7 +3962,7 @@ void LLAgent::resetCamera()
         // Remove any pitch from the avatar
         LLVector3 at = mFrameAgent.getAtAxis();
         at.mV[VZ] = 0.f;
-        at.normVec();
+        at.normalize();
         gAgent.resetAxes(at);
         // have to explicitly clear field of view zoom now
         mCameraFOVZoomFactor = 0.f;
@@ -4101,7 +4131,10 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
 
         if (mAvatarObject)
         {
-                mAvatarObject->mPelvisp->setPosition(LLVector3::zero);
+                if (!mAvatarObject->mIsSitting)
+                {
+                        mAvatarObject->mPelvisp->setPosition(LLVector3::zero);
+                }
                 mAvatarObject->startMotion( ANIM_AGENT_BODY_NOISE );
                 mAvatarObject->startMotion( ANIM_AGENT_BREATHE_ROT );
         }
@@ -4147,14 +4180,14 @@ void LLAgent::changeCameraToThirdPerson(BOOL animate)
                 LLQuaternion obj_rot = ((LLViewerObject*)mAvatarObject->getParent())->getRenderRotation();
                 at_axis = LLViewerCamera::getInstance()->getAtAxis();
                 at_axis.mV[VZ] = 0.f;
-                at_axis.normVec();
+                at_axis.normalize();
                 resetAxes(at_axis * ~obj_rot);
         }
         else
         {
                 at_axis = mFrameAgent.getAtAxis();
                 at_axis.mV[VZ] = 0.f;
-                at_axis.normVec();
+                at_axis.normalize();
                 resetAxes(at_axis);
         }
 
@@ -4201,7 +4234,7 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
         // Remove any pitch from the avatar
         //LLVector3 at = mFrameAgent.getAtAxis();
         //at.mV[VZ] = 0.f;
-        //at.normVec();
+        //at.normalize();
         //gAgent.resetAxes(at);
 
         if( mCameraMode != CAMERA_MODE_CUSTOMIZE_AVATAR )
@@ -4228,7 +4261,7 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
                                 // Remove any pitch from the avatar
                         LLVector3 at = mFrameAgent.getAtAxis();
                         at.mV[VZ] = 0.f;
-                        at.normVec();
+                        at.normalize();
                         gAgent.resetAxes(at);
 
                         sendAnimationRequest(ANIM_AGENT_CUSTOMIZE, ANIM_REQUEST_START);
@@ -4508,14 +4541,14 @@ void LLAgent::setFocusOnAvatar(BOOL focus_on_avatar, BOOL animate)
                                 LLQuaternion obj_rot = ((LLViewerObject*)mAvatarObject->getParent())->getRenderRotation();
                                 at_axis = LLViewerCamera::getInstance()->getAtAxis();
                                 at_axis.mV[VZ] = 0.f;
-                                at_axis.normVec();
+                                at_axis.normalize();
                                 resetAxes(at_axis * ~obj_rot);
                         }
                         else
                         {
                                 at_axis = LLViewerCamera::getInstance()->getAtAxis();
                                 at_axis.mV[VZ] = 0.f;
-                                at_axis.normVec();
+                                at_axis.normalize();
                                 resetAxes(at_axis);
                         }
                 }
@@ -4578,7 +4611,7 @@ void LLAgent::lookAtLastChat()
                         {
                                 delta_pos = chatter->getPositionAgent() - getPositionAgent();
                         }
-                        delta_pos.normVec();
+                        delta_pos.normalize();
 
                         setControlFlags(AGENT_CONTROL_STOP);
 
@@ -4586,9 +4619,9 @@ void LLAgent::lookAtLastChat()
 
                         LLVector3 new_camera_pos = mAvatarObject->mHeadp->getWorldPosition();
                         LLVector3 left = delta_pos % LLVector3::z_axis;
-                        left.normVec();
+                        left.normalize();
                         LLVector3 up = left % delta_pos;
-                        up.normVec();
+                        up.normalize();
                         new_camera_pos -= delta_pos * 0.4f;
                         new_camera_pos += left * 0.3f;
                         new_camera_pos += up * 0.2f;
@@ -4607,7 +4640,7 @@ void LLAgent::lookAtLastChat()
                 else
                 {
                         delta_pos = chatter->getRenderPosition() - getPositionAgent();
-                        delta_pos.normVec();
+                        delta_pos.normalize();
 
                         setControlFlags(AGENT_CONTROL_STOP);
 
@@ -4615,9 +4648,9 @@ void LLAgent::lookAtLastChat()
 
                         LLVector3 new_camera_pos = mAvatarObject->mHeadp->getWorldPosition();
                         LLVector3 left = delta_pos % LLVector3::z_axis;
-                        left.normVec();
+                        left.normalize();
                         LLVector3 up = left % delta_pos;
-                        up.normVec();
+                        up.normalize();
                         new_camera_pos -= delta_pos * 0.4f;
                         new_camera_pos += left * 0.3f;
                         new_camera_pos += up * 0.2f;
@@ -4631,68 +4664,107 @@ void LLAgent::lookAtLastChat()
 
 const F32 SIT_POINT_EXTENTS = 0.2f;
 
-// Grabs current position
-void LLAgent::setStartPosition(U32 location_id)
-{
-        LLViewerObject          *object;
-
-        if ( !(gAgentID == LLUUID::null) )
-        {
-                // we've got an ID for an agent viewerobject
-                object = gObjectList.findObject(gAgentID);
-                if (object)
-                {
-                        // we've got the viewer object
-                        // Sometimes the agent can be velocity interpolated off of
-                        // this simulator.  Clamp it to the region the agent is
-                        // in, a little bit in on each side.
-                        const F32 INSET = 0.5f; //meters
-                        const F32 REGION_WIDTH = LLWorld::getInstance()->getRegionWidthInMeters();
-
-                        LLVector3 agent_pos = getPositionAgent();
-
-                        if (mAvatarObject)
-                        {
-                                // the z height is at the agent's feet
-                                agent_pos.mV[VZ] -= 0.5f * mAvatarObject->mBodySize.mV[VZ];
-                        }
-
-                        agent_pos.mV[VX] = llclamp( agent_pos.mV[VX], INSET, REGION_WIDTH - INSET );
-                        agent_pos.mV[VY] = llclamp( agent_pos.mV[VY], INSET, REGION_WIDTH - INSET );
-
-                        // Don't let them go below ground, or too high.
-                        agent_pos.mV[VZ] = llclamp( agent_pos.mV[VZ], 
-                                mRegionp->getLandHeightRegion( agent_pos ), 
-                                LLWorld::getInstance()->getRegionMaxHeight() );
-
-                        LLMessageSystem* msg = gMessageSystem;
-                        msg->newMessageFast(_PREHASH_SetStartLocationRequest);
-                        msg->nextBlockFast( _PREHASH_AgentData);
-                        msg->addUUIDFast(_PREHASH_AgentID, getID());
-                        msg->addUUIDFast(_PREHASH_SessionID, getSessionID());
-                        msg->nextBlockFast( _PREHASH_StartLocationData);
-                        // corrected by sim
-                        msg->addStringFast(_PREHASH_SimName, "");
-                        msg->addU32Fast(_PREHASH_LocationID, location_id);
-                        msg->addVector3Fast(_PREHASH_LocationPos, agent_pos);
-                        msg->addVector3Fast(_PREHASH_LocationLookAt,mFrameAgent.getAtAxis());
-
-                        // Reliable only helps when setting home location.  Last
-                        // location is sent on quit, and we don't have time to ack
-                        // the packets.
-                        msg->sendReliable(mRegionp->getHost());
-
-                        const U32 HOME_INDEX = 1;
-                        if( HOME_INDEX == location_id )
-                        {
-                                setHomePosRegion( mRegionp->getHandle(), getPositionAgent() );
-                        }
-                }
-                else
-                {
-                        llinfos << "setStartPosition - Can't find agent viewerobject id " << gAgentID << llendl;
-                }
-        }
+void LLAgent::setStartPosition( U32 location_id )
+{
+  LLViewerObject          *object;
+
+  if ( !(gAgentID == LLUUID::null) )
+  {
+    // we've got an ID for an agent viewerobject
+    object = gObjectList.findObject(gAgentID);
+    if (object)
+    {
+      // we've got the viewer object
+      // Sometimes the agent can be velocity interpolated off of
+      // this simulator.  Clamp it to the region the agent is
+      // in, a little bit in on each side.
+      const F32 INSET = 0.5f; //meters
+      const F32 REGION_WIDTH = LLWorld::getInstance()->getRegionWidthInMeters();
+
+      LLVector3 agent_pos = getPositionAgent();
+      LLVector3 agent_look_at = mFrameAgent.getAtAxis();
+
+      if (mAvatarObject)
+      {
+        // the z height is at the agent's feet
+        agent_pos.mV[VZ] -= 0.5f * mAvatarObject->mBodySize.mV[VZ];
+      }
+
+      agent_pos.mV[VX] = llclamp( agent_pos.mV[VX], INSET, REGION_WIDTH - INSET );
+      agent_pos.mV[VY] = llclamp( agent_pos.mV[VY], INSET, REGION_WIDTH - INSET );
+
+      // Don't let them go below ground, or too high.
+      agent_pos.mV[VZ] = llclamp( agent_pos.mV[VZ],
+                                  mRegionp->getLandHeightRegion( agent_pos ),
+                                  LLWorld::getInstance()->getRegionMaxHeight() );
+      // Send the CapReq
+
+      LLSD body;
+
+      std::string url = gAgent.getRegion()->getCapability("HomeLocation");
+      std::ostringstream strBuffer;
+      if( url.empty() )
+      {
+        LLMessageSystem* msg = gMessageSystem;
+        msg->newMessageFast(_PREHASH_SetStartLocationRequest);
+        msg->nextBlockFast( _PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, getID());
+        msg->addUUIDFast(_PREHASH_SessionID, getSessionID());
+        msg->nextBlockFast( _PREHASH_StartLocationData);
+        // corrected by sim
+        msg->addStringFast(_PREHASH_SimName, "");
+        msg->addU32Fast(_PREHASH_LocationID, location_id);
+        msg->addVector3Fast(_PREHASH_LocationPos, agent_pos);
+        msg->addVector3Fast(_PREHASH_LocationLookAt,mFrameAgent.getAtAxis());
+        
+        // Reliable only helps when setting home location.  Last
+        // location is sent on quit, and we don't have time to ack
+        // the packets.
+        msg->sendReliable(mRegionp->getHost());
+
+        const U32 HOME_INDEX = 1;
+        if( HOME_INDEX == location_id )
+          {
+            setHomePosRegion( mRegionp->getHandle(), getPositionAgent() );
+          }
+      }
+      else
+      {
+        strBuffer << location_id;
+        body["HomeLocation"]["LocationId"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_pos.mV[VX];
+        body["HomeLocation"]["LocationPos"]["X"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_pos.mV[VY];
+        body["HomeLocation"]["LocationPos"]["Y"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_pos.mV[VZ];
+        body["HomeLocation"]["LocationPos"]["Z"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_look_at.mV[VX];
+        body["HomeLocation"]["LocationLookAt"]["X"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_look_at.mV[VY];
+        body["HomeLocation"]["LocationLookAt"]["Y"] = strBuffer.str();
+
+        strBuffer.str("");
+        strBuffer << agent_look_at.mV[VZ];
+        body["HomeLocation"]["LocationLookAt"]["Z"] = strBuffer.str();
+
+        LLHTTPClient::post( url, body, new LLHomeLocationResponder() );
+      }
+    }
+    else
+    {
+      llinfos << "setStartPosition - Can't find agent viewerobject id " << gAgentID << llendl;
+    }
+  }
 }
 
 void LLAgent::requestStopMotion( LLMotion* motion )