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, 98 insertions, 13 deletions

diff --git a/linden/indra/llmath/v4color.h b/linden/indra/llmath/v4color.h
index 53e4407..57055c5 100644
--- a/linden/indra/llmath/v4color.h
+++ b/linden/indra/llmath/v4color.h
@@ -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
@@ -84,20 +84,33 @@ class LLColor4
                 const LLColor4& setToBlack();                                           // zero LLColor4 to (0, 0, 0, 1)
                 const LLColor4& setToWhite();                                           // zero LLColor4 to (0, 0, 0, 1)
 
-                const LLColor4& setVec(F32 r, F32 g, F32 b, F32 a);     // Sets LLColor4 to (r, g, b, a)
-                const LLColor4& setVec(F32 r, F32 g, F32 b);    // Sets LLColor4 to (r, g, b) (no change in a)
-                const LLColor4& setVec(const LLColor4 &vec);    // Sets LLColor4 to vec
-                const LLColor4& setVec(const LLColor3 &vec);    // Sets LLColor4 to LLColor3 vec (no change in alpha)
-                const LLColor4& setVec(const LLColor3 &vec, F32 a);     // Sets LLColor4 to LLColor3 vec, with alpha specified
-                const LLColor4& setVec(const F32 *vec);                 // Sets LLColor4 to vec
-                const LLColor4& setVec(const LLColor4U& color4u); // Sets LLColor4 to color4u, rescaled.
+                const LLColor4& setVec(F32 r, F32 g, F32 b, F32 a);     // deprecated -- use set()
+                const LLColor4& setVec(F32 r, F32 g, F32 b);            // deprecated -- use set()
+                const LLColor4& setVec(const LLColor4 &vec);            // deprecated -- use set()
+                const LLColor4& setVec(const LLColor3 &vec);            // deprecated -- use set()
+                const LLColor4& setVec(const LLColor3 &vec, F32 a);     // deprecated -- use set()
+                const LLColor4& setVec(const F32 *vec);                         // deprecated -- use set()
+                const LLColor4& setVec(const LLColor4U& color4u);       // deprecated -- use set()
+
+                const LLColor4& set(F32 r, F32 g, F32 b, F32 a);        // Sets LLColor4 to (r, g, b, a)
+                const LLColor4& set(F32 r, F32 g, F32 b);       // Sets LLColor4 to (r, g, b) (no change in a)
+                const LLColor4& set(const LLColor4 &vec);       // Sets LLColor4 to vec
+                const LLColor4& set(const LLColor3 &vec);       // Sets LLColor4 to LLColor3 vec (no change in alpha)
+                const LLColor4& set(const LLColor3 &vec, F32 a);        // Sets LLColor4 to LLColor3 vec, with alpha specified
+                const LLColor4& set(const F32 *vec);                    // Sets LLColor4 to vec
+                const LLColor4& set(const LLColor4U& color4u); // Sets LLColor4 to color4u, rescaled.
 
 
                 const LLColor4&    setAlpha(F32 a);
 
-                F32                     magVec() const;                         // Returns magnitude of LLColor4
-                F32                     magVecSquared() const;          // Returns magnitude squared of LLColor4
-                F32                     normVec();                                      // Normalizes and returns the magnitude of LLColor4
+                F32                     magVec() const;                         // deprecated -- use length()
+                F32                     magVecSquared() const;          // deprecated -- use lengthSquared()
+                F32                     normVec();                                      // deprecated -- use normalize()
+
+                F32                     length() const;                         // Returns magnitude of LLColor4
+                F32                     lengthSquared() const;          // Returns magnitude squared of LLColor4
+                F32                     normalize();                            // deprecated -- use normalize()
+
                 BOOL            isOpaque() { return mV[VALPHA] == 1.f; }
 
                 F32 operator[](int idx) const { return mV[idx]; }
@@ -289,6 +302,47 @@ inline const LLColor4&	LLColor4::setToWhite(void)
         return (*this);
 }
 
+inline const LLColor4&  LLColor4::set(F32 x, F32 y, F32 z)
+{
+        mV[VX] = x;
+        mV[VY] = y;
+        mV[VZ] = z;
+
+//  no change to alpha!
+//      mV[VW] = 1.f;  
+
+        return (*this);
+}
+
+inline const LLColor4&  LLColor4::set(F32 x, F32 y, F32 z, F32 a)
+{
+        mV[VX] = x;
+        mV[VY] = y;
+        mV[VZ] = z;
+        mV[VW] = a;  
+        return (*this);
+}
+
+inline const LLColor4&  LLColor4::set(const LLColor4 &vec)
+{
+        mV[VX] = vec.mV[VX];
+        mV[VY] = vec.mV[VY];
+        mV[VZ] = vec.mV[VZ];
+        mV[VW] = vec.mV[VW];
+        return (*this);
+}
+
+
+inline const LLColor4&  LLColor4::set(const F32 *vec)
+{
+        mV[VX] = vec[VX];
+        mV[VY] = vec[VY];
+        mV[VZ] = vec[VZ];
+        mV[VW] = vec[VW];
+        return (*this);
+}
+
+// deprecated
 inline const LLColor4&  LLColor4::setVec(F32 x, F32 y, F32 z)
 {
         mV[VX] = x;
@@ -301,6 +355,7 @@ inline const LLColor4&	LLColor4::setVec(F32 x, F32 y, F32 z)
         return (*this);
 }
 
+// deprecated
 inline const LLColor4&  LLColor4::setVec(F32 x, F32 y, F32 z, F32 a)
 {
         mV[VX] = x;
@@ -310,6 +365,7 @@ inline const LLColor4&	LLColor4::setVec(F32 x, F32 y, F32 z, F32 a)
         return (*this);
 }
 
+// deprecated
 inline const LLColor4&  LLColor4::setVec(const LLColor4 &vec)
 {
         mV[VX] = vec.mV[VX];
@@ -320,6 +376,7 @@ inline const LLColor4&	LLColor4::setVec(const LLColor4 &vec)
 }
 
 
+// deprecated
 inline const LLColor4&  LLColor4::setVec(const F32 *vec)
 {
         mV[VX] = vec[VX];
@@ -337,16 +394,44 @@ inline const LLColor4&	LLColor4::setAlpha(F32 a)
 
 // LLColor4 Magnitude and Normalization Functions
 
+inline F32              LLColor4::length(void) const
+{
+        return fsqrtf(mV[VX]*mV[VX] + mV[VY]*mV[VY] + mV[VZ]*mV[VZ]);
+}
+
+inline F32              LLColor4::lengthSquared(void) const
+{
+        return mV[VX]*mV[VX] + mV[VY]*mV[VY] + mV[VZ]*mV[VZ];
+}
+
+inline F32              LLColor4::normalize(void)
+{
+        F32 mag = fsqrtf(mV[VX]*mV[VX] + mV[VY]*mV[VY] + mV[VZ]*mV[VZ]);
+        F32 oomag;
+
+        if (mag)
+        {
+                oomag = 1.f/mag;
+                mV[VX] *= oomag;
+                mV[VY] *= oomag;
+                mV[VZ] *= oomag;
+        }
+        return (mag);
+}
+
+// deprecated
 inline F32              LLColor4::magVec(void) const
 {
         return fsqrtf(mV[VX]*mV[VX] + mV[VY]*mV[VY] + mV[VZ]*mV[VZ]);
 }
 
+// deprecated
 inline F32              LLColor4::magVecSquared(void) const
 {
         return mV[VX]*mV[VX] + mV[VY]*mV[VY] + mV[VZ]*mV[VZ];
 }
 
+// deprecated
 inline F32              LLColor4::normVec(void)
 {
         F32 mag = fsqrtf(mV[VX]*mV[VX] + mV[VY]*mV[VY] + mV[VZ]*mV[VZ]);
@@ -497,13 +582,13 @@ inline const LLColor4& operator%=(LLColor4 &a, F32 k)
 inline F32              distVec(const LLColor4 &a, const LLColor4 &b)
 {
         LLColor4 vec = a - b;
-        return (vec.magVec());
+        return (vec.length());
 }
 
 inline F32              distVec_squared(const LLColor4 &a, const LLColor4 &b)
 {
         LLColor4 vec = a - b;
-        return (vec.magVecSquared());
+        return (vec.lengthSquared());
 }
 
 inline LLColor4 lerp(const LLColor4 &a, const LLColor4 &b, F32 u)