409 files changed, 35251 insertions, 2969 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a42b4be..5ec4b88 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,289 +1,2087 @@
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                        1.3.0                           -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+2009-10-18 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Merged working branch of 1.2 into LL 1.23 merge.
+        
+
+REMOVE ME!
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                      1.2.0 misc.                       -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+REMOVE ME!
+
+2009-10-17 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Ported notecard security fix from LL's 1.23.5 viewer.
+        
+          modified:   linden/indra/newview/llassetuploadresponders.cpp
+          modified:   linden/indra/newview/llpreview.cpp
+          modified:   linden/indra/newview/llpreview.h
+          
+
+2009-10-16 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied RLVa-1.0.4e_20091010_SL-1.22.11-diff.patch.
+
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llagent.cpp
+          modified:   linden/indra/newview/llchatbar.cpp
+          modified:   linden/indra/newview/llinventorybridge.cpp
+          modified:   linden/indra/newview/llpanelinventory.cpp
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/llviewermessage.cpp
+          modified:   linden/indra/newview/llviewertexteditor.cpp
+          modified:   linden/indra/newview/rlvdefines.h
+          modified:   linden/indra/newview/rlvextensions.cpp
+          modified:   linden/indra/newview/rlvextensions.h
+          modified:   linden/indra/newview/rlvhandler.cpp
+          modified:   linden/indra/newview/rlvhandler.h
+          modified:   linden/indra/newview/rlvhelper.cpp
+          modified:   linden/indra/newview/rlvhelper.h
+          
+
+2009-10-13 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied patch for VWR-6787 by Alissa Sabre - 'none' text in group window not translatable.
+        
+          modified:   indra/newview/llfloatergroups.cpp
+          modified:   indra/newview/skins/default/xui/de/floater_choose_group.xml
+          modified:   indra/newview/skins/default/xui/de/panel_groups.xml
+          modified:   indra/newview/skins/default/xui/en-us/floater_choose_group.xml
+          modified:   indra/newview/skins/default/xui/en-us/panel_groups.xml
+          modified:   indra/newview/skins/default/xui/ja/floater_choose_group.xml
+          modified:   indra/newview/skins/default/xui/ja/panel_groups.xml
+          modified:   indra/newview/skins/default/xui/ko/floater_choose_group.xml
+          modified:   indra/newview/skins/default/xui/ko/panel_groups.xml
+          
+        
+        * Combine the two mini-map mute buttons into one.
+        
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+          
+          
+        * Parcel highlighting when selecting a name in radar is less buggy.
+        
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llfloatermap.h
+          modified:   linden/indra/newview/llviewermessage.cpp
+
+
+        * Added history button for group chat as well.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+
+
+        * Disable IM history button for Linux and Mac users. 
+        
+          modified:   linden/indra/newview/llimpanel.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+
+
+        * Applied show IM logs button from Emerald viewer and added an alert if there is no history.
+        
+          modified:   linden/indra/llwindow/llwindow.h
+          modified:   linden/indra/llwindow/llwindowwin32.cpp
+          modified:   linden/indra/llwindow/llwindowwin32.h
+          modified:   linden/indra/newview/llimpanel.cpp
+          modified:   linden/indra/newview/llimpanel.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/alerts.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+
+
+        * Updated inventory search to include description (from Emerald).
+        
+          modified:   linden/indra/newview/llfolderview.cpp
+          modified:   linden/indra/newview/llfolderview.h
+          modified:   linden/indra/newview/llinventoryactions.cpp
+          modified:   linden/indra/newview/llinventoryview.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+
+
+        * Disable avatar appearance facelight when local lighting turned off.
+        
+          modified:   linden/indra/newview/pipeline.cpp
+          
+          
+2009-10-12 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Only enable import/export of shapes if they're full perm and you're the creator.
+        
+          modified:   linden/indra/newview/llfloatercustomize.cpp
+          
+          
+        * Removed Emerald viewer modifier for avatar height label in customize window.
+        
+          modified:   linden/indra/newview/llfloatercustomize.cpp
+          
+          
+        * Added avatar shape import and export from Meerkat viewer.
+        
+          modified:   linden/indra/newview/llfloatercustomize.cpp
+          modified:   linden/indra/newview/llfloatercustomize.h
+          modified:   linden/indra/newview/llwearable.cpp
+          modified:   linden/indra/newview/llwearable.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
+          
+
+        * Added check/uncheck all buttons for make outfit from Meerkat viewer.
+        
+          modified:   linden/indra/newview/llfloatercustomize.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
+
+
+        * Removed reference to 'Second Life' from postcard message a la Meerkat.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
+
+
+        * Added script load/save from Meerkat viewer.
+        
+          modified:   linden/indra/newview/llfilepicker.cpp
+          modified:   linden/indra/newview/llfilepicker.h
+          modified:   linden/indra/newview/llpreviewscript.cpp
+          modified:   linden/indra/newview/llpreviewscript.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+          deleted:    linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
+          deleted:    linden/indra/newview/skins/silver/xui/en-us/floater_script_queue.xml
+
+
+2009-10-11 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Added particle count to windlight toolbar.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+
+
+        * Made advanced water toggle.
+        
+          modified:   linden/indra/newview/llfloaterwater.cpp
+          
+        
+        * Added advanced water and windlight sky tabs to sky presets pulldown.
+        
+          modified:   linden/indra/newview/llfloaterwindlight.cpp
+          modified:   linden/indra/newview/llfloaterwindlight.h
+          modified:   linden/indra/newview/llwindlightremotectrl.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+
+
+        * Added next/prev buttons to windlight water window.
+        
+          modified:   linden/indra/newview/llfloaterwater.cpp
+          modified:   linden/indra/newview/llfloaterwater.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_water.xml
+
+
+2009-10-10 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Force minimize button focus to the top of Mini-Map.
+        
+          modified:   linden/indra/newview/llfloatermap.cpp
+          
+          
+        * Added and tweaked vertical IM option from Emerald viewer.
+        
+          new file:   linden/indra/newview/skins/default/xui/en-us/floater_chatterbox_vertical.xml
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llfloaterchatterbox.cpp
+          modified:   linden/indra/newview/llprefsim.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                      1.2.0 BETA 2                      -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+2009-10-09  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Updated and added some Linux libs.
+          Updated: glib, gstreamer, gtk-etc, ogg-vorbis, openal, libxml
+          Added: gstreamer-plugins, theora
+
+          modified:   linden/indra/newview/viewer_manifest.py
+          modified:   linden/indra/cmake/GStreamer.cmake
+          modified:   linden/indra/cmake/UI.cmake
+          modified:   linden/install.xml
+
+
+2009-10-09 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Updated version info to 1.2.0 beta 2, added changelog banner.
+        
+          modified:   linden/indra/llcommon/llversionviewer.h
+          modified:   linden/indra/newview/English.lproj/InfoPlist.strings
+          modified:   linden/indra/newview/Info-Imprudence.plist
+          modified:   linden/indra/newview/res/viewerRes.rc
+
+
+        * Fixed new search window size hiding next/prev buttons.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+          
+          
+        * Mini-map can now be minimized.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+          
+          
+        * Added missing RLVa header file: rlvdefines.h.
+        
+          new file:   linden/indra/newview/rlvdefines.h
+          
+
+2009-10-08 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied lldialog spam throttle from Emerald viewer.
+        
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llviewermessage.cpp
+
+
+        * Don't show lldialog boxes from muted avatars anymore.
+        
+          modified:   linden/indra/newview/llviewermessage.cpp
+          
+          
+        * Fixed money change notification happening after logout/login.
+        
+          modified:   linden/indra/newview/llviewermessage.cpp
+          
+          
+        * Fixed entering sim notification being tied to radar range.
+        
+          modified:   linden/indra/newview/llfloatermap.cpp
+          
+          
+        * Fixed stupid error on my part that broke clickable names in chat history.
+        
+          modified:   linden/indra/newview/llfloaterchat.cpp
+        
+        
+2009-10-07 McCabe Maxsted  <hakushakukun@gmail.com>  
+          
+        * Clickable IMs in chat history was causing readability problems at varying distances, 
+          decided it was a bug and fixed it.
+          
+          modified:   linden/indra/newview/llfloaterchat.cpp
+          
+          
+        * Mini-map radar now can notify you when someone enters the sim.
+        
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llfloatermap.h
+          modified:   linden/indra/newview/llpanelgeneral.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+
+
+        * Added typing info to mini-map radar.
+        
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llfloatermap.h
+          modified:   linden/indra/newview/llviewermessage.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+
+
+        * Applied avatar height in customize window from Emerald viewer.
+        
+          modified:   linden/indra/newview/llfloatercustomize.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
+          
+          
+        * Fixed random mouseclicks on the edge of the window.
+        
+          modified:   linden/indra/newview/llviewerwindow.cpp
+
+
+2009-10-06 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied RLVa-1.0.3e_20091005_Imprudence-1.2.0-diff.patch by Kitty Barnett.
+        
+          modified:   linden/indra/newview/CMakeLists.txt
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llfirstuse.cpp
+          modified:   linden/indra/newview/llfirstuse.h
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/llviewermessage.cpp
+          modified:   linden/indra/newview/rlvevent.h
+          modified:   linden/indra/newview/rlvextensions.cpp
+          modified:   linden/indra/newview/rlvhandler.cpp
+          modified:   linden/indra/newview/rlvhandler.h
+          modified:   linden/indra/newview/rlvhelper.cpp
+          modified:   linden/indra/newview/rlvhelper.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/alerts.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+modified:   linden/indra/newview/skins/default/xui/en-us/notify.xml
+        
+        
+        * Applied RLVa-1.0.2c_20091005_Imprudence-1.2.0-diff.patch by Kitty Barnett.
+        
+          modified:   linden/indra/newview/llinventorybridge.cpp
+          modified:   linden/indra/newview/lltooldraganddrop.cpp
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/llviewermessage.cpp
+          modified:   linden/indra/newview/rlvhandler.cpp
+          modified:   linden/indra/newview/rlvhandler.h
+          modified:   linden/indra/newview/rlvhelper.cpp
+          modified:   linden/indra/newview/rlvhelper.h
+          
+
+2009-10-05 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Renamed 'Create' in object pie to 'Build,' moved it to top right and switched 'Wear' and 'Return.'
+        
+          modified:   indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+
+
+2009-10-04 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Changes that should improve sculpty LOD.
+        
+          modified:   linden/indra/llmath/llvolume.cpp
+          
+          
+        * Fixed mini-map distance label and rounding.
+        
+          modified:   linden/indra/newview/llfloatermap.cpp
+          
+          
+        * Mini-map radar now notifies when someone enters chat range, and how far away they are.
+          
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llfloatermap.h
+          modified:   linden/indra/newview/llpanelgeneral.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+
+
+2009-10-03  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Updated and added some Linux libs to install.xml.
+          Updated: glib, gstreamer, ogg-vorbis, openal
+          Added: gstreamer-plugins, theora
+
+          modified:   linden/install.xml
+
+
+        * Grid manager no longer appends "/" to URIs.
+          This was causing trouble with URIs that shouldn't end in "/".
+
+          modified:   linden/indra/newview/hippoGridManager.cpp
+
+
+2009-10-03 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Disable camera constraints now disables max zoom for the scrollwheel.
+        
+          modified:   linden/indra/newview/llagent.cpp
+
+
+        * Fixed layout of debug permissions in tools window.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+          
+        
+        * Reverted slviewer-0-v12100-AllowDiscardForCreator.patch.
+          (Was causing usability issues with new notecard creation).
+        
+          modified:   linden/indra/newview/llviewermessage.cpp
+          
+          
+        * Added confirmation alerts for double-click tp and auto-pilot.
+        
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/alerts.xml
+
+
+        * Fixed extern C issue in llmediaimplgstreamer.h for Windows. 
+        
+          modified:   linden/indra/llmedia/llmediaimplgstreamer.h
+          
+          
+        * Fixed account label not showing up in profiles.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+          
+          
+        * Fixed an issue with llkeywords.cpp(385) and Visual Studio.
+        
+          modified:   linden/indra/llui/llkeywords.cpp
+          
+          
+        * Fixed search window height being too small for new profile layout.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+          
+
+2009-10-02 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Added new color setting for Object IMs.
+        
+      modified:   linden/indra/llcommon/llchat.h
+      modified:   linden/indra/newview/app_settings/settings.xml
+      modified:   linden/indra/newview/llfloaterchat.cpp
+      modified:   linden/indra/newview/llviewermessage.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+
+
+        * Fixed 1.2 beta features missing from silver skin.
+        
+          deleted:    linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml
+          modified:   linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
+
+
+        * Applied clickable object names for whisper/say/shout from Emerald viewer.
+        
+          modified:   linden/indra/newview/llviewermessage.cpp
+          
+          
+        * Object IMs are now prefixed with "IM: ".
+          As a side effect, names are now clickable when show IMs in chat is enabled.
+          
+          modified:   linden/indra/newview/llfloaterchat.cpp
+          modified:   linden/indra/newview/llviewermessage.cpp
+          
+
+2009-10-01 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Added mini-map partner dot color for future use (currently unused).
+        
+          modified:   linden/indra/newview/skins/default/colors_base.xml
+          modified:   linden/indra/newview/skins/silver/colors_base.xml
+
+
+        * Draw Imprudence developers as purple dots in the mini-map (name list in LLFloaterMap).
+        
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llfloatermap.h
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:   linden/indra/newview/skins/default/colors_base.xml
+          modified:   linden/indra/newview/skins/silver/colors_base.xml
+
+
+        * Draw selected avatars last (and fixed silver skin missing selection color).
+        
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:   linden/indra/newview/skins/default/colors_base.xml
+          modified:   linden/indra/newview/skins/silver/colors_base.xml
+
+
+        * Fixed switched Buy and Create locations in object pie menu (regression).
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+          
+          
+        * Fixed inability to teleport to adult regions in Imprudence 1.2.
+          (Ugly. Only use on 1.22 code base)
+          
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llagent.cpp
+          modified:   linden/indra/newview/llagent.h
+          modified:   linden/indra/newview/llstartup.cpp
+          modified:   linden/indra/newview/llviewerregion.cpp
+
+
+        * Changed the minimum draw distance from 64m to 32m.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+
+
+        * Suspected partial crash fix for Logout.
+        
+          modified:   linden/indra/newview/llappviewer.cpp
+          
+          
+        * Fixed 1.2 thinking it was on the Teen Grid.
+          
+          modified:   linden/indra/newview/llstartup.cpp
+          
+          
+        * Updated gpu_table.txt to latest version in Snowglobe.
+        
+          modified:   linden/indra/newview/gpu_table.txt
+          
+
+2009-09-29 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Fixed Unlink not enabling when Edit Linked Parts enabled.
+        
+          modified:   linden/indra/newview/llfloatertools.cpp
+          modified:   linden/indra/newview/llviewermenu.cpp
+
+
+        * Fixed Join Call button truncated in group IMs (regression).
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+          
+          
+        * Fixed reset UI size to default button missing from preferences > general (regression).
+          Changed incremets to 0.001 to be more Liberation Sans-friendly.
+        
+          modified:   linden/indra/newview/llpanelgeneral.cpp
+          modified:   linden/indra/newview/llpanelgeneral.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+
+
+        * Renamed preferences checkbox to 'show WindLight toolbar,' removed reference to 'Second Life.'
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+
+
+        * Adjusted 2nd Life profile tab layout for French language.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+          
+          
+        * Added the name box back to avatar profiles.
+        
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+          
+
+2009-09-28 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Fixed first windlight toolbar entry toggling Advanced Sky.
+        
+          modified:   linden/indra/newview/llwindlightremotectrl.cpp
+          
+          
+        * Renamed ScriptBgReadOnlyColor to ScrollReadOnlyColor so we don't lose it in a merge.
+        
+          modified:   linden/indra/newview/llpanelavatar.cpp
+          modified:   linden/indra/newview/skins/default/colors_base.xml
+          modified:   linden/indra/newview/skins/silver/colors_base.xml
+
+
+        * Fixed Advanced Sky only toggling once.
+        
+          modified:   linden/indra/newview/llfloaterwindlight.cpp
+          
+
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                       1.2.0 BETA                       -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+
+2009-09-28  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Updated viewer version in Mac and Windows installer files.
+
+          modified:   linden/indra/newview/English.lproj/InfoPlist.strings
+          modified:   linden/indra/newview/Info-Imprudence.plist
+          modified:   linden/indra/newview/res/viewerRes.rc
+
+
+        * Tweaked Imprudence credits, copied to other languages' credits.
+
+          modified:   linden/indra/newview/skins/default/xui/de/floater_about.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+          modified:   linden/indra/newview/skins/default/xui/fr/floater_about.xml
+          modified:   linden/indra/newview/skins/default/xui/ja/floater_about.xml
+          modified:   linden/indra/newview/skins/default/xui/ko/floater_about.xml
+          modified:   linden/indra/newview/skins/default/xui/zh/floater_about.xml
+
+
+2009-09-27  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Rearranged the Import stuff in the File menu.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+        * Changed "Backup" to "Export" in object pie menu.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+
+
+        * Fixed and cleaned up the export permissions check.
+
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/primbackup.cpp
+          modified:   linden/indra/newview/primbackup.h
+
+
+        * Updated Imprudence version to "1.2.0 beta".
+
+          linden/indra/llcommon/llversionviewer.h
+
+
+        * Re-enabled "allow first life" userauth stuff.
+          It was commented out when grid manager was added, but it
+          makes certain Profile window pieces disappear.
+
+          modified:   linden/indra/newview/llstartup.cpp
+
+
+2009-09-27 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Added Imprudence-specific credits to Help > About Imprudence.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+
+
+        * Show disabled buttons for own profile rather than hiding them.
+
+          modified:   linden/indra/newview/llpanelavatar.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+
+
+        * Fixed bad merge in llnetmap.cpp.
+
+          modified:   linden/indra/newview/llnetmap.cpp
+
+
+        * Fixed JPEG quality slider displaying over high-res checkbox in snapshot floater (IMP-140).
+
+          modified:   linden/indra/newview/llfloatersnapshot.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_snapshop.xml
+
+
+        * Deleted duplicate Torley windlight sky preset.
+
+          deleted:    linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelatto%20.xml
+
+
+        * Added missing Torley windlight water presets.
+
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Arrakissed%20variation.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist%202.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Bayouette.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Chivandria%20clair.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Claira.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Coral%20reef.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Crosshatched%20plans.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Eyeballin%27.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Fantastuck.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Featuresque.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Freak%2DA%2Ddermia.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Glaznost.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Grantamount.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Hpmod.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Ice%2Dlike.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Impure.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Linear%20puddles.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Listeryne.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Liz%20Taylor.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Maldives.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Meridian%20verde.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Negative%20ultraspace.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Placida%20brite.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Pretty%20placid.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Raw%20sewage.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Showing%20age.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Soldier%27s%20legacy.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Subtleties.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Trandshan.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Watermelon%20juice.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Waterslides.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20What%27s%20on%20TV.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Wickedly.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20You%27re%20in%20luck.xml
+          new file:   linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Yung%20buk.xml
+
+
+        * Changes to make the grid manager compile on Windows.
+
+          modified:   linden/indra/newview/hippoGridManager.cpp
+          modified:   linden/indra/newview/hippoLimits.cpp
+          modified:   linden/indra/newview/hippoRestRequest.cpp
+          modified:   linden/indra/newview/llappviewer.h
+          modified:   linden/indra/newview/llappviewerwin32.cpp
+
+
+2009-09-26  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Renamed 'Restrained Life Active' to 'Restrained Life Support'.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+        * Removed redundant warning about export perms.
+
+          modified:   linden/indra/newview/llviewermenu.cpp
+
+
+2009-09-26 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Made the windlight floater toggle.
+
+          modified:   linden/indra/newview/llfloaterwindlight.cpp
+
+
+        * Added select Torley Windlight presets to Imprudence.
+          Presets good for photography, mainly.
+
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%202012.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Alien%20planet.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20An%20incongruent%20truth.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arid%20nestler.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arrakissed.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asian%20red%20dawn.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asiatix.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation%202.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Barcelon%20variation%202.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Beautiful%20again.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Breaking%20firmament.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Brillianter%20sunset.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bubble%20sun%20severance.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Castle%20vain.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Climacontrasty.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Clouds%20indifferent.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cobraring.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coral%20reef.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Damage%20down.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Dark%20came%20over.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Das%20fog.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Deep%20blue%20sky.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Desert%20Sunset%20mod.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Early%20warning.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eno%20would%20be%20proud.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Evil%20machinery.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Farmatronic%20sepia.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fogvari.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Gelatto%20.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Grit%20%26%20shame.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Herr%20Gracken.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Holy%20romance.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Hong%20Kong.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ivory%20flowers.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Liz%20gluft.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lonely%20cyberpunks.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moon%20berries.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Noxumic.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oriental%20delight.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Our%20night%20together.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Polaron%20charge%20II.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Red%20city.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sparz%20puft.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Stay%20stonkin%27.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Study%20vessels.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Teak%20weak.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Wuxia%20nights.xml
+
+
+        * Removed overridden /oy compiler option.
+
+          modified:   linden/indra/cmake/00-Common.cmake
+
+
+        * Changed radar label from 'meters' to 'm'.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+
+
+        * Added Windlight presets by Ana Lutetia to Imprudence.
+
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default1.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default2.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default3.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20neutral.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city%20weirdlights.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20night.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor2.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20shadows.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio1.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio2.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio3.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio4.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio5.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio6.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio7.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio8.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio9.xml
+
+
+        * Added missing FloaterAnimationListRect to settings.xml
+
+          modified:   linden/indra/newview/app_settings/settings.xml
+
+
+2009-09-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Removed the multiple accounts tip from grid manager.
+
+          linden/indra/newview/skins/default/xui/en-us/floater_login.xml
+
+
+        * Removed 'Set Default' button from grid manager floater.
+
+          modified:   linden/indra/newview/floaterlogin.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_login.xml
+
+
+        * Made HippoGridManager's sanitation code more sane.
+
+          modified:   linden/indra/newview/floaterlogin.cpp
+          modified:   linden/indra/newview/hippoGridManager.cpp
+          modified:   linden/indra/newview/hippoGridManager.h
+
+
+        * Moved many HippoGridManager methods defs out of the header.
+          There's no good reason for these to be in the header, it
+          just breaks encapsulation for no significant gain.
+
+          linden/indra/newview/hippoGridManager.cpp
+          linden/indra/newview/hippoGridManager.h
+
+
+        * Removed grid stuff from World Map (for now).
+
+          modified:   linden/indra/newview/llfloaterworldmap.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
+
+
+        * Hid "Start Location" from grid manager floater. Not used anyway.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_login.xml
+
+
+        * Made grid manager update from Imprudence site, not Meerkat.
+
+          modified:  linden/indra/newview/hippoGridManager.cpp:
+
+
+        * Renamed default grid "local" -> "localhost".
+          So it matches the one downloaded from the web.
+
+          modified:   linden/indra/newview/app_settings/default_grids.xml
+
+
+        * Fixed HippoGridInfo::cleanUpUri appending "/" stupidly.
+          It was appending it to an empty string, "/", "//", etc.
+
+          modified:   linden/indra/newview/hippoGridManager.cpp
+
+
+        * Rearranged login screen and cleaned up XUI.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+
+
+        * Login screen fields shouldn't be set from grid (for now).
+
+          modified:   linden/indra/newview/llpanellogin.cpp
+          modified:   linden/indra/newview/llstartup.cpp
+
+
+        * Disabled avatar name and password fields in grid manager.
+          Temporary, until we implement a decent account manager.
+
+          modified:   linden/indra/newview/floaterlogin.cpp
+          modified:   linden/indra/newview/hippoGridManager.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_login.xml
+
+
+        * Reverted "grid-firstname_lastname" user directories.
+          Back to "firstname_lastname", like it was without grid manager.
+
+          modified:   linden/indra/llvfs/lldir.cpp
+
+
+2009-09-25 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Removed problematic /MP flag.
+
+          modified:   linden/indra/cmake/00-Common.cmake
+
+
+        * Fixed Windows using wrong GStreamer library names.
+
+          modified:   linden/indra/cmake/GStreamer.cmake
+
+
+        * Fixed region names not showing up on regions with zero avatars.
+
+          modified:   linden/indra/newview/llworldmapview.cpp
+
+
+        * Temporarily disable chat channel control in chat history until it's fixed.
+
+          modified:   linden/indra/newview/llchatbar.cpp
+          modified:   linden/indra/newview/llfloaterchat.cpp
+          modified:   linden/indra/newview/llprefschat.cpp
+
+
+        * Fixed chat channel control value not updating when Return key pressed.
+
+          modified:   linden/indra/llui/llspinctrl.cpp
+
+
+2009-09-24 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied RLVa patch for Imprudence 1.2 by Kitty Barnett.
+
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llinventorybridge.cpp
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:   linden/indra/newview/llpanelpermissions.cpp
+          modified:   linden/indra/newview/llwindlightremotectrl.cpp
+
+
+        * Fixed Add button being enabled for friends in the radar.
+
+          modified:   linden/indra/newview/llfloatermap.cpp
+
+
+        * Fixed Last Owner text in tools window not disabling.
+
+          modified:   linden/indra/newview/llpanelpermissions.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+
+
+2009-09-23  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Moved "Show HUD Attachments" back to View, restored shortcut.
+          Reverts earlier change (Jan 27) which moved it to Advanced menu.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+2009-09-22 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Fixed RLVa issue in LLNetMap the right way (thanks Kitty).
+
+          modified:   linden/indra/newview/llnetmap.cpp
+
+
+        * Clarifed Mini-Map menu option: 'Show Map' to 'Show World Map'.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+
+
+        * Applied particle chat feature from Emerald viewer.
+          (Tell an object it's selected on channel 9000).
+
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llvoavatar.cpp
+          modified:   linden/indra/newview/llvoavatar.h
+
+
+2009-09-21 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Changed 'Presets' button to 'Sky'.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+
+
+        * Applied Jacek's patch to show number of avatars in world map.
+
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llworldmapview.cpp
+
+
+        * Fixed map textures displaying an X.
+
+          modified:   linden/indra/newview/llworldmapview.cpp
+
+
+        * Display selected avatars larger than normal, zoom in at a
+          reasonable speed. Included missing artwork.
+
+          modified:   linden/indra/newview/llnetmap.cpp
+          new file:   linden/indra/newview/skins/default/textures/map_avatar_32.tga
+          new file:   linden/indra/newview/skins/default/textures/map_avatar_above_32.tga
+          new file:   linden/indra/newview/skins/default/textures/map_avatar_below_32.tga
+          new file:   linden/indra/newview/skins/default/textures/map_avatar_you_32.tga
+
+
+2009-09-20 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Dynamically change max prim size depending upon LL/OpenSim grid
+          (Added setting for opensim detection: LoggedIntoOpenSim).
+          OpenSim max is 128m.
+
+          modified:   linden/indra/llmath/xform.h
+          modified:   linden/indra/newview/app_settings/settings
+          modified:   linden/indra/newview/llmanipscale.cpp
+          modified:   linden/indra/newview/llmanipscale.h
+          modified:   linden/indra/newview/llpanelobject.cpp
+          modified:   linden/indra/newview/llviewermessage.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+
+
+        * Fixed inventory offers not avatar name (another RLVa bug).
+
+          modified:   linden/indra/newview/llviewermessage.cpp
+
+
+        * Fixed group titles showing up as ?.
+
+          modified:   linden/indra/newview/llvoavatar.cpp
+
+
+        * Added adult compliant flag.
+
+          modified:   linden/indra/newview/llstartup.cpp
+
+
+2009-09-18 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied patch by Aleric Inglewood for VWR-13996
+          Avatars using 1.22 completely invisible on first sight.
+
+          modified:   linden/indra/newview/llspatialpartition.cpp
+
+
+2009-09-16 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Estate and track buttons now disable when they should,
+          tweaked spacing.
+
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llfloatermap.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+
+
+2009-09-15 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied patch by Robin Cornelius for VWR-11128
+          Python not always detected by develop.py.
+
+          modified:   linden/indra/cmake/Python.cmake
+
+
+        * Applied patch by Robin Cornelius for VWR-11138
+          Make develop.py play nicely with express editions of Visual Studio.
+
+          modified:   linden/indra/develop.py
+
+
+        * Added Codebastard Redgrave's windlight presets to Imprudence.
+
+          new file:   linden/indra/newview/app_settings/windlight/skies/Rouge%201.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/Rouge%202.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/Rouge%203.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/Rouge%204.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/Rouge%205.xml
+          new file:   linden/indra/newview/app_settings/windlight/skies/Rouge%206.xml
+
+
+        * Added tabs to mini-map radar.
+
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llfloatermap.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+
+
+        * Some code cleanup.
+
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llfloatermap.h
+          modified:   linden/indra/newview/llnetmap.cpp
+
+
+        * Fixed bad RLVa behavior in minimap.
+
+          modified:   linden/indra/newview/llnetmap.cpp
+
+
+        * Don't track avatars when focus lost.
+
+          modified:   linden/indra/newview/llfloatermap.cpp
+
+
+        * Fixed min minimap size.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+
+
+        * Moved Rotate Mini-Map option to mini-map menu, added first use dialog.
+
+          modified:   linden/indra/newview/llfirstuse.cpp
+          modified:   linden/indra/newview/llfirstuse.h
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:   linden/indra/newview/llnetmap.h
+          modified:   linden/indra/newview/llpanelgeneral.cpp
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/notify.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+
+
+2009-09-14 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Small improvement to hide selection outlines in LLSelectMgr.
+
+          modified:   linden/indra/newview/llselectmgr.cpp
+
+
+        * Small performance change from Emerald viewer in LLVLComposition.
+
+          modified:   linden/indra/newview/llvlcomposition.cpp
+
+
+        * Applied BlockClickSit debug setting from Emerald
+          to block sit click action.
+
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/lltoolpie.cpp
+
+
+        * Fixed unhandled exception in llviewerobjectlist.cpp
+
+          modified:   linden/indra/newview/llviewerobjectlist.cpp
+
+
+2009-09-13  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Added prev/next buttons for windlight presets, cleaned up some stuff.
+
+          modified:   linden/indra/newview/llfloaterwindlight.cpp
+          modified:   linden/indra/newview/llfloaterwindlight.h
+          modified:   linden/indra/newview/llwindlightremotectrl.cpp
+          modified:   linden/indra/newview/llwlparammanager.cpp
+          modified:   linden/indra/newview/llwlparammanager.h
+          modified:   linden/indra/newview/skins/default/textures/textures.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
+
+
+        * Fixed World options not showing up when windlight remote expanded.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+
+
+        * Added missing left/right arrow textures.
+
+          new file:   linden/indra/newview/skins/default/textures/arrow_left.tga
+          new file:   linden/indra/newview/skins/default/textures/arrow_right.tga
+          new file:   linden/indra/newview/skins/silver/textures/arrow_left.tga
+          new file:   linden/indra/newview/skins/silver/textures/arrow_right.tga
+
+
+2009-09-12  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Clarified 'show in search' in profile.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+
+
+        * Fixed windlight toolbar not updating windlight floater pulldown.
+
+          modified:   linden/indra/newview/llfloaterwindlight.cpp
+          modified:   linden/indra/newview/llwindlightremotectrl.cpp
+          modified:   linden/indra/newview/llwlparammanager.cpp
+          modified:   linden/indra/newview/llwlparammanager.h
+
+
+        * Fixed windlight toolbar presets not applying when region default.
+
+          modified:   linden/indra/newview/llwindlightremotectrl.cpp
+
+
+2009-09-11  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied inventory Search menu from Emerald viewer (still ugly).
+
+          modified:   newview/app_settings/settings.xml
+          modified:   newview/llfolderview.cpp
+          modified:   newview/llfolderview.h
+          modified:   newview/llinventoryactions.cpp
+          modified:   newview/llinventoryview.cpp
+          modified:   newview/skins/default/xui/en-us/floater_inventory.xml
+
+
+        * Applied patch for long distance opensim hypergrid tps (SVC-2941)
+          (Feature currently disabled in OpenSim)
+
+          modified:   linden/indra/newview/llviewermessage.cpp
+
+
+        * Fixed browser window showing wrong title.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+
+
+        * Fixed double click tp from working on HUDs.
+
+          modified:   linden/indra/newview/lltoolpie.cpp
+
+
+        * Added minimize to snapshot window.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+
+
+        * Upped the max bandwidth setting to 5000kbps (default 1000kbps).
+
+          modified:   linden/indra/newview/llviewerthrottle.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+          modified:   linden/indra/newview/app_settings/settings.xml
+
+
+        * Applied patch to wear multiple attachments at once (VWR-5063).
+
+          modified:   linden/indra/newview/llinventoryactions.cpp
+          modified:   linden/indra/newview/llinventorybridge.cpp
+
+
+        * Fixed profile account info spacing.
+
+          modified:   indra/newview/skins/default/xui/en-us/panel_avatar.xml
+
+
+        * Applied patch by Latif Khalifa for VWR-5370
+          (Detached "Contacts" panel cannot be hidden/closed via menu
+          or shortcut (Ctrl/Cmd-Shift-F))
+
+          modified:   linden/indra/newview/llfloaterchatterbox.h
+
+
+        * Applied and modified Emerald viewer feature that shows what
+          groups are hidden in your profile.
+
+          modified:   linden/indra/newview/llpanelavatar.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+
+
+2009-09-10  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Created new toolbar control for windlight presets and options.
+
+          new file:   linden/indra/newview/llwindlightremotectrl.cpp
+          new file:   linden/indra/newview/llwindlightremotectrl.h
+          new file:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml
+          new file:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
+          new file:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+          modified:   linden/indra/newview/CMakeLists.txt
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llfloaterwindlight.cpp
+          modified:   linden/indra/newview/lloverlaybar.cpp
+          modified:   linden/indra/newview/lloverlaybar.h
+          modified:   linden/indra/newview/llpaneldisplay.cpp
+          modified:   linden/indra/newview/llpaneldisplay.h
+          modified:   linden/indra/newview/llwlparammanager.cpp
+          modified:   linden/indra/newview/llwlparammanager.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+
+
+        * Fixed missing 'm' for draw distance slider.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+
+
+2009-09-09  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Backported clickable object names from 1.23.
+
+          new file:   llcommon/llcursortypes.cpp
+          new file:   llcommon/llcursortypes.h
+          new file:   newview/llfloaterobjectiminfo.cpp
+          new file:   newview/llfloaterobjectiminfo.h
+          new file:   newview/skins/default/xui/en-us/floater_object_im_info.xm
+          modified:   llcommon/CMakeLists.txt
+          modified:   llcommon/llchat.h
+          modified:   llui/llpanel.cpp
+          modified:   llui/llpanel.h
+          modified:   llui/lltextbox.cpp
+          modified:   llui/lltextbox.h
+          modified:   llui/lltexteditor.cpp
+          modified:   llui/lltexteditor.h
+          modified:   llui/llview.cpp
+          modified:   llui/llview.h
+          modified:   llwindow/llwindow.h
+          modified:   newview/CMakeLists.txt
+          modified:   newview/app_settings/settings.xml
+          modified:   newview/llfloaterabout.cpp
+          modified:   newview/llfloaterchat.cpp
+          modified:   newview/llgroupnotify.cpp
+          modified:   newview/llimpanel.cpp
+          modified:   newview/llstylemap.cpp
+          modified:   newview/llstylemap.h
+          modified:   newview/llviewermessage.cpp
+          modified:   newview/skins/default/colors_base.xml
+          modified:   newview/skins/silver/colors_base.xml
+
+
+        * Applied ReinstateShowTextureUUID Cool Viewer patch.
+          Reverts the "fix" for VWR-1919.
+          Patch by Henri Beauchamp, modified by McCabe Maxsted.
+
+          modified:   linden/indra/newview/lltexturectrl.cpp
+          modified:   linden/indra/newview/llviewermenu.cpp
+
+
+        * Fixed unlink option enabling when selecting textures.
+
+          modified:   linden/indra/newview/llfloatertools.cpp
+          modified:   linden/indra/newview/llviewermenu.cpp
+
+
+        * Redid layout of profile window, added group invite button.
+
+          modified:   linden/indra/newview/llpanelavatar.cpp
+          modified:   linden/indra/newview/llpanelavatar.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+          deleted:    linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
+
+
+        * Admin options now only show for other people's profiles.
+
+          modified:   linden/indra/newview/llpanelavatar.cpp
+
+
+2009-09-09  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Updated Grid Manager from Meerkat's SVN (as of r215).
+
+          modified:   linden/indra/llvfs/lldir.cpp
+          modified:   linden/indra/llvfs/lldir.h
+          modified:   linden/indra/newview/CMakeLists.txt
+          modified:   linden/indra/newview/app_settings/default_grids.xml
+          deleted:    linden/indra/newview/authentication_controller.cpp
+          deleted:    linden/indra/newview/authentication_controller.h
+          deleted:    linden/indra/newview/authentication_floater.cpp
+          deleted:    linden/indra/newview/authentication_floater.h
+          deleted:    linden/indra/newview/authentication_model.cpp
+          deleted:    linden/indra/newview/authentication_model.h
+          deleted:    linden/indra/newview/controllerlogin.cpp
+          deleted:    linden/indra/newview/controllerlogin.h
+          deleted:    linden/indra/newview/controllerpasswords.cpp
+          deleted:    linden/indra/newview/controllerpasswords.h
+          modified:   linden/indra/newview/floaterlogin.cpp
+          modified:   linden/indra/newview/floaterlogin.h
+          modified:   linden/indra/newview/hippoGridManager.cpp
+          modified:   linden/indra/newview/hippoGridManager.h
+          modified:   linden/indra/newview/llfloaterworldmap.cpp
+          modified:   linden/indra/newview/llpanellogin.cpp
+          modified:   linden/indra/newview/llprefsim.cpp
+          modified:   linden/indra/newview/llstartup.cpp
+          deleted:    linden/indra/newview/prefpanelpasswords.cpp
+          deleted:    linden/indra/newview/prefpanelpasswords.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_login.xml
+
+
+        * Merged in Grid Manager, etc. (thanks Armin).
+
+          modified:   linden/indra/llcommon/llstring.h
+          modified:   linden/indra/newview/CMakeLists.txt
+          new file:   linden/indra/newview/app_settings/default_grids.xml
+          modified:   linden/indra/newview/app_settings/settings.xml
+          new file:   linden/indra/newview/authentication_controller.cpp
+          new file:   linden/indra/newview/authentication_controller.h
+          new file:   linden/indra/newview/authentication_floater.cpp
+          new file:   linden/indra/newview/authentication_floater.h
+          new file:   linden/indra/newview/authentication_model.cpp
+          new file:   linden/indra/newview/authentication_model.h
+          new file:   linden/indra/newview/controllerlogin.cpp
+          new file:   linden/indra/newview/controllerlogin.h
+          new file:   linden/indra/newview/controllerpasswords.cpp
+          new file:   linden/indra/newview/controllerpasswords.h
+          new file:   linden/indra/newview/floaterlogin.cpp
+          new file:   linden/indra/newview/floaterlogin.h
+          new file:   linden/indra/newview/hippoGridManager.cpp
+          new file:   linden/indra/newview/hippoGridManager.h
+          new file:   linden/indra/newview/hippoLimits.cpp
+          new file:   linden/indra/newview/hippoLimits.h
+          new file:   linden/indra/newview/hippoRestRequest.cpp
+          new file:   linden/indra/newview/hippoRestRequest.h
+          new file:   linden/indra/newview/hippoUpdate.cpp
+          new file:   linden/indra/newview/hippoUpdate.h
+          modified:   linden/indra/newview/llagent.cpp
+          modified:   linden/indra/newview/llappviewer.cpp
+          modified:   linden/indra/newview/llappviewer.h
+          modified:   linden/indra/newview/llappviewerlinux.h
+          modified:   linden/indra/newview/llcallingcard.cpp
+          modified:   linden/indra/newview/llcallingcard.h
+          modified:   linden/indra/newview/llchatbar.cpp
+          modified:   linden/indra/newview/lldrawable.h
+          modified:   linden/indra/newview/llfloaterworldmap.cpp
+          modified:   linden/indra/newview/llfloaterworldmap.h
+          modified:   linden/indra/newview/llinventorymodel.cpp
+          modified:   linden/indra/newview/llinventorymodel.h
+          modified:   linden/indra/newview/llinventoryview.cpp
+          modified:   linden/indra/newview/llpanellogin.cpp
+          modified:   linden/indra/newview/llpanellogin.h
+          modified:   linden/indra/newview/llprogressview.cpp
+          modified:   linden/indra/newview/llstartup.cpp
+          modified:   linden/indra/newview/llstartup.h
+          modified:   linden/indra/newview/lluserauth.cpp
+          modified:   linden/indra/newview/llviewerjointattachment.h
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/llviewermenufile.cpp
+          modified:   linden/indra/newview/llviewermessage.cpp
+          modified:   linden/indra/newview/llviewermessage.h
+          modified:   linden/indra/newview/llviewernetwork.cpp
+          modified:   linden/indra/newview/llviewernetwork.h
+          modified:   linden/indra/newview/llviewerobject.h
+          modified:   linden/indra/newview/llviewerwindow.cpp
+          modified:   linden/indra/newview/llvoavatar.cpp
+          modified:   linden/indra/newview/llwearablelist.cpp
+          modified:   linden/indra/newview/llworld.cpp
+          new file:   linden/indra/newview/prefpanelpasswords.cpp
+          new file:   linden/indra/newview/prefpanelpasswords.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/alerts.xml
+          new file:   linden/indra/newview/skins/default/xui/en-us/floater_login.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+
+
+        * Commented out Linux tarball building.
+          It's a waste of time to package after every compile.
+
+          modified:   linden/indra/newview/viewer_manifest.py
+
+
+2009-09-08  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Created my own version of Emerald's chat channel tool.
+
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llchatbar.cpp
+          modified:   linden/indra/newview/llchatbar.h
+          modified:   linden/indra/newview/llfloaterchat.cpp
+          modified:   linden/indra/newview/llfloaterchat.h
+          modified:   linden/indra/newview/llprefschat.cpp
+          modified:   linden/indra/newview/llprefsim.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+
+
+        * New chat channel preference should change only on apply.
+
+          modified:   linden/indra/newview/llprefschat.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+
+
+        * Commented out permissions button in object contents.
+          (Todo: backport this if there's time).
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+
+
+2009-09-07  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Fixed tool brush size.
+
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llfloatertools.cpp
+          modified:   linden/indra/newview/lltoolbrush.cpp
+          modified:   linden/indra/newview/lltoolbrush.h
+          modified:   linden/scripts/messages/message_template.msg
+
+
+        * Applied and tweaked last owner in tools window from Emerald viewer.
+
+          modified:   linden/indra/newview/llpanelpermissions.cpp
+          modified:   linden/indra/newview/llpanelpermissions.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+
+
+2009-09-06  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied sit anywhere feature from Emerald viewer.
+
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+        * Applied phantom avatar feature from Emerald viewer.
+
+          modified:   linden/indra/newview/llagent.cpp
+          modified:   linden/indra/newview/llagent.h
+          modified:   linden/indra/newview/llappviewer.cpp
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+        * Start fetching inventory at startup.
+
+          modified:   linden/indra/newview/llstartup.cpp
+
+
+        * Added Emerald viewer's animation list.
+
+          new file:   linden/indra/newview/jcfloater_animation_list.cpp
+          new file:   linden/indra/newview/jcfloater_animation_list.h
+          new file:   linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
+          modified:   linden/indra/newview/CMakeLists.txt
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+        * Added Emerald viewer's asset browser.
+
+          new file:   linden/indra/newview/llfloaterassetbrowser.cpp
+          new file:   linden/indra/newview/llfloaterassetbrowser.h
+          new file:   linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
+          modified:   linden/indra/newview/CMakeLists.txt
+          modified:   linden/indra/newview/llfloaterassetbrowser.cpp
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+        * Added LLScrollListCtrl::getSelectedIDs().
+
+          modified:   linden/indra/llui/llscrolllistctrl.cpp
+          modified:   linden/indra/llui/llscrolllistctrl.h
+
+
+        * Fixed reference to missing colors.xml entry.
+
+          modified:   linden/indra/newview/jcfloater_animation_list.cpp
+
+
+        * Fixed ground sit menu entry missing check.
+
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+2009-09-05  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Converted RLVa menu items to XUI.
+
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+2009-09-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.
+        Made a few non-functional changes to help it apply.
+
+          modified:   linden/indra/llcommon/llchat.h
+          modified:   linden/indra/newview/CMakeLists.txt
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/app_settings/settings_per_account.xml
+          modified:   linden/indra/newview/llagent.cpp
+          modified:   linden/indra/newview/llagent.h
+          modified:   linden/indra/newview/llappviewer.cpp
+          modified:   linden/indra/newview/llchatbar.cpp
+          modified:   linden/indra/newview/llfloaterabout.cpp
+          modified:   linden/indra/newview/llfloateractivespeakers.cpp
+          modified:   linden/indra/newview/llfloaterbeacons.cpp
+          modified:   linden/indra/newview/llfloaterchat.cpp
+          modified:   linden/indra/newview/llfloaterinspect.cpp
+          modified:   linden/indra/newview/llfloaterland.cpp
+          modified:   linden/indra/newview/llfloaterland.h
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llfloatermap.h
+          modified:   linden/indra/newview/llfloateropenobject.cpp
+          modified:   linden/indra/newview/llfloaterproperties.cpp
+          modified:   linden/indra/newview/llfloaterregioninfo.cpp
+          modified:   linden/indra/newview/llfloaterregioninfo.h
+          modified:   linden/indra/newview/llfloaterreporter.cpp
+          modified:   linden/indra/newview/llfloatersettingsdebug.cpp
+          modified:   linden/indra/newview/llfloaterwindlight.cpp
+          modified:   linden/indra/newview/llfloaterworldmap.cpp
+          modified:   linden/indra/newview/llglsandbox.cpp
+          modified:   linden/indra/newview/llhoverview.cpp
+          modified:   linden/indra/newview/llhudtext.cpp
+          modified:   linden/indra/newview/llhudtext.h
+          modified:   linden/indra/newview/llimpanel.cpp
+          modified:   linden/indra/newview/llimview.cpp
+          modified:   linden/indra/newview/llinventorybridge.cpp
+          modified:   linden/indra/newview/llinventorymodel.cpp
+          modified:   linden/indra/newview/llinventoryview.cpp
+          modified:   linden/indra/newview/llinventoryview.h
+          modified:   linden/indra/newview/llmaniptranslate.cpp
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:   linden/indra/newview/llnotify.cpp
+          modified:   linden/indra/newview/lloverlaybar.cpp
+          modified:   linden/indra/newview/llpanelavatar.cpp
+          modified:   linden/indra/newview/llpanelclassified.cpp
+          modified:   linden/indra/newview/llpanelcontents.cpp
+          modified:   linden/indra/newview/llpaneldisplay.cpp
+          modified:   linden/indra/newview/llpanelinventory.cpp
+          modified:   linden/indra/newview/llpanelland.cpp
+          modified:   linden/indra/newview/llpanellogin.cpp
+          modified:   linden/indra/newview/llpanelobject.cpp
+          modified:   linden/indra/newview/llpanelpermissions.cpp
+          modified:   linden/indra/newview/llpanelpick.cpp
+          modified:   linden/indra/newview/llprefsim.cpp
+          modified:   linden/indra/newview/llpreviewscript.cpp
+          modified:   linden/indra/newview/llselectmgr.cpp
+          modified:   linden/indra/newview/llstartup.cpp
+          modified:   linden/indra/newview/llstatusbar.cpp
+          modified:   linden/indra/newview/lltoolbar.cpp
+          modified:   linden/indra/newview/lltooldraganddrop.cpp
+          modified:   linden/indra/newview/lltoolface.cpp
+          modified:   linden/indra/newview/lltoolgrab.cpp
+          modified:   linden/indra/newview/lltoolpie.cpp
+          modified:   linden/indra/newview/lltoolplacer.cpp
+          modified:   linden/indra/newview/lltoolselect.cpp
+          modified:   linden/indra/newview/lltracker.cpp
+          modified:   linden/indra/newview/llviewercontrol.cpp
+          modified:   linden/indra/newview/llviewerdisplay.cpp
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/llviewermessage.cpp
+          modified:   linden/indra/newview/llviewerobject.cpp
+          modified:   linden/indra/newview/llviewertexteditor.cpp
+          modified:   linden/indra/newview/llviewerwindow.cpp
+          modified:   linden/indra/newview/llvoavatar.cpp
+          modified:   linden/indra/newview/llvovolume.cpp
+          modified:   linden/indra/newview/llworldmapview.cpp
+          modified:   linden/indra/newview/pipeline.cpp
+          new file:   linden/indra/newview/rlvevent.h
+          new file:   linden/indra/newview/rlvextensions.cpp
+          new file:   linden/indra/newview/rlvextensions.h
+          new file:   linden/indra/newview/rlvfloaterbehaviour.cpp
+          new file:   linden/indra/newview/rlvfloaterbehaviour.h
+          new file:   linden/indra/newview/rlvhandler.cpp
+          new file:   linden/indra/newview/rlvhandler.h
+          new file:   linden/indra/newview/rlvhelper.cpp
+          new file:   linden/indra/newview/rlvhelper.h
+          new file:   linden/indra/newview/rlvmultistringsearch.cpp
+          new file:   linden/indra/newview/rlvmultistringsearch.h
+          new file:   linden/indra/newview/skins/default/xui/en-us/floater_rlv_behaviour.xml
+
+
+2009-09-04  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Updated GStreamer and Zlib windows libs.
+
+          modified:   linden/indra/cmake/CopyWinLibs.cmake
+          modified:   linden/install.xml
+
+
+        * Fixed inability to minimize chat history.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+
+
+        * Rebranded startup loading page to Imprudence.
+
+          modified:   linden/indra/newview/skins/default/html/en-us/loading/loading.html
+          new file:   linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
+
+
+        * Cherry-picked Armin's middle mouse copy branch.
+
+
+        * Cherry-picked Armin's double-click tp inworld branch.
+
+
+        * Added 'Go Here' to object pie menu.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+
+
+        * Integrated 1.23's tool floater with link/unlink buttons.
+
+          modified:   linden/indra/newview/llfloatertelehub.cpp
+          modified:   linden/indra/newview/llfloatertools.cpp
+          modified:   linden/indra/newview/llfloatertools.h
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+
+
+        * Fixed tree/grass label not hiding.
+
+          modified:   linden/indra/newview/llfloatertools.cpp
+
+
+2009-09-03  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Backported 1.23 fix for animation joint assertion crash.
+
+          modified:   linden/indra/llcharacter/llkeyframemotion.cpp
+
+
+        * Updated object backup feature to Meerkat's SVN, imported floater.
+
+          modified:   linden/indra/newview/primbackup.cpp
+          modified:   linden/indra/newview/primbackup.h
+          new file:   linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml
+
+
+        * Imported Meerkat's object backup feature.
+
+          modified:   linden/indra/newview/CMakeLists.txt
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/llviewerobjectlist.cpp
+          new file:   linden/indra/newview/primbackup.cpp
+          new file:   linden/indra/newview/primbackup.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+        * Updated some python scripts to not use deprecated modules.
+
+          modified:   linden/indra/lib/python/indra/base/lluuid.py
+          modified:   linden/indra/lib/python/indra/ipc/llmessage.py
+          modified:   linden/scripts/install.py
+
+
+2009-08-29  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Fixed OpenAL CMake error
+
+          modified:   linden/indra/cmake/OPENAL.cmake
+
+
+        * Fixed CMake not finding GLib on windows.
+
+          modified:   linden/indra/cmake/GStreamer.cmake
+
+
+2009-08-12  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Added basic radar to the minimap.
+
+          modified:   linden/indra/newview/llfloatermap.cpp
+          modified:   linden/indra/newview/llfloatermap.h
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:     linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+
+
 2009-06-14  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Added IM preference for showing IMs in either main or local chat.
 
-                modified:   linden/indra/newview/app_settings/settings.xml
-                modified:   linden/indra/newview/llfloaterchat.cpp
-                modified:   linden/indra/newview/llprefsim.cpp
-                modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
-                
-                
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llfloaterchat.cpp
+          modified:   linden/indra/newview/llprefsim.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+
+
         * Online/Offline notifications now always show in IM windows.
-        
-                modified:   linden/indra/newview/llcallingcard.cpp
+
+          modified:   linden/indra/newview/llcallingcard.cpp
+
+
+        * Audio stream track info displayed in chat instead of notices.
+
+          modified:   indra/newview/lloverlaybar.cpp
+
+
+        * Fixed stream info not updating.
+
+          modified:   indra/llmedia/llmediaimplgstreamer.cpp
+
+
+2009-06-14  Dale Glass  <email@unknown.com>
+
+        * VWR-12655: Add support for displaying the title of the song.
+
+          modified:   indra/llaudio/audioengine.h
+          modified:   indra/llmedia/llmediaimplgstreamer.cpp
+          modified:   indra/llmedia/llmediaimplgstreamer.h
+          modified:   indra/llmedia/llmediaobserver.h
+          modified:   indra/newview/app_settings/settings.xml
+          modified:   indra/newview/lloverlaybar.cpp
+          modified:   indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
 
 
 2009-06-13  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Added 'Show Map' option to the mini-map menu.
 
-                modified:   linden/indra/newview/llnetmap.cpp
-                modified:   linden/indra/newview/llnetmap.h
-                modified:   linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
-                
-                
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:   linden/indra/newview/llnetmap.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+
+
         * Moved mini-map tooltips to XML, added panning tooltip.
-                
-                modified:   linden/indra/newview/llnetmap.cpp
-                modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
-                modified:   linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
-                
-                
-        * Removed double click tp checkbox from preferences as it keeps the two maps more in sync,
-          and Show Map is in the minimap now. Keeping the debug setting.
-                
-                modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
+
+
+        * Removed double click tp checkbox from preferences as it keeps
+          the two maps more in sync, and Show Map is in the minimap now.
+          Keeping the debug setting.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
 
 
         * Forgot tooltip for map opening, fixed typo.
 
-                modified:   linden/indra/newview/llnetmap.cpp
-                modified:   linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
-                
-                
-        * Show muted avatars as grey in the mini-map. 
-                
-                modified:   linden/indra/newview/llnetmap.cpp
-                modified:   linden/indra/newview/llworldmapview.cpp
-                modified:   linden/indra/newview/skins/default/colors_base.xml
-                modified:   linden/indra/newview/skins/silver/colors_base.xml
-                
-                
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
+
+
+        * Show muted avatars as grey in the mini-map.
+
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:   linden/indra/newview/llworldmapview.cpp
+          modified:   linden/indra/newview/skins/default/colors_base.xml
+          modified:   linden/indra/newview/skins/silver/colors_base.xml
+
+
         * Cleaned up some old unused references.
-        
-                modified:   linden/indra/newview/llappviewer.cpp
-                modified:   linden/indra/newview/llappviewer.h
-                modified:   linden/indra/newview/llfloaterreporter.cpp
-                modified:   linden/indra/newview/llnetmap.cpp
-                modified:   linden/indra/newview/llviewermessage.cpp
-                
-                
-  Aimee Trescothick  <aimee@ama-zing.co.uk>
-        
-        * VWR-4106: Mini-map beacon icon doesn't display correctly when beacon position above or below camera.
-         
-                modified:   linden/indra/newview/llworldmapview.cpp
-                modified:   linden/indra/newview/llworldmapview.h
-                
-                
-        * VWR-12631: setting to adjust the maximum size of objects displayed on the minimap (MiniMapPrimMaxRadius).
-                
-                modified:   linden/indra/newview/app_settings/settings.xml
-                modified:   linden/indra/newview/llnetmap.cpp
-                modified:   linden/indra/newview/llviewerobjectlist.cpp
-                
-                
-  Armin Weatherwax  <email@unknown.com>
-  
+
+          modified:   linden/indra/newview/llappviewer.cpp
+          modified:   linden/indra/newview/llappviewer.h
+          modified:   linden/indra/newview/llfloaterreporter.cpp
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:   linden/indra/newview/llviewermessage.cpp
+
+
+2009-06-13  Aimee Trescothick  <aimee@ama-zing.co.uk>
+
+        * VWR-4106: Mini-map beacon icon doesn't display correctly
+          when beacon position above or below camera.
+
+          modified:   linden/indra/newview/llworldmapview.cpp
+          modified:   linden/indra/newview/llworldmapview.h
+
+
+        * VWR-12631: setting to adjust the maximum size of objects
+          displayed on the minimap (MiniMapPrimMaxRadius).
+
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llnetmap.cpp
+          modified:   linden/indra/newview/llviewerobjectlist.cpp
+
+
+2009-06-13  Armin Weatherwax  <email@unknown.com>
+
         * Updated OpenJpeg to 1.3 for Linux.
-        
-                modified:   linden/indra/newview/viewer_manifest.py
-                modified:   linden/install.xml
+
+          modified:   linden/indra/newview/viewer_manifest.py
+          modified:   linden/install.xml
 
 
 2009-06-12  McCabe Maxsted  <hakushakukun@gmail.com>
 
-        * Applied patch by Robin Cornelius for VWR-12686:
-          LLTextureCache::writeToCache() does not cache textures smaller than TEXTURE_CACHE_ENTRY_SIZE
-        
-                modified:   linden/indra/newview/lltexturecache.cpp
-                
-                
-  Aimee Trescothick  <aimee@ama-zing.co.uk>
-  
+        * Applied patch by Robin Cornelius for VWR-12686
+          LLTextureCache::writeToCache() does not cache textures
+          smaller than TEXTURE_CACHE_ENTRY_SIZE
+
+          modified:   linden/indra/newview/lltexturecache.cpp
+
+
+2009-06-12  Aimee Trescothick  <aimee@ama-zing.co.uk>
+
         * VWR-6918: Hide/Show Selection Outlines.
-    
-                modified:   indra/newview/app_settings/settings.xml
-                modified:   indra/newview/llappviewer.cpp
-                modified:   indra/newview/llselectmgr.cpp
-                modified:   indra/newview/llselectmgr.h
-                modified:   indra/newview/llviewermenu.cpp
-                modified:   indra/newview/skins/default/xui/en-us/menu_viewer.xml
-                
-                
+
+          modified:   indra/newview/app_settings/settings.xml
+          modified:   indra/newview/llappviewer.cpp
+          modified:   indra/newview/llselectmgr.cpp
+          modified:   indra/newview/llselectmgr.h
+          modified:   indra/newview/llviewermenu.cpp
+          modified:   indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
         * VWR-13221: Allow panning of the mini-map.
-                
-                modified:   indra/newview/app_settings/settings.xml
-                modified:   indra/newview/llnetmap.cpp
-                modified:   indra/newview/llnetmap.h
-                modified:   indra/newview/skins/default/xui/en-us/menu_mini_map.xml
-                
+
+          modified:   indra/newview/app_settings/settings.xml
+          modified:   indra/newview/llnetmap.cpp
+          modified:   indra/newview/llnetmap.h
+          modified:   indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+
 
 2009-06-11  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Moved 'Duplicate' to the Tools menu.
-        * Renamed 'Select Tool' to 'Choose Tool', moved Selection options into a flyout menu.
-        * Renamed 'Set permissions on selected task inventory' to 'Set Bulk Permissions'.
-        
-                modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
-        
-        
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+        * Renamed 'Select Tool' to 'Choose Tool', moved Selection options
+          into a flyout menu.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
+        * Renamed 'Set permissions on selected task inventory'
+          to 'Set Bulk Permissions'.
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+
+
         * Added missing mini-map xui files.
-        
-                new file:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
-                new file:   linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
-                new file:   linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
-                
-                
+
+          new file:   linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+          new file:   linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+          new file:   linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
+
+
         * Added patch and .pyc files to .gitignore.
-                 
-                modified:   .gitignore
-                
+
+          modified:   .gitignore
+
 
         * Added Link/Unlink buttons to the Tools floater.
-        
-                modified:   linden/indra/newview/llfloatertools.cpp
-                modified:   linden/indra/newview/llfloatertools.h
-                modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
-                
-                
+
+          modified:   linden/indra/newview/llfloatertools.cpp
+          modified:   linden/indra/newview/llfloatertools.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+
+
         * Fixed 'Unlink' not toggling in Tools menu.
-                
-                modified:   linden/indra/newview/llviewermenu.cpp
-                
-                
+
+          modified:   linden/indra/newview/llviewermenu.cpp
+
+
         * Added Link/Unlink options to the object pie menu.
-                
-                modified:   linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
-                
-                
+
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+
+
         * Double clicking inventory objects toggles wear/detach.
-          Patch originally by Nicholaz Beresford with additions by Henri Beauchamp. 
-                
-                modified:   indra/newview/llinventorybridge.cpp
+          Patch originally by Nicholaz Beresford with additions
+          by Henri Beauchamp.
+
+          modified:   indra/newview/llinventorybridge.cpp
 
 
 2009-06-10  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Fixed Communicate window not toggling from menu.
-        
-                modified:   indra/newview/llviewermenu.cpp
-                
-                
+
+          modified:   indra/newview/llviewermenu.cpp
+
+
         * Applied MJM's tree and grass pulldown list from the Hippo Viewer.
-        
-                modified:   linden/indra/newview/app_settings/grass.xml
-                modified:   linden/indra/newview/app_settings/settings.xml
-                modified:   linden/indra/newview/app_settings/trees.xml
-                modified:   linden/indra/newview/llfloatertools.cpp
-                modified:   linden/indra/newview/llfloatertools.h
-                modified:   linden/indra/newview/lltoolplacer.cpp
-                modified:   linden/indra/newview/llvograss.cpp
-                modified:   linden/indra/newview/llvograss.h
-                modified:   linden/indra/newview/llvotree.cpp
-                modified:   linden/indra/newview/llvotree.h
-                modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
-                
-                
+
+          modified:   linden/indra/newview/app_settings/grass.xml
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/app_settings/trees.xml
+          modified:   linden/indra/newview/llfloatertools.cpp
+          modified:   linden/indra/newview/llfloatertools.h
+          modified:   linden/indra/newview/lltoolplacer.cpp
+          modified:   linden/indra/newview/llvograss.cpp
+          modified:   linden/indra/newview/llvograss.h
+          modified:   linden/indra/newview/llvotree.cpp
+          modified:   linden/indra/newview/llvotree.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+
+
         * Added pulldown label and fixed combobox not hiding.
-        
-                modified:   linden/indra/newview/llfloatertools.cpp
-                modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
-                
-                
+
+          modified:   linden/indra/newview/llfloatertools.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+
+
         * Applied Armin's patch to create an Advanced Menu menu item.
-          (Placed it in View and changed it to a check.)
-        
-                modified:   linden/indra/newview/llviewermenu.cpp
-                modified:   linden/indra/newview/llviewerwindow.cpp
-                modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+          Placed it in View and changed it to a check.
+
+          modified:   linden/indra/newview/llviewermenu.cpp
+          modified:   linden/indra/newview/llviewerwindow.cpp
+          modified:   linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
 
 
 2009-06-09  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Backported 1.23's minimap conversion to XUI.
-        
-                modified:   indra/llui/llui.cpp
-                modified:   indra/llui/llui.h
-                modified:   indra/newview/CMakeLists.txt
-                modified:   indra/newview/llagent.cpp
-                modified:   indra/newview/llcolorscheme.cpp
-                modified:   indra/newview/llcolorscheme.h
-                modified:   indra/newview/llfloatermap.cpp
-                modified:   indra/newview/llfloatermap.h
-                modified:   indra/newview/llmenucommands.cpp
-                modified:   indra/newview/llnetmap.cpp
-                modified:   indra/newview/llnetmap.h
-                modified:   indra/newview/llstartup.cpp
-                modified:   indra/newview/llviewercontrol.cpp
-                modified:   indra/newview/llviewermenu.cpp
-                modified:   indra/newview/llviewerobject.cpp
-                modified:   indra/newview/llviewerregion.cpp
-                modified:   indra/newview/llviewerwindow.cpp
-                modified:   indra/newview/llworldmapview.cpp
-                modified:   indra/newview/skins/default/colors_base.xml
-                modified:   indra/newview/skins/silver/colors_base.xml
+
+          modified:   indra/llui/llui.cpp
+          modified:   indra/llui/llui.h
+          modified:   indra/newview/CMakeLists.txt
+          modified:   indra/newview/llagent.cpp
+          modified:   indra/newview/llcolorscheme.cpp
+          modified:   indra/newview/llcolorscheme.h
+          modified:   indra/newview/llfloatermap.cpp
+          modified:   indra/newview/llfloatermap.h
+          modified:   indra/newview/llmenucommands.cpp
+          modified:   indra/newview/llnetmap.cpp
+          modified:   indra/newview/llnetmap.h
+          modified:   indra/newview/llstartup.cpp
+          modified:   indra/newview/llviewercontrol.cpp
+          modified:   indra/newview/llviewermenu.cpp
+          modified:   indra/newview/llviewerobject.cpp
+          modified:   indra/newview/llviewerregion.cpp
+          modified:   indra/newview/llviewerwindow.cpp
+          modified:   indra/newview/llworldmapview.cpp
+          modified:   indra/newview/skins/default/colors_base.xml
+          modified:   indra/newview/skins/silver/colors_base.xml
+
+
+        * Applied Aimee's minimap magnify patch.
+
+          modified:   doc/contributions.txt
+          modified:   indra/newview/app_settings/settings.xml
+          modified:   indra/newview/llnetmap.cpp
+          modified:   indra/newview/llnetmap.h
+          modified:   indra/newview/llworldmapview.cpp
+          modified:   indra/newview/llworldmapview.h
+          modified:   indra/newview/skins/default/textures/textures.xml
 
 
 2009-06-08  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Changed 'IM Received' button to '__ New IMs'.
-        
-                modified:   linden/indra/newview/llfloaterchatterbox.cpp
-                modified:   linden/indra/newview/llimview.cpp
-                modified:   linden/indra/newview/llimview.h
-                modified:   linden/indra/newview/lloverlaybar.cpp
-                modified:   linden/indra/newview/lloverlaybar.h
-                modified:   linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
-                
-                
+
+          modified:   linden/indra/newview/llfloaterchatterbox.cpp
+          modified:   linden/indra/newview/llimview.cpp
+          modified:   linden/indra/newview/llimview.h
+          modified:   linden/indra/newview/lloverlaybar.cpp
+          modified:   linden/indra/newview/lloverlaybar.h
+          modified:   linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+
+
         * Backported LL's version of VWR-2681 from 1.23.
-                
-                modified:   indra/newview/app_settings/settings.xml
-                modified:   indra/newview/llfloateravatarpicker.cpp
-                modified:   indra/newview/llfloateravatarpicker.h
-                modified:   indra/newview/llfloatergodtools.cpp
-                modified:   indra/newview/llglsandbox.cpp
-                modified:   indra/newview/llnetmap.cpp
-                modified:   indra/newview/llviewerobjectlist.cpp
-                modified:   indra/newview/llworld.cpp
-                modified:   indra/newview/llworld.h
-                modified:   indra/newview/pipeline.cpp
-                modified:   indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
-                
-                
+
+          modified:   indra/newview/app_settings/settings.xml
+          modified:   indra/newview/llfloateravatarpicker.cpp
+          modified:   indra/newview/llfloateravatarpicker.h
+          modified:   indra/newview/llfloatergodtools.cpp
+          modified:   indra/newview/llglsandbox.cpp
+          modified:   indra/newview/llnetmap.cpp
+          modified:   indra/newview/llviewerobjectlist.cpp
+          modified:   indra/newview/llworld.cpp
+          modified:   indra/newview/llworld.h
+          modified:   indra/newview/pipeline.cpp
+          modified:   indra/newview/skins/default/xui/en-us/floater_avatar_picker.xml
+
+
         * Fixed the Resident Chooser showing hair instead of calling cards.
-        
-                modified:   indra/newview/llfloateravatarpicker.cpp
+
+          modified:   indra/newview/llfloateravatarpicker.cpp
 
 
 2009-06-07  McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Fixed CopyWinLibs.CMake errors (removed vivox).
-        
-                modified:   linden/indra/cmake/CopyWinLibs.cmake
-                modified:   linden/install.xml
-                
-                
-        * Fixed VC++ error C2864: 'LLAudioEngine_OpenAL::WIND_BUFFER_SIZE_SEC' : 
-                only static const integral data members can be initialized within a class.
-                
-                modified:   linden/indra/llaudio/audioengine_openal.cpp
-                modified:   linden/indra/llaudio/audioengine_openal.h
-                
-                
+
+          modified:   linden/indra/cmake/CopyWinLibs.cmake
+          modified:   linden/install.xml
+
+
+        * Fixed VC++ error C2864: 'LLAudioEngine_OpenAL::WIND_BUFFER_SIZE_SEC' :
+        only static const integral data members can be initialized within a class.
+
+          modified:   linden/indra/llaudio/audioengine_openal.cpp
+          modified:   linden/indra/llaudio/audioengine_openal.h
+
+
         * Fixed VC++ warning C4305: '=' : truncation from 'double' to 'float' for mVolume.
-                
-                modified:   linden/indra/llmedia/llmediaimplgstreamer.cpp
-                
-                
+
+          modified:   linden/indra/llmedia/llmediaimplgstreamer.cpp
+
+
         * Removed bad entries from copy_win_libs.
         * Restored zlib1.dll (not a bad entry).
-                
-                modified:   linden/indra/cmake/CopyWinLibs.cmake
-                
-                
+
+          modified:   linden/indra/cmake/CopyWinLibs.cmake
+
+
         * Removed old linden glib entry that was interfering.
         * Updated windows zlib archive.
         * Updated windows iconv archive.
-                
-                modified:   linden/install.xml
-                
-                
+
+          modified:   linden/install.xml
+
+
         * Placed the gstreamer plugins in newview where they belong.
-                
-                modified:   linden/indra/cmake/CopyWinLibs.cmake
-                modified:   linden/install.xml
+
+          modified:   linden/indra/cmake/CopyWinLibs.cmake
+          modified:   linden/install.xml
 
 
 2009-05-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index 94454ee..53061c0 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -4,6 +4,336 @@
 
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                      1.2.0 BETA                        -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+
+   KNOWN ISSUES
+
+     * When you try to quit after having logged out at least once, the
+       viewer may crash (Linux & Mac) or not quit (Windows). As a
+       work-around (particularly for Windows users), we recommend not
+       using "File > Logout" until this has been fixed.
+
+     * Many new UI additions only provide English text. We'd love to
+       have some bilingual users help us translate them. If you can
+       help, please post in the forums.
+
+     * The custom chat channel number entry doesn't behave properly
+       for channel numbers longer than 6 digits. As a temporary
+       work-around until we fix this, use the old "/NUMBER" (e.g.
+       "/123456789 Hi") and "//" chat commands for chatting on large
+       channel numbers.
+
+     * The grid selection box on the login screen always defaults to
+       "secondlife" at startup, when it should default to the most
+       recently used grid.
+
+     * The grid selection box on the login screen always shows
+       "secondlife" after logging out, but behaves like it is still
+       set to the grid you logged out from.
+
+     * The minimap radar cannot be hidden yet. We're working on it.
+
+     * The Windlight Water settings window doesn't have previous/next
+       arrows like the Sky window does.
+
+     * The Windlight toolbar sometimes forgets the last selected
+       preset.
+
+     * "File > Import" and "File > Upload & Import" may not work
+       correctly for Mac users.
+
+
+   CHANGES
+
+     This version of Imprudence includes the following changes (as
+     compared to Imprudence 1.1.0).
+
+
+     VERSION HIGHLIGHTS
+
+       * Object Backup. You can now download objects that you have
+         created and have full permissions for to your computer, and
+         upload them back into the world (or another grid). Thanks to
+         the Meerkat Viewer for developing this feature, and to Armin
+         for helping us import it!
+
+       * Grid Manager. You can now modify the list of grids available
+         at the login screen. We have further plans for extending this
+         feature, but this will serve for now. Thanks to the Hippo
+         Viewer and Meerkat Viewer for this, and to Armin for helping
+         import it!
+       
+       * Restrained Life support. Imprudence now provides optional
+         support for the Restrained Life API (used by BDSM items and
+         various scripted gadgets). Enable it with "Advanced >
+         Restrained Life Support". Many thanks to Kitty Barnett for
+         developing RLVa and working with us to integrate it into
+         Imprudence!
+
+       * Radar. The minimap now features a list of nearby avatars.
+         Thanks so much, McCabe and Dale Glass!
+
+       * Emerald features. We've imported a variety of features from
+         the Green Life Emerald Viewer. Thanks to the Emerald folks
+         for developing these, and McCabe for importing them!
+
+          - "Advanced > Asset Browser" (Alt-Shift-A). Visual browser
+            for textures in your inventory.
+
+          - "Advanced > Animation List". Lists the animations you are
+            playing, and allows you to selectively stop them and revoke
+            animation permissions from scripted objects.
+
+          - "Advanced > Phantom Avatar" (Ctrl-Alt-P). Prevents your
+            avatar from being pushed, but also prevents you from
+            moving.
+
+          - "Advanced > Ground Sit" (Ctrl-Alt-S). Makes your avatar sit
+            down at your current location.
+
+          - Build tool shows objects' Last (previous) Owner.
+
+          - When viewing your own profile, the Profile window indicates
+            which of your groups are hidden.
+
+          - You can now search your inventory by Creator name.
+            ("Search" menu in the Inventory window.)
+
+          - You can now double-click on a location in the 3D world to
+            teleport there.
+
+          - Added "BlockClickSit" debug setting. Set it to true to
+            prevent yourself from sitting on things when you accidently
+            click on them.
+
+          - Particle chat, which sends a message on channel 9000 when
+            you select an object, for enhanced integration with
+            scripted objects. You can disable this feature by changing
+            the "ParticleChat" setting to False in "Advanced > Debug
+            Settings".
+
+
+     BUILDING
+
+       * You can now choose which kind of grass or tree to rez.
+         Before, it always rezzed a random kind. Thanks to Mana Janus
+         for this!
+
+       * Added "Link" and "Unlink" to the pie menu for objects.
+         Thanks, McCabe!
+
+       * Added "Link" and "Unlink" buttons to the Build window.
+         Thanks, McCabe!
+
+       * Several changes to the main menus. Thanks, McCabe!
+
+          - "Edit > Duplicate" is now in the Tools menu.
+
+          - Moved the selection-related options in the Tools menu to a
+            new submenu, "Tools > Selection Options".
+
+          - The "Tools > Select Tool" submenu has been renamed to
+            "Choose Tool" to avoid confusion with the Selection
+            Options.
+
+          - "Tools > Set permissions on selected task inventory" has
+            been renamed to "Set Bulk Permissions".
+
+       * "Advanced > Rendering > Selected Texture Info" now displays
+         partial UUIDs for the textures. Thanks to Henri Beauchamp and
+         McCabe for developing this!
+
+       * Added "Tools > Selection Options > Hide Selection Outline"
+         (VWR-6918). This can help make it easier to see when editing
+         small objects, and improves performance when selecting a
+         large number of prims. Thanks a bunch, Aimee Trescothick!
+
+
+     MAP & MINIMAP
+
+       * The minimap has many improvements. Our enduring gratitude to
+         Aimee Trescothick for these!
+
+          - Enhanced zoom behavior and range.
+
+          - It can be panned with Shift-Click and drag. (Right click
+            the minimap and disable "Center on Camera" if you want to
+            stop it from moving back automatically.)
+
+          - Hovering the mouse over someone's dot on the minimap will
+            show their name in the tooltip. Right click on a dot and
+            choose "Profile" to open that person's profile window.
+
+          - Window layout converted to XUI under the hood.
+
+       * But wait — the minimap has other improvements, too. Thanks to
+         McCabe for these!
+
+          - Muted avatars are colored gray in the minimap.
+
+          - Added "Show World Map" to the minimap right-click menu.
+
+          - Moved "Rotate Mini-Map" to the minimap right-click menu.
+
+       * The World Map displays the number of avatars in each sim,
+         above the sim's name. That's pretty handy, Jacek and McCabe!
+
+
+     MISC. UI
+
+       * The Communicate window title and "IM Received" popup button
+         now show the number of unread IMs you've received. Nice work,
+         McCabe!
+
+       * The "About Land" window displays the L$/sqm cost for land for
+         sale. Thanks to Linden Lab for this feature in SL 1.23.
+
+       * The Resident chooser now has a "Near Me" tab with a list of
+         nearby people (VWR-2681). Thanks to Matthew Dowd, Vadim
+         Bigbear, and Coco Linden for developing this feature.
+
+       * Double clicking an object in your inventory wears it (or
+         detaches it, if you are already wearing it). Thanks to
+         Nicholaz Beresford and Henri Beauchamp for developing this!
+
+       * Quick access to Windlight presets and draw distance from the
+         toolbar. You can toggle this in "Preferences > Graphics >
+         Show environment control in toolbar" (a checkbox near the top
+         right corner of the window). Nice work, McCabe!
+
+       * When listening to audio streams, song info is output to your
+         chat window. You can toggle this in "Preferences > Audio &
+         Video > Show stream info in chat" (a checkbox about halfway
+         down the window). Thanks to Dale Glass for developing this
+         feature!
+
+       * IM windows inform you when the other person has gone on or
+         offline even if you have turned off "Show online Friend
+         notifications". That's pretty handy, McCabe!
+
+       * Added "View > Advanced Menu" to toggle the Advanced menu.
+         Thanks, Armin!
+
+       * The layout of the Profile window has been revamped. Thanks,
+         McCabe!
+
+       * In the Local Chat window, you can now click the name of
+         objects that IM you to view information about the object and
+         its owner. Thanks to Linden Lab for developing this in SL
+         1.23.
+
+       * The Snapshot window can now be minimized. It's the little
+         things, McCabe!
+
+       * The Windlight sky settings window now has arrow buttons for
+         quickly changing to the previous or next preset in the list.
+         Thanks, McCabe!
+
+       * "Show HUD Attachments" has been moved back to the View menu,
+         and its shortcut (Alt-Shift-H) has been restored. It was
+         moved to the Advanced menu and lost its shortcut in
+         Imprudence 1.1. Thanks to mashaeilde on the forums for giving
+         us feedback about this!
+
+       * You can now select a default channel number to chat on, for
+         interacting with scripted devices. Turn on "Preferences >
+         Text Chat > Show custom chat channel" (a checkbox near the
+         bottom of the window), then set the channel using the new
+         number entry field on the chat bar. Channel 0 is normal chat,
+         all other channels are only seen by scripts. You can still
+         chat to other channels using "/1", etc. Thanks to the Emerald
+         Viewer for the inspiration, and to McCabe for the
+         implementation!
+
+
+     OTHER
+
+       * Imprudence 1.2 has been rebased to SL 1.22.11. Previous
+         versions of Imprudence were based on SL 1.21.6. Thanks,
+         Jacek!
+
+       * Ability to logout without quitting and restarting the viewer
+         (File > Logout). Thanks to the Meerkat Viewer for this!
+
+       * Several bundled software libraries have been updated to new
+         versions:
+
+          - Gstreamer, Zlib and Iconv on Windows. Thanks, McCabe!
+
+          - OpenJPEG on Linux. Thanks, Armin!
+
+       * The login screen displays the awesome Imprudence logo while
+         the login page is still loading, instead of that smelly old
+         SL logo. Way to go, McCabe!
+
+       * Linux-style middle mouse paste on Linux viewers. Thanks,
+         Armin!
+
+       * The maximum bandwidth setting has been raised to 5000kbps,
+         and the default set to 1000kbps. Thanks, McCabe!
+
+       * Added several new windlight settings by CodeBastard Redgrave,
+         Ana Lutetia, and Torley Linden. Thanks, Codie, Ana, and
+         Torley!
+
+       * Added the adult_compliant capability, for teleport
+         compatibility with Linden Lab's adult content policy. Thanks
+         for providing a patch for this, Linden Lab!
+
+       * Added two patches (VWR-11128 and VWR-11138) to support Visual
+         Studio Express. Thanks, Robin Cornelius!
+
+
+     BUG FIXES
+
+       * "Stop All Animations" (aka "Stop Animating My Avatar") only
+         affected your own viewer; other people would still see your
+         avatar being animated (VWR-2850). Thanks to Tofu Linden for
+         fixing that in SL 1.23.
+
+       * The Resident chooser was showing hair instead of calling
+         cards. Thanks for fixing that, McCabe!
+
+       * "View > Communicate" wasn't toggling the Communicate window
+         like it was supposed to. Thanks for fixing it, McCabe!
+
+       * Small textures weren't being cached (VWR-12686). Thanks for
+         fixing that, Robin Cornelius!
+
+       * Certain malformed animations could cause the viewer to abort
+         with an assertion about the joint number. Thanks to Linden
+         Lab for fixing this in SL 1.23.
+
+       * The chat history window couldn't be minimized. Thanks,
+         McCabe!
+
+       * The Contacts window couldn't be toggled with "Edit > Friends"
+         (Ctrl-Shift-F) if it was detached from the Communicate window
+         (VWR-5370). Thanks to Latif Khalifa for making the patch to
+         fix that!
+
+       * When trying to attach multiple objects at once from your
+         inventory, it would fail with a message, "Cannot complete
+         attachment. An Attachment is pending for that spot". Many
+         thanks to Kitty Barnett for fixing that awful bug!
+
+       * Teleporting very long distances on OpenSim Hypergrid would
+         sometimes cause weird issues (SVC-2941). Thanks to Mana Janus
+         for the fix!
+
+       * Avatars would be invisible until you zoomed in on them (in SL
+         1.22). Thanks for the patch to fix this, Aleric Inglewood!
+
+       * Special symbols in group titles were appearing as question
+         marks in avatar name tags. McCabe fixed the heck outta that
+         one!
+
+
+
+
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   =-                         1.1.0                          -=
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index fae2e88..0c3fbdb 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -36,6 +36,7 @@ Aimee Trescothick
         VWR-8482
         VWR-9255
         VWR-11844
+        VWR-12748
 Alejandro Rosenthal
         VWR-1184
 Aleric Inglewood
@@ -81,6 +82,11 @@ Alissa Sabre
         VWR-7087
         VWR-7153
         VWR-7168
+<<<<<<< HEAD
+=======
+        VWR-7087
+        VWR-7086
+>>>>>>> origin/next
         VWR-9190
         VWR-10728
 Angus Boyd
@@ -89,6 +95,8 @@ Ann Congrejo
         CT-193
 Argent Stonecutter
         VWR-68
+Armin Weatherwax
+        VWR-8436
 Asuka Neely
         VWR-3434
         VWR-8179
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index e867df8..a0bb951 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -31,9 +31,15 @@ if (WINDOWS)
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
       "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD"
       CACHE STRING "C++ compiler release-with-debug options" FORCE)
-  set(CMAKE_CXX_FLAGS_RELEASE
+  if (MSVC80)
+      set(CMAKE_CXX_FLAGS_RELEASE
+      "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /GT /Zi /MT"
+      CACHE STRING "C++ compiler release options" FORCE)
+  else (MSVC80)
+      set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD"
       CACHE STRING "C++ compiler release options" FORCE)
+  endif (MSVC80)
 
   set(CMAKE_CXX_STANDARD_LIBRARIES "")
   set(CMAKE_C_STANDARD_LIBRARIES "")
@@ -60,21 +66,6 @@ if (WINDOWS)
       /Zc:wchar_t-
       )
   endif (MSVC80 OR MSVC90)
-
-  # VS optimization flags
-  if(MSVC80)
-
-    set(NUMBER_OF_CORES $ENV{NUMBER_OF_PROCESSORS})
-
-    set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GT"
-      CACHE STRING "C++ compiler release options" FORCE)
-
-  add_definitions(
-      /MP${NUMBER_OF_CORES}
-      )
-
-  endif (MSVC80)
   
   # Are we using the crummy Visual Studio KDU build workaround?
   if (NOT VS_DISABLE_FATAL_WARNINGS)
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index e10b0da..3adba60 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -26,6 +26,7 @@ set(debug_files
     windbgdlg.exe
     iconv.dll
     libxml2.dll
+        libcairo-2.dll
     libgio-2.0-0.dll
     libglib-2.0-0.dll
     libgmodule-2.0-0.dll
@@ -55,6 +56,8 @@ set(debug_files
         libgstsdp.dll
         libgsttag.dll
         libgstvideo.dll
+        libjpeg.dll
+        libmp3lame-0.dll
         libneon-27.dll
         libogg-0.dll
         liboil-0.3-0.dll
@@ -66,6 +69,7 @@ set(debug_files
         libvorbis-0.dll
         libvorbisenc-2.dll
         libxml2-2.dll
+        glew32.dll
     xvidcore.dll
     zlib1.dll
     )
@@ -97,6 +101,7 @@ set(release_files
     xul.dll
     iconv.dll
     libxml2.dll
+        libcairo-2.dll
     libgio-2.0-0.dll
     libglib-2.0-0.dll
     libgmodule-2.0-0.dll
@@ -126,6 +131,8 @@ set(release_files
         libgstsdp.dll
         libgsttag.dll
         libgstvideo.dll
+        libjpeg.dll
+        libmp3lame-0.dll
         libneon-27.dll
         libogg-0.dll
         liboil-0.3-0.dll
@@ -137,6 +144,7 @@ set(release_files
         libvorbis-0.dll
         libvorbisenc-2.dll
         libxml2-2.dll
+        glew32.dll
     xvidcore.dll
     zlib1.dll
     )
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 880233e..51e1550 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -1,17 +1,19 @@
 # -*- cmake -*-
 include(Prebuilt)
 
-  # possible libxml should have its own .cmake file instead
+  # Maybe libxml and glib should have their own .cmake files
   use_prebuilt_binary(libxml)
+  use_prebuilt_binary(glib)
+
   set(GSTREAMER_FOUND ON FORCE BOOL)
   set(GSTREAMER_PLUGINS_BASE_FOUND ON FORCE BOOL)
+
   use_prebuilt_binary(gstreamer)
+  use_prebuilt_binary(gstreamer-plugins)
 
 if (WINDOWS)
 
-  use_prebuilt_binary(libxml)
   use_prebuilt_binary(iconv)
-  use_prebuilt_binary(gstreamer-plugins)
   set(GSTREAMER_FOUND ON FORCE BOOL)
   set(GSTREAMER_INCLUDE_DIRS
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib
@@ -28,23 +30,23 @@ if (WINDOWS)
       gmodule-2.0
       gobject-2.0
       gthread-2.0
-      libgstvideo-0.10
-      libgsttag-0.10
-      libgstsdp-0.10
-      libgstrtsp-0.10
-      libgstrtp-0.10
-      libgstriff-0.10
-      libgstreamer-0.10
-      libgstpbutils-0.10
-      libgstnetbuffer-0.10
-      libgstnet-0.10
-      libgstinterfaces-0.10
-      libgstdshow-0.10
-      libgstdataprotocol-0.10
-      libgstcontroller-0.10
-      libgstbase-0.10
-      libgstaudio-0.10
-      libgstapp-0.10
+      libgstvideo.lib
+      libgsttag.lib
+      libgstsdp.lib
+      libgstrtsp.lib
+      libgstrtp.lib
+      libgstriff.lib
+      libgstreamer-0.10.lib
+      libgstpbutils.lib
+      libgstnetbuffer.lib
+      libgstnet-0.10.lib
+      libgstinterfaces.lib
+      libgstdshow.lib
+      libgstdataprotocol-0.10.lib
+      libgstcontroller-0.10.lib
+      libgstbase-0.10.lib
+      libgstaudio.lib
+      libgstapp.lib
       libxml2
       libxml2_a
       libxml2_a_dll
@@ -62,7 +64,7 @@ else (WINDOWS)
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libxml2
       )
 
-  if (DARWIN)
+  if (DARWIN) # Mac
 
     find_library( XML2_LIB
       NAMES xml2.2
@@ -88,7 +90,9 @@ else (WINDOWS)
         ${XML2_LIB}
         )
 
-  else (DARWIN)
+  else (DARWIN) # Linux
+
+    use_prebuilt_binary(theora)
 
     set(GSTREAMER_LIBRARIES
         gstvideo-0.10
diff --git a/linden/indra/cmake/OPENAL.cmake b/linden/indra/cmake/OPENAL.cmake
index 94fa75d..ad26d4c 100644
--- a/linden/indra/cmake/OPENAL.cmake
+++ b/linden/indra/cmake/OPENAL.cmake
@@ -11,7 +11,8 @@ if (OPENAL)
   # message(STATUS "Building with OpenAL audio support")
 
   # OPENAL_LIB
-
+  use_prebuilt_binary(openal)
+  
   if (WINDOWS)
     find_library(OPENAL_LIB
       NAMES openal32
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake
index 4f86d32..0901c1b 100644
--- a/linden/indra/cmake/Python.cmake
+++ b/linden/indra/cmake/Python.cmake
@@ -13,6 +13,10 @@ if (WINDOWS)
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
+    [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
     )
 elseif (EXISTS /etc/debian_version)
   # On Debian and Ubuntu, avoid Python 2.4 if possible.
diff --git a/linden/indra/cmake/UI.cmake b/linden/indra/cmake/UI.cmake
index f529f5b..b70a531 100644
--- a/linden/indra/cmake/UI.cmake
+++ b/linden/indra/cmake/UI.cmake
@@ -31,13 +31,13 @@ if (STANDALONE)
     add_definitions(${${pkg}_CFLAGS_OTHERS})
   endforeach(pkg)
 else (STANDALONE)
-  use_prebuilt_binary(gtk-atk-pango-glib)
+  use_prebuilt_binary(gtk-etc)
   if (LINUX)
     set(UI_LIBRARIES
         atk-1.0
+        cairo
         gdk-x11-2.0
         gdk_pixbuf-2.0
-        Xinerama
         glib-2.0
         gmodule-2.0
         gobject-2.0
@@ -47,11 +47,14 @@ else (STANDALONE)
         pangoft2-1.0
         pangox-1.0
         pangoxft-1.0
+        pixman-1
         )
   endif (LINUX)
 
   include_directories (
       ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/cairo
+      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/pixman-1
       ${LIBS_PREBUILT_DIR}/include
       )
   foreach(include ${${LL_ARCH}_INCLUDES})
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 370a008..6388592 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -482,8 +482,15 @@ class WindowsSetup(PlatformSetup):
                     print 'Building with ', self.gens[version]['gen']
                     break
             else:
-                print >> sys.stderr, 'Cannot find a Visual Studio installation!'
-                eys.exit(1)
+                print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
+                for version in 'vc80 vc90 vc71'.split():
+                    if self.find_visual_studio_express(version):
+                        self._generator = version
+                        print 'Building with ', self.gens[version]['gen'] , "Express edition"
+                        break
+                else:
+                    print >> sys.stderr, 'Cannot find any Visual Studio installation'
+                    eys.exit(1)
         return self._generator
 
     def _set_generator(self, gen):
@@ -536,6 +543,28 @@ class WindowsSetup(PlatformSetup):
             print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
             return ''
 
+    def find_visual_studio_express(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VCExpress\%s\Setup\VC' %
+                       self.gens[gen]['ver'])
+            value_str = (r'ProductDir')
+            print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
+                   (key_str, value_str))
+            print key_str
+
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
+            print 'Found: %s' % value
+            return value
+        except WindowsError, err:
+            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
+            return ''
+
     def get_build_cmd(self):
         if self.incredibuild:
             config = self.build_type
@@ -543,10 +572,23 @@ class WindowsSetup(PlatformSetup):
                 config = '\"%s|Win32\"' % config
 
             return "buildconsole %s.sln /build %s" % (self.project_name, config)
+           
+        environment = self.find_visual_studio()
+        if environment == '':
+            environment = self.find_visual_studio_express()
+            if environment == '':
+                 print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
+            else:
+                 print >> sys.stderr, "\nSolution generation complete, as you are using an express edition the final\n stages will need to be completed by hand"
+                 build_dirs=self.build_dirs();
+                 print >> sys.stderr, "Solution can now be found in:", build_dirs[0]
+                 print >> sys.stderr, "Set %s as startup project" % self.project_name
+                 print >> sys.stderr, "Set build target is Release or RelWithDbgInfo"
+                 exit(0)   
 
         # devenv.com is CLI friendly, devenv.exe... not so much.
         return ('"%sdevenv.com" %s.sln /build %s' % 
-                (self.find_visual_studio(), self.project_name, self.build_type))
+               (environment, self.project_name, self.build_type))
 
     def run(self, command, name=None):
         '''Run a program.  If the program fails, raise an exception.'''
diff --git a/linden/indra/lib/python/indra/base/lluuid.py b/linden/indra/lib/python/indra/base/lluuid.py
index aceea29..40ce818 100644
--- a/linden/indra/lib/python/indra/base/lluuid.py
+++ b/linden/indra/lib/python/indra/base/lluuid.py
@@ -26,7 +26,8 @@ THE SOFTWARE.
 $/LicenseInfo$
 """
 
-import md5, random, socket, string, time, re
+import random, socket, string, time, re
+from hashlib import md5
 import uuid
 
 def _int2binstr(i,l):
@@ -196,7 +197,7 @@ class UUID(object):
         from c++ implementation for portability reasons.
         Returns self.
         """
-        m = md5.new()
+        m = md5()
         m.update(uuid.uuid1().bytes)
         self._bits = m.digest()
         return self
diff --git a/linden/indra/lib/python/indra/ipc/llmessage.py b/linden/indra/lib/python/indra/ipc/llmessage.py
index 6161bad..91fb36b 100644
--- a/linden/indra/lib/python/indra/ipc/llmessage.py
+++ b/linden/indra/lib/python/indra/ipc/llmessage.py
@@ -26,8 +26,6 @@ THE SOFTWARE.
 $/LicenseInfo$
 """
 
-from sets import Set, ImmutableSet
-
 from compatibility import Incompatible, Older, Newer, Same
 from tokenstream import TokenStream
 
@@ -44,8 +42,8 @@ class Template:
     
     def compatibleWithBase(self, base):
         messagenames = (
-              ImmutableSet(self.messages.keys())
-            | ImmutableSet(base.messages.keys())
+              frozenset(self.messages.keys())
+            | frozenset(base.messages.keys())
             )
             
         compatibility = Same()
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index 5c8333c..574ed95 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -183,6 +183,8 @@ public:
         static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status);
 
         friend class LLPipeline; // For debugging
+
+        LLMediaBase * getStreamMedia() { return mInternetStreamMedia; }
 public:
         F32 mMaxWindGain; // Hack.  Public to set before fade in?
 
diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h
index 7b010d6..6f9b8c4 100644
--- a/linden/indra/llcommon/llchat.h
+++ b/linden/indra/llcommon/llchat.h
@@ -43,7 +43,8 @@ typedef enum e_chat_source_type
 {
         CHAT_SOURCE_SYSTEM = 0,
         CHAT_SOURCE_AGENT = 1,
-        CHAT_SOURCE_OBJECT = 2
+        CHAT_SOURCE_OBJECT = 2,
+        CHAT_SOURCE_OBJECT_IM = 3
 } EChatSourceType;
 
 typedef enum e_chat_type
@@ -73,6 +74,10 @@ public:
         :       mText(text),
                 mFromName(),
                 mFromID(),
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                mRlvLocFiltered(FALSE),
+                mRlvNamesFiltered(FALSE),
+// [/RLVa:KB]
                 mSourceType(CHAT_SOURCE_AGENT),
                 mChatType(CHAT_TYPE_NORMAL),
                 mAudible(CHAT_AUDIBLE_FULLY),
@@ -81,10 +86,14 @@ public:
                 mPosAgent(),
                 mURL()
         { }
-        
+
         std::string             mText;          // UTF-8 line of text
         std::string             mFromName;      // agent or object name
         LLUUID                  mFromID;        // agent id or object id
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        BOOL                    mRlvLocFiltered;
+        BOOL                    mRlvNamesFiltered;
+// [/RLVa:KB]
         EChatSourceType mSourceType;
         EChatType               mChatType;
         EChatAudible    mAudible;
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 99a9b9e..7db62bc 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -39,6 +39,7 @@
 #include <wctype.h>
 #include <wchar.h>
 #endif
+#include "linden_common.h"
 
 #include <string.h>
 
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 826111f..bf08879 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -44,8 +44,8 @@ const char * const LL_VIEWER_NAME = "Second Life";
 const char * const IMP_VIEWER_NAME = "Imprudence";
 
 const S32 IMP_VERSION_MAJOR = 1;
-const S32 IMP_VERSION_MINOR = 1;
+const S32 IMP_VERSION_MINOR = 2;
 const S32 IMP_VERSION_PATCH = 0;
-const char * const IMP_VERSION_TEST = "";
+const char * const IMP_VERSION_TEST = "beta 2";
 
 #endif
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index 1250f53..a1cfe1d 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -2208,10 +2208,16 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components,
         S32 requested_sizeS = 0;
         S32 requested_sizeT = 0;
 
-        sculpt_calc_mesh_resolution(sculpt_width, sculpt_height, sculpt_type, mDetail, requested_sizeS, requested_sizeT);
+        // create oblong sculpties with high LOD always
+        F32 sculpt_detail = mDetail;
+        if (sculpt_width != sculpt_height && sculpt_detail < 4.0)
+        {
+                sculpt_detail = 4.0;
+        }
+        sculpt_calc_mesh_resolution(sculpt_width, sculpt_height, sculpt_type, sculpt_detail, requested_sizeS, requested_sizeT);
 
-        mPathp->generate(mParams.getPathParams(), mDetail, 0, TRUE, requested_sizeS);
-        mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(), mDetail, 0, TRUE, requested_sizeT);
+        mPathp->generate(mParams.getPathParams(), sculpt_detail, 0, TRUE, requested_sizeS);
+        mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(), sculpt_detail, 0, TRUE, requested_sizeT);
 
         S32 sizeS = mPathp->mPath.size();         // we requested a specific size, now see what we really got
         S32 sizeT = mProfilep->mProfile.size();   // we requested a specific size, now see what we really got
diff --git a/linden/indra/llmath/xform.h b/linden/indra/llmath/xform.h
index d3be28f..7055a87 100644
--- a/linden/indra/llmath/xform.h
+++ b/linden/indra/llmath/xform.h
@@ -38,7 +38,7 @@
 
 const F32 MAX_OBJECT_Z          = 4096.f; // should match REGION_HEIGHT_METERS, Pre-havok4: 768.f
 const F32 MIN_OBJECT_Z          = -256.f;
-const F32 DEFAULT_MAX_PRIM_SCALE = 10.f;
+//const F32 DEFAULT_MAX_PRIM_SCALE = 10.f; set in llmanipscale.cpp now
 const F32 MIN_PRIM_SCALE = 0.01f;
 const F32 MAX_PRIM_SCALE = 65536.f;     // something very high but not near FLT_MAX
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index d1bab29..a9e0004 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -89,6 +89,7 @@ LLMediaImplGStreamer () :
         mPump ( NULL ),
         mPlaybin ( NULL ),
         mVideoSink ( NULL ),
+        mLastTitle ( "" ),
         mState( GST_STATE_NULL ),
         mPlayThread ( NULL )
 {
@@ -470,6 +471,8 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                         case GST_STATE_PAUSED:
                                 break;
                         case GST_STATE_PLAYING:
+                                //impl->mLastTitle = "";
+
                                 LLMediaEvent event( impl, 100 );
                                 impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event );
                                 // emit an event to say that a media source was loaded
@@ -521,18 +524,28 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                 }
                 case GST_MESSAGE_TAG: 
                 {
-                GstTagList *tag_list;
-                gchar *title;
-                gchar *artist;
-                gst_message_parse_tag(message, &tag_list);
-                gboolean hazTitle = gst_tag_list_get_string(tag_list,
-                        GST_TAG_TITLE, &title);
-                gboolean hazArtist = gst_tag_list_get_string(tag_list,
-                        GST_TAG_ARTIST, &artist);
-                if(hazTitle) 
-                        LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
-                if(hazArtist) 
-                        LL_INFOS("MediaInfo") << "Artist: " << artist << LL_ENDL;
+                        GstTagList *new_tags;
+
+                        gst_message_parse_tag( message, &new_tags );
+
+                        gchar *title;
+
+                        if ( gst_tag_list_get_string(new_tags, GST_TAG_TITLE, &title) )
+                        {
+                                LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
+                                std::string newtitle(title);
+                                gst_tag_list_free(new_tags);
+
+                                if ( newtitle != impl->mLastTitle && newtitle != "" )
+                                {
+                                        impl->mLastTitle = newtitle;
+                                        LLMediaEvent event( impl, impl->mLastTitle );
+                                        impl->getEventEmitter().update( &LLMediaObserver::onMediaTitleChange, event );
+                                }
+
+                                g_free(title);
+                        }
+
                         break;
                 }
                 case GST_MESSAGE_EOS:
@@ -551,10 +564,10 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                                 impl->addCommand(LLMediaBase::COMMAND_STOP);
                         }
                         break;
+                }
                 default:
                         /* unhandled message */
                         break;
-                }
         }
         /* we want to be notified again the next time there is a message
          * on the bus, so return true (false means we want to stop watching
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index baefdaf..8d2e756 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -40,12 +40,13 @@
 ///#if LL_GSTREAMER_ENABLED
 
 extern "C" {
-#include <stdio.h>
 #include <gst/gst.h>
+}
 
+#include <stdio.h>
 #include "apr_pools.h"
 #include "apr_dso.h"
-}
+
 
 #include "llmediaimplgstreamervidplug.h"
 #include "llgstplaythread.h"
@@ -127,6 +128,7 @@ class LLMediaImplGStreamer:
                 GMainLoop *mPump; // event pump for this media
                 GstElement *mPlaybin;
                 GstSLVideo *mVideoSink;
+                std::string mLastTitle;
                 GstState mState;
                 GstState getState() const { return mState; }
 
diff --git a/linden/indra/llmedia/llmediaobserver.h b/linden/indra/llmedia/llmediaobserver.h
index 5f794bb..ab8d755 100644
--- a/linden/indra/llmedia/llmediaobserver.h
+++ b/linden/indra/llmedia/llmediaobserver.h
@@ -103,6 +103,7 @@ class LLMediaObserver
                 virtual void onMediaSizeChange( const EventType& event_in ) { }
                 virtual void onMediaContentsChange( const EventType& event_in ) { }
                 virtual void onMediaStatusTextChange( const EventType& event_in ) { }
+                virtual void onMediaTitleChange( const EventType &event_in ) { }
                 virtual void onNavigateBegin( const EventType& event_in ) { }
                 virtual void onNavigateComplete( const EventType& event_in ) { }
                 virtual void onUpdateProgress( const EventType& event_in ) { }
diff --git a/linden/indra/llui/llclipboard.cpp b/linden/indra/llui/llclipboard.cpp
index 8a7a214..2cb8197 100644
--- a/linden/indra/llui/llclipboard.cpp
+++ b/linden/indra/llui/llclipboard.cpp
@@ -93,3 +93,44 @@ BOOL LLClipboard::canPasteString() const
 {
         return LLView::getWindow()->isClipboardTextAvailable();
 }
+
+
+void LLClipboard::copyFromPrimarySubstring(const LLWString &src, S32 pos, S32 len, const LLUUID& source_id )
+{
+        mSourceID = source_id;
+        mString = src.substr(pos, len);
+        LLView::getWindow()->copyTextToPrimary( mString );
+}
+
+
+const LLWString& LLClipboard::getPastePrimaryWString( LLUUID* source_id )
+{
+        if( mSourceID.notNull() )
+        {
+                LLWString temp_string;
+                LLView::getWindow()->pasteTextFromPrimary(temp_string);
+
+                if( temp_string != mString )
+                {
+                        mSourceID.setNull();
+                        mString = temp_string;
+                }
+        }
+        else
+        {
+                LLView::getWindow()->pasteTextFromPrimary(mString);
+        }
+
+        if( source_id )
+        {
+                *source_id = mSourceID;
+        }
+
+        return mString;
+}
+
+
+BOOL LLClipboard::canPastePrimaryString() const
+{
+        return LLView::getWindow()->isPrimaryTextAvailable();
+}
diff --git a/linden/indra/llui/llclipboard.h b/linden/indra/llui/llclipboard.h
index 37ed1ff..034a7a6 100644
--- a/linden/indra/llui/llclipboard.h
+++ b/linden/indra/llui/llclipboard.h
@@ -44,10 +44,19 @@ public:
         LLClipboard();
         ~LLClipboard();
 
+        /* We support two flavors of clipboard.  The default is the explicitly
+           copy-and-pasted clipboard.  The second is the so-called 'primary' clipboard
+           which is implicitly copied upon selection on platforms which expect this
+           (i.e. X11/Linux). */
+
         void            copyFromSubstring(const LLWString &copy_from, S32 pos, S32 len, const LLUUID& source_id = LLUUID::null );
         BOOL            canPasteString() const;
         const LLWString&        getPasteWString(LLUUID* source_id = NULL);
-        
+
+        void            copyFromPrimarySubstring(const LLWString &copy_from, S32 pos, S32 len, const LLUUID& source_id = LLUUID::null );
+        BOOL            canPastePrimaryString() const;
+        const LLWString&        getPastePrimaryWString(LLUUID* source_id = NULL);       
+
 private:
         LLUUID          mSourceID;
         LLWString       mString;
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 94af186..defe200 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -1193,6 +1193,12 @@ BOOL LLFloater::handleRightMouseDown(S32 x, S32 y, MASK mask)
         return was_minimized || LLPanel::handleRightMouseDown( x, y, mask );
 }
 
+BOOL LLFloater::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        bringToFront( x, y );
+        return LLPanel::handleMiddleMouseDown( x, y, mask );
+}
+
 
 // virtual
 BOOL LLFloater::handleDoubleClick(S32 x, S32 y, MASK mask)
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index a8f7c21..0e3d148 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -195,7 +195,7 @@ public:
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL    handleRightMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask);
-
+        virtual BOOL    handleMiddleMouseDown(S32 x, S32 y, MASK mask);
         virtual void    draw();
 
         virtual void    onOpen() {}
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index 9ecd744..93da44c 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -381,9 +381,9 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
                                         seg_start = cur - base;
                                         cur += cur_delimiter->getLength();
                                         
-                                        if( cur_delimiter->getType() == LLKeywordToken::TWO_SIDED_DELIMITER || LLKeywordToken::TWO_SIDED_DELIMITER_ESC)
+                                        LLKeywordToken::TOKEN_TYPE type = cur_delimiter->getType();
+                                        if (type == LLKeywordToken::TWO_SIDED_DELIMITER || type == LLKeywordToken::TWO_SIDED_DELIMITER_ESC)
                                         {
-                                                llassert( cur_delimiter->getDelimiter() != NULL );
                                                 while( *cur && !cur_delimiter->isTail(cur))
                                                 {
                                                         // Check for an escape sequence.
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index f35fa58..fc33dcf 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -494,6 +494,9 @@ BOOL LLLineEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
         // delay cursor flashing
         mKeystrokeTimer.reset();
 
+        // take selection to 'primary' clipboard
+        updatePrimary();
+
         return TRUE;
 }
 
@@ -576,6 +579,17 @@ BOOL LLLineEditor::handleMouseDown(S32 x, S32 y, MASK mask)
         return TRUE;
 }
 
+BOOL LLLineEditor::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        // llinfos << "MiddleMouseDown" << llendl;
+        setFocus( TRUE );
+        if( canPastePrimary() )
+        {
+                setCursorAtLocalPos(x);
+                pastePrimary();
+        }
+        return TRUE;
+}
 
 BOOL LLLineEditor::handleHover(S32 x, S32 y, MASK mask)
 {
@@ -670,6 +684,9 @@ BOOL LLLineEditor::handleMouseUp(S32 x, S32 y, MASK mask)
         {
                 // delay cursor flashing
                 mKeystrokeTimer.reset();
+
+                // take selection to 'primary' clipboard
+                updatePrimary();
         }
 
         return handled;
@@ -873,7 +890,12 @@ BOOL LLLineEditor::handleSelectionKey(KEY key, MASK mask)
                 }
         }
 
-
+        if(handled)
+        {
+                // take selection to 'primary' clipboard
+                updatePrimary();
+        }
+ 
         return handled;
 }
 
@@ -946,20 +968,42 @@ BOOL LLLineEditor::canPaste() const
         return !mReadOnly && gClipboard.canPasteString(); 
 }
 
-
-// paste from clipboard
 void LLLineEditor::paste()
 {
-        if (canPaste())
+        bool is_primary = false;
+        pasteHelper(is_primary);
+}
+
+void LLLineEditor::pastePrimary()
+{
+        bool is_primary = true;
+        pasteHelper(is_primary);
+}
+
+// paste from primary (is_primary==true) or clipboard (is_primary==false)
+void LLLineEditor::pasteHelper(bool is_primary)
+{
+        bool can_paste_it;
+        if (is_primary)
+                can_paste_it = canPastePrimary();
+        else
+                can_paste_it = canPaste();
+
+        if (can_paste_it)
         {
-                LLWString paste = gClipboard.getPasteWString();
+                LLWString paste;
+                if (is_primary)
+                        paste = gClipboard.getPastePrimaryWString();
+                else 
+                        paste = gClipboard.getPasteWString();
+
                 if (!paste.empty())
                 {
                         // Prepare for possible rollback
                         LLLineEditorRollback rollback(this);
                         
                         // Delete any selected characters
-                        if (hasSelection())
+                        if ((!is_primary) && hasSelection())
                         {
                                 deleteSelection();
                         }
@@ -995,7 +1039,7 @@ void LLLineEditor::paste()
                                 clean_string = clean_string.substr(0, wchars_that_fit);
                                 reportBadKeystroke();
                         }
-
+ 
                         mText.insert(getCursor(), clean_string);
                         setCursor( getCursor() + (S32)clean_string.length() );
                         deselect();
@@ -1016,7 +1060,30 @@ void LLLineEditor::paste()
         }
 }
 
-        
+// copy selection to primary
+void LLLineEditor::copyPrimary()
+{
+        if( canCopy() )
+        {
+                S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
+                S32 length = abs( mSelectionStart - mSelectionEnd );
+                gClipboard.copyFromPrimarySubstring( mText.getWString(), left_pos, length );
+        }
+}
+
+BOOL LLLineEditor::canPastePrimary() const
+{
+        return !mReadOnly && gClipboard.canPastePrimaryString(); 
+}
+
+void LLLineEditor::updatePrimary()
+{
+        if(canCopy() )
+        {
+                copyPrimary();
+        }
+}
+
 BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask) 
 {
         BOOL handled = FALSE;
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index cc12aa1..a670b21 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -90,6 +90,7 @@ public:
         /*virtual*/ BOOL        handleMouseUp(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleHover(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleDoubleClick(S32 x,S32 y,MASK mask);
+        /*virtual*/ BOOL        handleMiddleMouseDown(S32 x,S32 y,MASK mask);
         /*virtual*/ BOOL        handleKeyHere(KEY key, MASK mask );
         /*virtual*/ BOOL        handleUnicodeCharHere(llwchar uni_char);
         /*virtual*/ void        onMouseCaptureLost();
@@ -97,13 +98,16 @@ public:
         // LLEditMenuHandler overrides
         virtual void    cut();
         virtual BOOL    canCut() const;
-
         virtual void    copy();
         virtual BOOL    canCopy() const;
-
         virtual void    paste();
         virtual BOOL    canPaste() const;
-        
+
+        virtual void    updatePrimary();
+        virtual void    copyPrimary();
+        virtual void    pastePrimary();
+        virtual BOOL    canPastePrimary() const;
+
         virtual void    doDelete();
         virtual BOOL    canDoDelete() const;
 
@@ -220,6 +224,9 @@ public:
         
 private:
         // private helper methods
+
+        void                    pasteHelper(bool is_primary);
+
         void                    removeChar();
         void                    addChar(const llwchar c);
         void                    setCursorAtLocalPos(S32 local_mouse_x);
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 7b6c125..460b29f 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -743,6 +743,18 @@ std::vector<LLScrollListItem*> LLScrollListCtrl::getAllSelected() const
         return ret;
 }
 
+LLDynamicArray<LLUUID> LLScrollListCtrl::getSelectedIDs()
+{
+        LLUUID selected_id;
+        LLDynamicArray<LLUUID> ids;
+        std::vector<LLScrollListItem*> selected = this->getAllSelected();
+        for(std::vector<LLScrollListItem*>::iterator itr = selected.begin(); itr != selected.end(); ++itr)
+        {
+                ids.push_back((*itr)->getUUID());
+        }
+        return ids;
+}
+
 S32 LLScrollListCtrl::getFirstSelectedIndex() const
 {
         S32 CurSelectedIndex = 0;
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 72d8894..516e4f1 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -458,6 +458,7 @@ public:
         LLScrollListItem*       getFirstSelected() const;
         virtual S32                     getFirstSelectedIndex() const;
         std::vector<LLScrollListItem*> getAllSelected() const;
+        LLDynamicArray<LLUUID>  getSelectedIDs();
         LLScrollListItem*       getLastSelectedItem() const { return mLastSelected; }
 
         // iterate over all items
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index 1e973c0..2f531a2 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -469,6 +469,11 @@ BOOL LLSpinCtrl::handleKeyHere(KEY key, MASK mask)
                         LLSpinCtrl::onDownBtn(this);
                         return TRUE;
                 }
+                if(key == KEY_RETURN)
+                {
+                        forceEditorCommit();
+                        return TRUE;
+                }
         }
         return FALSE;
 }
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index ccdf44b..32106f1 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -1205,6 +1205,18 @@ BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
 }
 
 
+BOOL LLTextEditor::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        setFocus( TRUE );
+        if( canPastePrimary() )
+        {
+                setCursorAtLocalPos( x, y, TRUE );
+                pastePrimary();
+        }
+        return TRUE;
+}
+
+
 BOOL LLTextEditor::handleHover(S32 x, S32 y, MASK mask)
 {
         BOOL handled = FALSE;
@@ -1327,6 +1339,9 @@ BOOL LLTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
                         endSelection();
 
                         updateScrollFromCursor();
+
+                        // take selection to primary clipboard
+                        updatePrimary();
                 }
                 
                 if( !hasSelection() )
@@ -1334,6 +1349,9 @@ BOOL LLTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
                         handleMouseUpOverSegment( x, y, mask );
                 }
 
+                // take selection to 'primary' clipboard
+                updatePrimary();
+
                 handled = TRUE;
         }
 
@@ -1396,8 +1414,12 @@ BOOL LLTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
                 // delay cursor flashing
                 resetKeystrokeTimer();
 
+                // take selection to 'primary' clipboard
+                updatePrimary();
+
                 handled = TRUE;
         }
+
         return handled;
 }
 
@@ -1693,6 +1715,12 @@ BOOL LLTextEditor::handleSelectionKey(const KEY key, const MASK mask)
                 }
         }
 
+        if( handled )
+        {
+                // take selection to 'primary' clipboard
+                updatePrimary();
+        }
+ 
         return handled;
 }
 
@@ -1872,22 +1900,46 @@ BOOL LLTextEditor::canPaste() const
         return !mReadOnly && gClipboard.canPasteString();
 }
 
-
 // paste from clipboard
 void LLTextEditor::paste()
 {
-        if (!canPaste())
+        bool is_primary = false;
+        pasteHelper(is_primary);
+}
+
+// paste from primary
+void LLTextEditor::pastePrimary()
+{
+        bool is_primary = true;
+        pasteHelper(is_primary);
+}
+
+// paste from primary (itsprimary==true) or clipboard (itsprimary==false)
+void LLTextEditor::pasteHelper(bool is_primary)
+{
+        bool can_paste_it;
+        if (is_primary)
+                can_paste_it = canPastePrimary();
+        else
+                can_paste_it = canPaste();
+
+        if (!can_paste_it)
         {
                 return;
         }
         LLUUID source_id;
-        LLWString paste = gClipboard.getPasteWString(&source_id);
+        LLWString paste;
+        if (is_primary)
+                paste = gClipboard.getPastePrimaryWString(&source_id);
+        else 
+                paste = gClipboard.getPasteWString(&source_id);
+
         if (paste.empty())
         {
                 return;
         }
         // Delete any selected characters (the paste replaces them)
-        if( hasSelection() )
+        if( (!is_primary) && hasSelection() )
         {
                 deleteSelection(TRUE);
         }
@@ -1921,6 +1973,32 @@ void LLTextEditor::paste()
 }
 
 
+
+// copy selection to primary
+void LLTextEditor::copyPrimary()
+{
+        if( !canCopy() )
+        {
+                return;
+        }
+        S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
+        S32 length = abs( mSelectionStart - mSelectionEnd );
+        gClipboard.copyFromPrimarySubstring(mWText, left_pos, length, mSourceID);
+}
+
+BOOL LLTextEditor::canPastePrimary() const
+{
+        return !mReadOnly && gClipboard.canPastePrimaryString();
+}
+
+void LLTextEditor::updatePrimary()
+{
+        if (canCopy())
+        {
+                copyPrimary();
+        }
+}
+
 BOOL LLTextEditor::handleControlKey(const KEY key, const MASK mask)     
 {
         BOOL handled = FALSE;
@@ -1996,6 +2074,11 @@ BOOL LLTextEditor::handleControlKey(const KEY key, const MASK mask)
                 }
         }
 
+        if (handled)
+        {
+                updatePrimary();
+        }
+
         return handled;
 }
 
@@ -3537,9 +3620,9 @@ void LLTextEditor::appendColoredText(const std::string &new_text,
 }
 
 void LLTextEditor::appendStyledText(const std::string &new_text, 
-                                                                         bool allow_undo, 
+                                                                         bool allow_undo,
                                                                          bool prepend_newline,
-                                                                         LLStyleSP stylep)
+                                                                         const LLStyleSP stylep)
 {
         S32 part = (S32)LLTextParser::WHOLE;
         if(mParseHTML)
@@ -3576,7 +3659,7 @@ void LLTextEditor::appendStyledText(const std::string &new_text,
                         
                         html->setLinkHREF(text.substr(start,end-start));
                         appendText(text.substr(start, end-start),allow_undo, prepend_newline, html);
-                        if (end < (S32)text.length()) 
+                        if (end < (S32)text.length())
                         {
                                 text = text.substr(end,text.length() - end);
                                 end=0;
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 12195f2..a62f01d 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -84,6 +84,8 @@ public:
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks);
         virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask );
+        virtual BOOL    handleMiddleMouseDown(S32 x,S32 y,MASK mask);
+
         virtual BOOL    handleKeyHere(KEY key, MASK mask );
         virtual BOOL    handleUnicodeCharHere(llwchar uni_char);
 
@@ -119,6 +121,10 @@ public:
         virtual BOOL    canCopy() const;
         virtual void    paste();
         virtual BOOL    canPaste() const;
+        virtual void    updatePrimary();
+        virtual void    copyPrimary();
+        virtual void    pastePrimary();
+        virtual BOOL    canPastePrimary() const;
         virtual void    doDelete();
         virtual BOOL    canDoDelete() const;
         virtual void    selectAll();
@@ -144,12 +150,12 @@ public:
         void                    appendText(const std::string &wtext, bool allow_undo, bool prepend_newline,
                                                            const LLStyleSP stylep = NULL);
 
-        void                    appendColoredText(const std::string &wtext, bool allow_undo, 
+        void                    appendColoredText(const std::string &wtext, bool allow_undo,
                                                                           bool prepend_newline,
                                                                           const LLColor4 &color,
                                                                           const std::string& font_name = LLStringUtil::null);
         // if styled text starts a line, you need to prepend a newline.
-        void                    appendStyledText(const std::string &new_text, bool allow_undo, 
+        void                    appendStyledText(const std::string &new_text, bool allow_undo,
                                                                          bool prepend_newline,
                                                                          LLStyleSP stylep = NULL);
         void                    appendHighlightedText(const std::string &new_text,  bool allow_undo, 
@@ -431,6 +437,8 @@ private:
         //
         // Methods
         //
+        void                    pasteHelper(bool is_primary);
+
         void                    updateSegments();
         void                    pruneSegments();
 
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 7047afc..36bc850 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -984,6 +984,30 @@ BOOL LLView::handleRightMouseUp(S32 x, S32 y, MASK mask)
         }
         return handled;
 }
+ 
+BOOL LLView::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        LLView* handled_view = childrenHandleMiddleMouseDown( x, y, mask );
+        BOOL handled = (handled_view != NULL);
+        if( !handled && blockMouseEvent(x, y) )
+        {
+                handled = TRUE;
+                handled_view = this;
+        }
+
+        return handled;
+}
+
+BOOL LLView::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
+{
+        BOOL handled = childrenHandleMiddleMouseUp( x, y, mask ) != NULL;
+        if( !handled && blockMouseEvent(x, y) )
+        {
+                handled = TRUE;
+        }
+        return handled;
+}
+
 
 LLView* LLView::childrenHandleScrollWheel(S32 x, S32 y, S32 clicks)
 {
@@ -1145,6 +1169,34 @@ LLView* LLView::childrenHandleRightMouseDown(S32 x, S32 y, MASK mask)
         return handled_view;
 }
 
+LLView* LLView::childrenHandleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        LLView* handled_view = NULL;
+
+        if (getVisible() && getEnabled() )
+        {
+                for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
+                {
+                        LLView* viewp = *child_it;
+                        S32 local_x = x - viewp->getRect().mLeft;
+                        S32 local_y = y - viewp->getRect().mBottom;
+                        if (viewp->pointInView(local_x, local_y) &&
+                                viewp->getVisible() &&
+                                viewp->getEnabled() &&
+                                viewp->handleMiddleMouseDown( local_x, local_y, mask ))
+                        {
+                                if (sDebugMouseHandling)
+                                {
+                                        sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
+                                }
+                                handled_view = viewp;
+                                break;
+                        }
+                }
+        }
+        return handled_view;
+}
+
 LLView* LLView::childrenHandleDoubleClick(S32 x, S32 y, MASK mask)
 {
         LLView* handled_view = NULL;
@@ -1230,6 +1282,32 @@ LLView* LLView::childrenHandleRightMouseUp(S32 x, S32 y, MASK mask)
         return handled_view;
 }
 
+LLView* LLView::childrenHandleMiddleMouseUp(S32 x, S32 y, MASK mask)
+{
+        LLView* handled_view = NULL;
+        if( getVisible() && getEnabled() )
+        {
+                for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
+                {
+                        LLView* viewp = *child_it;
+                        S32 local_x = x - viewp->getRect().mLeft;
+                        S32 local_y = y - viewp->getRect().mBottom;
+                        if (viewp->pointInView(local_x, local_y) &&
+                                viewp->getVisible() &&
+                                viewp->getEnabled() &&
+                                viewp->handleMiddleMouseUp( local_x, local_y, mask ))
+                        {
+                                if (sDebugMouseHandling)
+                                {
+                                        sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
+                                }
+                                handled_view = viewp;
+                                break;
+                        }
+                }
+        }
+        return handled_view;
+}
 
 void LLView::draw()
 {
@@ -2555,7 +2633,7 @@ void LLView::initFromXML(LLXMLNodePtr node, LLView* parent)
                 node->getAttributeString("hover_cursor", cursor_string);
                 mHoverCursor = getCursorFromString(cursor_string);
         }
-        
+
         node->getAttributeBOOL("use_bounding_rect", mUseBoundingRect);
         node->getAttributeBOOL("mouse_opaque", mMouseOpaque);
 
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index b5a34bd..539adea 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -465,6 +465,8 @@ public:
         /*virtual*/ BOOL        handleHover(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleMouseUp(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleMouseDown(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL        handleMiddleMouseUp(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL        handleMiddleMouseDown(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleDoubleClick(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL        handleScrollWheel(S32 x, S32 y, S32 clicks);
         /*virtual*/ BOOL        handleRightMouseDown(S32 x, S32 y, MASK mask);
@@ -603,6 +605,8 @@ protected:
         LLView* childrenHandleHover(S32 x, S32 y, MASK mask);
         LLView* childrenHandleMouseUp(S32 x, S32 y, MASK mask);
         LLView* childrenHandleMouseDown(S32 x, S32 y, MASK mask);
+        LLView* childrenHandleMiddleMouseUp(S32 x, S32 y, MASK mask);
+        LLView* childrenHandleMiddleMouseDown(S32 x, S32 y, MASK mask);
         LLView* childrenHandleDoubleClick(S32 x, S32 y, MASK mask);
         LLView* childrenHandleScrollWheel(S32 x, S32 y, S32 clicks);
         LLView* childrenHandleRightMouseDown(S32 x, S32 y, MASK mask);
@@ -658,7 +662,7 @@ private:
         boost::signals::connection mControlConnection;
 
         ECursorType mHoverCursor;
-        
+
 public:
         static BOOL     sDebugRects;    // Draw debug rects behind everything.
         static BOOL sDebugKeys;
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index f695c4c..29a3771 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -535,19 +535,23 @@ std::string LLDir::getForbiddenFileChars()
         return "\\/:*?\"<>|";
 }
 
-void LLDir::setLindenUserDir(const std::string &first, const std::string &last)
+void LLDir::setLindenUserDir(const std::string &grid, const std::string &first, const std::string &last)
 {
         // if both first and last aren't set, assume we're grabbing the cached dir
         if (!first.empty() && !last.empty())
         {
                 // some platforms have case-sensitive filesystems, so be
                 // utterly consistent with our firstname/lastname case.
+                // std::string gridlower(grid);
+                // LLStringUtil::toLower(gridlower);
                 std::string firstlower(first);
                 LLStringUtil::toLower(firstlower);
                 std::string lastlower(last);
                 LLStringUtil::toLower(lastlower);
                 mLindenUserDir = getOSUserAppDir();
                 mLindenUserDir += mDirDelimiter;
+                // mLindenUserDir += gridlower;
+                // mLindenUserDir += "-";
                 mLindenUserDir += firstlower;
                 mLindenUserDir += "_";
                 mLindenUserDir += lastlower;
@@ -572,19 +576,23 @@ void LLDir::setChatLogsDir(const std::string &path)
         }
 }
 
-void LLDir::setPerAccountChatLogsDir(const std::string &first, const std::string &last)
+void LLDir::setPerAccountChatLogsDir(const std::string &grid, const std::string &first, const std::string &last)
 {
         // if both first and last aren't set, assume we're grabbing the cached dir
         if (!first.empty() && !last.empty())
         {
                 // some platforms have case-sensitive filesystems, so be
                 // utterly consistent with our firstname/lastname case.
+                // std::string gridlower(grid);
+                // LLStringUtil::toLower(gridlower);
                 std::string firstlower(first);
                 LLStringUtil::toLower(firstlower);
                 std::string lastlower(last);
                 LLStringUtil::toLower(lastlower);
                 mPerAccountChatLogsDir = getChatLogsDir();
                 mPerAccountChatLogsDir += mDirDelimiter;
+                // mPerAccountChatLogsDir += gridlower;
+                // mPerAccountChatLogsDir += "-";
                 mPerAccountChatLogsDir += firstlower;
                 mPerAccountChatLogsDir += "_";
                 mPerAccountChatLogsDir += lastlower;
diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h
index 760b651..21dcf5b 100644
--- a/linden/indra/llvfs/lldir.h
+++ b/linden/indra/llvfs/lldir.h
@@ -125,8 +125,8 @@ class LLDir
         static std::string getForbiddenFileChars();
 
         virtual void setChatLogsDir(const std::string &path);           // Set the chat logs dir to this user's dir
-        virtual void setPerAccountChatLogsDir(const std::string &first, const std::string &last);               // Set the per user chat log directory.
-        virtual void setLindenUserDir(const std::string &first, const std::string &last);               // Set the linden user dir to this user's dir
+        virtual void setPerAccountChatLogsDir(const std::string &grid, const std::string &first, const std::string &last);              // Set the per user chat log directory.
+        virtual void setLindenUserDir(const std::string &grid, const std::string &first, const std::string &last);              // Set the linden user dir to this user's dir
         virtual void setSkinFolder(const std::string &skin_folder);
         virtual bool setCacheDir(const std::string &path);
 
diff --git a/linden/indra/llwindow/CMakeLists.txt b/linden/indra/llwindow/CMakeLists.txt
index 95e315f..afce0c0 100644
--- a/linden/indra/llwindow/CMakeLists.txt
+++ b/linden/indra/llwindow/CMakeLists.txt
@@ -46,6 +46,7 @@ set(llwindows_HEADER_FILES
 
 set(viewer_SOURCE_FILES
     llwindow.cpp
+    llmousehandler.cpp
     )
 
 set(viewer_HEADER_FILES
diff --git a/linden/indra/llwindow/llmousehandler.cpp b/linden/indra/llwindow/llmousehandler.cpp
new file mode 100644
index 0000000..ae2f147
--- /dev/null
+++ b/linden/indra/llwindow/llmousehandler.cpp
@@ -0,0 +1,59 @@
+/** 
+ * @file llmousehandler.cpp
+ * @brief LLMouseHandler class implementation
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2007, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * 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://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llmousehandler.h"
+
+//virtual
+BOOL LLMouseHandler::handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down)
+{
+        BOOL handled = FALSE;
+        if (down)
+        {
+                switch (clicktype)
+                {
+                        case CLICK_LEFT: handled = handleMouseDown(x, y, mask); break;
+                        case CLICK_RIGHT: handled = handleRightMouseDown(x, y, mask); break;
+                        case CLICK_MIDDLE: handled = handleMiddleMouseDown(x, y, mask); break;
+                        case CLICK_DOUBLELEFT: handled = handleDoubleClick(x, y, mask); break;
+                }
+        }
+        else
+        {
+                switch (clicktype)
+                {
+                        case CLICK_LEFT: handled = handleMouseUp(x, y, mask); break;
+                        case CLICK_RIGHT: handled = handleRightMouseUp(x, y, mask); break;
+                        case CLICK_MIDDLE: handled = handleMiddleMouseUp(x, y, mask); break;
+                        case CLICK_DOUBLELEFT: handled = handleDoubleClick(x, y, mask); break;
+                }
+        }
+        return handled;
+}
diff --git a/linden/indra/llwindow/llmousehandler.h b/linden/indra/llwindow/llmousehandler.h
index f3a2edd..7bd0f2e 100644
--- a/linden/indra/llwindow/llmousehandler.h
+++ b/linden/indra/llwindow/llmousehandler.h
@@ -33,9 +33,10 @@
 #ifndef LL_MOUSEHANDLER_H
 #define LL_MOUSEHANDLER_H
 
-#include "llstring.h"
+#include "linden_common.h"
+#include "llrect.h"
 
-// Abstract interface.
+// Mostly-abstract interface.
 // Intended for use via multiple inheritance. 
 // A class may have as many interfaces as it likes, but never needs to inherit one more than once.
 
@@ -49,13 +50,23 @@ public:
                 SHOW_IF_NOT_BLOCKED,
                 SHOW_ALWAYS,
         } EShowToolTip;
+        typedef enum {
+                CLICK_LEFT,
+                CLICK_MIDDLE,
+                CLICK_RIGHT,
+                CLICK_DOUBLELEFT
+        } EClickType;
+        virtual BOOL    handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down);
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask) = 0;
         virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask) = 0;
-        virtual BOOL    handleHover(S32 x, S32 y, MASK mask) = 0;
-        virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks) = 0;
-        virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleMiddleMouseDown(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleMiddleMouseUp(S32 x, S32 y, MASK mask) = 0;
         virtual BOOL    handleRightMouseDown(S32 x, S32 y, MASK mask) = 0;
         virtual BOOL    handleRightMouseUp(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask) = 0;
+
+        virtual BOOL    handleHover(S32 x, S32 y, MASK mask) = 0;
+        virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks) = 0;
         virtual BOOL    handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) = 0;
         virtual EShowToolTip getShowToolTip() { return SHOW_IF_NOT_BLOCKED; };
         virtual const std::string& getName() const = 0;
diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index fb4770e..53ca68d 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -308,6 +308,22 @@ void *LLWindow::getMediaWindow()
         return getPlatformWindow();
 }
 
+//virtual
+BOOL LLWindow::isPrimaryTextAvailable()
+{
+        return FALSE; // no
+}
+//virtual
+BOOL LLWindow::pasteTextFromPrimary(LLWString &dst)
+{
+        return FALSE; // fail
+}
+// virtual
+BOOL LLWindow::copyTextToPrimary(const LLWString &src)
+{
+        return FALSE; // fail
+}
+
 // static
 std::vector<std::string> LLWindow::getDynamicFallbackFontList()
 {
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 9e01596..a649766 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -144,9 +144,15 @@ public:
         virtual void captureMouse() = 0;
         virtual void releaseMouse() = 0;
         virtual void setMouseClipping( BOOL b ) = 0;
+
         virtual BOOL isClipboardTextAvailable() = 0;
         virtual BOOL pasteTextFromClipboard(LLWString &dst) = 0;
         virtual BOOL copyTextToClipboard(const LLWString &src) = 0;
+
+        virtual BOOL isPrimaryTextAvailable();
+        virtual BOOL pasteTextFromPrimary(LLWString &dst);
+        virtual BOOL copyTextToPrimary(const LLWString &src);
+ 
         virtual void flashIcon(F32 seconds) = 0;
         virtual F32 getGamma() = 0;
         virtual BOOL setGamma(const F32 gamma) = 0; // Set the gamma
@@ -197,6 +203,7 @@ public:
         virtual void updateLanguageTextInputArea() {}
         virtual void interruptLanguageTextInput() {}
         virtual void spawnWebBrowser(const std::string& escaped_url) {};
+        virtual void ShellEx(const std::string& command) {};
 
         static std::vector<std::string> getDynamicFallbackFontList();
 
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index f9c170e..4dd0550 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -1230,7 +1230,6 @@ void LLWindowSDL::flashIcon(F32 seconds)
 #endif // LL_X11
 }
 
-
 #if LL_GTK
 BOOL LLWindowSDL::isClipboardTextAvailable()
 {
@@ -1274,22 +1273,80 @@ BOOL LLWindowSDL::copyTextToClipboard(const LLWString &text)
         return FALSE; // failure
 }
 
-#else
+BOOL LLWindowSDL::isPrimaryTextAvailable()
+{
+        if (ll_try_gtk_init())
+        {
+                GtkClipboard * const clipboard =
+                        gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+                return gtk_clipboard_wait_is_text_available(clipboard) ?
+                        TRUE : FALSE;
+        }
+        return FALSE; // failure
+}
+
+BOOL LLWindowSDL::pasteTextFromPrimary(LLWString &text)
+{
+        if (ll_try_gtk_init())
+        {
+                GtkClipboard * const clipboard =
+                        gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+                gchar * const data = gtk_clipboard_wait_for_text(clipboard);
+                if (data)
+                {
+                        text = LLWString(utf8str_to_wstring(data));
+                        g_free(data);
+                        return TRUE;
+                }
+        }
+        return FALSE; // failure
+}
 
+BOOL LLWindowSDL::copyTextToPrimary(const LLWString &text)
+{
+        if (ll_try_gtk_init())
+        {
+                const std::string utf8 = wstring_to_utf8str(text);
+                GtkClipboard * const clipboard =
+                        gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+                gtk_clipboard_set_text(clipboard, utf8.c_str(), utf8.length());
+                return TRUE;
+        }
+        return FALSE; // failure
+}
+
+#else
+ 
 BOOL LLWindowSDL::isClipboardTextAvailable()
 {
         return FALSE; // unsupported
 }
-
+ 
 BOOL LLWindowSDL::pasteTextFromClipboard(LLWString &dst)
 {
         return FALSE; // unsupported
 }
+ 
 
 BOOL LLWindowSDL::copyTextToClipboard(const LLWString &s)
 {
         return FALSE;  // unsupported
 }
+
+BOOL LLWindowSDL::isPrimaryTextAvailable()
+{
+        return FALSE; // unsupported
+}
+
+BOOL LLWindowSDL::pasteTextFromPrimary(LLWString &dst)
+{
+        return FALSE; // unsupported
+}
+
+BOOL LLWindowSDL::copyTextToPrimary(const LLWString &s)
+{
+        return FALSE;  // unsupported
+}
 #endif // LL_GTK
 
 LLWindow::LLWindowResolution* LLWindowSDL::getSupportedResolutions(S32 &num_resolutions)
@@ -2092,8 +2149,7 @@ S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 typ
                         buttons = GTK_BUTTONS_YES_NO;
                         break;
                 }
-                win = gtk_message_dialog_new(NULL, flags, messagetype, buttons, "%s",
-                                                                         text.c_str());
+                win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, "%s", text.c_str());
 
 # if LL_X11
                 // Make GTK tell the window manager to associate this
diff --git a/linden/indra/llwindow/llwindowsdl.h b/linden/indra/llwindow/llwindowsdl.h
index cebb151..632d8fc 100644
--- a/linden/indra/llwindow/llwindowsdl.h
+++ b/linden/indra/llwindow/llwindowsdl.h
@@ -80,9 +80,15 @@ public:
         /*virtual*/ void captureMouse();
         /*virtual*/ void releaseMouse();
         /*virtual*/ void setMouseClipping( BOOL b );
+
         /*virtual*/ BOOL isClipboardTextAvailable();
         /*virtual*/ BOOL pasteTextFromClipboard(LLWString &dst);
         /*virtual*/ BOOL copyTextToClipboard(const LLWString & src);
+
+        /*virtual*/ BOOL isPrimaryTextAvailable();
+        /*virtual*/ BOOL pasteTextFromPrimary(LLWString &dst);
+        /*virtual*/ BOOL copyTextToPrimary(const LLWString & src);
+ 
         /*virtual*/ void flashIcon(F32 seconds);
         /*virtual*/ F32 getGamma();
         /*virtual*/ BOOL setGamma(const F32 gamma); // Set the gamma
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 6280868..b2826c8 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -2918,6 +2918,18 @@ S32 OSMessageBoxWin32(const std::string& text, const std::string& caption, U32 t
         return retval;
 }
 
+void LLWindowWin32::ShellEx(const std::string& command )
+{
+        LLWString url_wstring = utf8str_to_wstring( command );
+        llutf16string url_utf16 = wstring_to_utf16str( url_wstring );
+
+        SHELLEXECUTEINFO sei = { sizeof( sei ) };
+        sei.fMask = SEE_MASK_FLAG_DDEWAIT;
+        sei.nShow = SW_SHOWNORMAL;
+        sei.lpVerb = L"open";
+        sei.lpFile = url_utf16.c_str();
+        ShellExecuteEx( &sei );
+}
 
 void LLWindowWin32::spawnWebBrowser(const std::string& escaped_url )
 {
diff --git a/linden/indra/llwindow/llwindowwin32.h b/linden/indra/llwindow/llwindowwin32.h
index 237f834..d3ae325 100644
--- a/linden/indra/llwindow/llwindowwin32.h
+++ b/linden/indra/llwindow/llwindowwin32.h
@@ -111,6 +111,7 @@ public:
         /*virtual*/ void updateLanguageTextInputArea();
         /*virtual*/ void interruptLanguageTextInput();
         /*virtual*/ void spawnWebBrowser(const std::string& escaped_url);
+        /*virtual*/ void ShellEx(const std::string& command);
 
         static std::vector<std::string> getDynamicFallbackFontList();
 
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 954ce7d..0e2ddf2 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -64,6 +64,11 @@ include_directories(
     )
 
 set(viewer_SOURCE_FILES
+    floaterlogin.cpp
+    hippoGridManager.cpp
+    hippoLimits.cpp
+    hippoRestRequest.cpp
+    jcfloater_animation_list.cpp
     llagent.cpp
     llagentaccess.cpp
     llagentdata.cpp
@@ -125,6 +130,7 @@ set(viewer_SOURCE_FILES
     llfloaterabout.cpp
     llfloateractivespeakers.cpp
     llfloateranimpreview.cpp
+    llfloaterassetbrowser.cpp
     llfloaterauction.cpp
     llfloateravatarinfo.cpp
     llfloateravatarpicker.cpp
@@ -433,6 +439,7 @@ set(viewer_SOURCE_FILES
     llwearablelist.cpp
     llweb.cpp
     llwebbrowserctrl.cpp
+    llwindlightremotectrl.cpp
     llwind.cpp
     llwlanimator.cpp
     llwldaycycle.cpp
@@ -444,6 +451,12 @@ set(viewer_SOURCE_FILES
     llxmlrpctransaction.cpp
     noise.cpp
     pipeline.cpp
+    primbackup.cpp
+    rlvhandler.cpp
+    rlvhelper.cpp
+    rlvmultistringsearch.cpp
+    rlvextensions.cpp
+    rlvfloaterbehaviour.cpp
     )
 
 set(VIEWER_BINARY_NAME "imprudence-bin" CACHE STRING
@@ -466,7 +479,11 @@ endif (LINUX)
 set(viewer_HEADER_FILES
     CMakeLists.txt
     ViewerInstall.cmake
-
+    floaterlogin.h
+    hippoGridManager.h
+    hippoLimits.h
+    hippoRestRequest.h
+    jcfloater_animation_list.h
     llagent.h
     llagentaccess.h
     llagentdata.h
@@ -530,6 +547,7 @@ set(viewer_HEADER_FILES
     llfloaterabout.h
     llfloateractivespeakers.h
     llfloateranimpreview.h
+    llfloaterassetbrowser.h
     llfloaterauction.h
     llfloateravatarinfo.h
     llfloateravatarpicker.h
@@ -843,6 +861,7 @@ set(viewer_HEADER_FILES
     llwebbrowserctrl.h
     llwind.h
     llwindebug.h
+    llwindlightremotectrl.h
     llwlanimator.h
     llwldaycycle.h
     llwlparammanager.h
@@ -854,9 +873,17 @@ set(viewer_HEADER_FILES
     macmain.h
     noise.h
     pipeline.h
+    primbackup.h
     randgauss.h
     VertexCache.h
     VorbisFramework.h
+    rlvdefines.h
+    rlvevent.h
+    rlvhandler.h
+    rlvhelper.h
+    rlvmultistringsearch.h
+    rlvextensions.h
+    rlvfloaterbehaviour.h
     )
 
 source_group("CMake Rules" FILES ViewerInstall.cmake)
@@ -1042,7 +1069,9 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/floater_about_land.xml
     skins/default/xui/en-us/floater_about.xml
     skins/default/xui/en-us/floater_active_speakers.xml
+    skins/default/xui/en-us/floater_animation_list.xml
     skins/default/xui/en-us/floater_animation_preview.xml
+    skins/default/xui/en-us/floater_asset_browser.xml
     skins/default/xui/en-us/floater_auction.xml
     skins/default/xui/en-us/floater_audio_volume.xml
     skins/default/xui/en-us/floater_avatar_picker.xml
@@ -1224,6 +1253,9 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/panel_voice_options.xml
     skins/default/xui/en-us/panel_voice_remote_expanded.xml
     skins/default/xui/en-us/panel_voice_remote.xml
+    skins/default/xui/en-us/panel_windlight_controls.xml
+    skins/default/xui/en-us/panel_windlight_remote.xml
+    skins/default/xui/en-us/panel_windlight_remote_expanded.xml
     skins/default/xui/en-us/role_actions.xml
     skins/default/xui/en-us/strings.xml
     skins/default/xui/en-us/teleport_strings.xml
@@ -1415,6 +1447,7 @@ if (WINDOWS)
 endif (WINDOWS)
 
 target_link_libraries(${VIEWER_BINARY_NAME}
+    ${NDOF_LIBRARY}
     ${LLAUDIO_LIBRARIES}
     ${LLCHARACTER_LIBRARIES}
     ${LLIMAGE_LIBRARIES}
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 50e6503..14a0102 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Imprudence";
-CFBundleShortVersionString = "Imprudence version 1.1.0";
-CFBundleGetInfoString = "Imprudence version 1.1.0";
+CFBundleShortVersionString = "Imprudence version 1.2.0 beta 2";
+CFBundleGetInfoString = "Imprudence version 1.2.0 beta 2";
diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist
index 7c79a11..e44dcbe 100644
--- a/linden/indra/newview/Info-Imprudence.plist
+++ b/linden/indra/newview/Info-Imprudence.plist
@@ -32,7 +32,7 @@
                 </dict>
         </array>
         <key>CFBundleVersion</key>
-        <string>1.1.0</string>
+        <string>1.2.0 beta 2</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
new file mode 100644
index 0000000..13293cf
--- /dev/null
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -0,0 +1,37 @@
+<llsd>
+  <array>
+
+    <!--
+        This file contains fallback settings only.
+        The actual list of grids is loaded from a web server.
+    -->
+
+    <map>
+      <key>default_grids_version</key><string>0</string>
+    </map>
+
+    <!-- Second Life -->
+    <map>
+      <key>gridnick</key><string>secondlife</string>
+      <key>gridname</key><string>Second Life</string>
+      <key>platform</key><string>SecondLife</string>
+      <key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
+      <key>loginpage</key><string>http://secondlife.com/app/login/</string>
+      <key>helperuri</key><string>https://secondlife.com/helpers/</string>
+      <key>website</key><string>http://secondlife.com/</string>
+      <key>support</key><string>http://secondlife.com/support/</string>
+      <key>register</key><string>http://secondlife.com/registration/</string>
+      <key>password</key><string>http://secondlife.com/account/request.php</string>
+    </map>
+
+    <!-- Local Host -->
+    <map>
+      <key>gridnick</key><string>localhost</string>
+      <key>gridname</key><string>Local Host</string>
+      <key>platform</key><string>OpenSim</string>
+      <key>loginuri</key><string>http://127.0.0.1:9000/</string>
+      <key>helperuri</key><string>http://127.0.0.1:9000/</string>
+    </map>
+
+  </array>
+</llsd>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 7e18cea..18c80eb 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1,7 +1,150 @@
 <?xml version="1.0" ?>
 <llsd>
 <map>
-    <key>AFKTimeout</key>
+  <key>RestrainedLife</key>
+  <map>
+    <key>Comment</key>
+    <string>Toggles the RestrainedLife features (BDSM lockable toys support). Needs a restart of the viewer.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RestrainedLifeDebug</key>
+  <map>
+    <key>Comment</key>
+    <string>Toggles the RestrainedLife debug mode (displays the commands when in debug mode).</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RestrainedLifeNoSetEnv</key>
+  <map>
+    <key>Comment</key>
+    <string>When TRUE, forbids to set the environment (time of day and Windlight settings) via RestrainedLife. Needs a restart of the viewer.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RestrainedLifeForbidGiveToRLV</key>
+  <map>
+    <key>Comment</key>
+    <string>When FALSE, allows to give sub-folders to the #RLV RestrainedLife folder.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>RLVaEnableLegacyNaming</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables legacy naming convention for folders</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>RLVaEnableWear</key>
+  <map>
+    <key>Comment</key>
+    <string>When TRUE, enables the "Wear" option on the inventory item context menu for attachments.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>RLVaHideLockedLayers</key>
+  <map>
+    <key>Comment</key>
+    <string>When TRUE, hides worn but "remove outfit" restricted clothing layers from @getoufit</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RLVaHideLockedAttachments</key>
+  <map>
+    <key>Comment</key>
+    <string>When TRUE, hides worn but "no detach" restricted attachments from @getattach</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RLVaShowNameTags</key>
+  <map>
+    <key>Comment</key>
+    <string>Display of names above avatars is subject to the general "Show Names" setting when @shownames=n restricted</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>WarnFirstRLVDetach</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables FirstRLVDetach warning dialog</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>WarnFirstRLVEnableWear</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables RLVEnableWear warning dialog</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>WarnFirstRLVFartouch</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables FirstRLVFartouch warning dialog</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>WarnFirstRLVGiveToRLV</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables FirstRLVGiveToRLV warning dialog</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>AFKTimeout</key>
     <map>
       <key>Comment</key>
       <string>Time before automatically setting AFK (away from keyboard) mode (seconds)</string>
@@ -664,6 +807,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>BlockClickSit</key>
+    <map>
+      <key>Comment</key>
+      <string>Block click sit</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>BrowserHome</key>
     <map>
       <key>Comment</key>
@@ -1325,6 +1479,17 @@
       <key>Value</key>
       <real>0.5</real>
     </map>
+    <key>ChatChannelSelect</key>
+    <map>
+      <key>Comment</key>
+      <string>Toggle custom channel controls in the chat bar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ChatFontSize</key>
     <map>
       <key>Comment</key>
@@ -3059,6 +3224,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>DoubleClickTeleport</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable double-click teleport</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>DragAndDropToolTipDelay</key>
     <map>
       <key>Comment</key>
@@ -3185,6 +3361,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>EnableWindlightRemote</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable windlight quick access remote in toolbar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>EnergyFromTop</key>
     <map>
       <key>Comment</key>
@@ -3469,6 +3656,22 @@
         <integer>0</integer>
       </array>
     </map>
+    <key>FloaterAnimationListRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for Animation List</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>275</integer>
+        <integer>1000</integer>
+        <integer>0</integer>
+      </array>
+    </map>
     <key>FloaterAudioVolumeRect</key>
     <map>
       <key>Comment</key>
@@ -3920,7 +4123,6 @@
         <integer>0</integer>
       </array>
     </map>
-  
   <key>FloaterObjectIMInfo</key>
   <map>
     <key>Comment</key>
@@ -3985,6 +4187,22 @@
         <integer>200</integer>
       </array>
     </map>
+    <key>FloaterPrimImport</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for import/export</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+         <integer>0</integer>
+         <integer>25</integer>
+         <integer>400</integer>
+         <integer>0</integer>
+      </array>
+    </map>
     <key>FloaterRegionInfo</key>
     <map>
       <key>Comment</key>
@@ -4895,6 +5113,17 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
+    <key>InventorySearchType</key>
+    <map>
+      <key>Comment</key>
+      <string>Controls what type of inventory search we perform.</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>InventorySortOrder</key>
     <map>
       <key>Comment</key>
@@ -5451,6 +5680,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LoggedIntoOpenSim</key>
+    <map>
+      <key>Comment</key>
+      <string>Check whether or not we're in an OpenSimulator (default 0)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>LoginAsGod</key>
     <map>
       <key>Comment</key>
@@ -5528,6 +5768,17 @@
       <key>Value</key>
       <real>128.0</real>
     </map>
+    <key>MapShowAgentCount</key>
+    <map>
+      <key>Comment</key>
+      <string>Show number of agents next to region names on world map</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>MapShowEvents</key>
     <map>
       <key>Comment</key>
@@ -5748,6 +5999,28 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>MiniMapNotifyChatRange</key>
+    <map>
+      <key>Comment</key>
+      <string>Notify when avatars enter chat range</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>MiniMapNotifySimRange</key>
+    <map>
+      <key>Comment</key>
+      <string>Notify when avatars enters the current sim</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>MiniMapPrimMaxRadius</key>
     <map>
       <key>Comment</key>
@@ -5784,7 +6057,7 @@
     <key>MiniMapScale</key>
     <map>
       <key>Comment</key>
-      <string>Miniature world map zoom levle (pixels per region)</string>
+      <string>Miniature world map zoom level (pixels per region)</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -5976,7 +6249,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <integer>20</integer>
+      <integer>96</integer>
     </map>
     <key>NextOwnerCopy</key>
     <map>
@@ -6186,6 +6459,22 @@
          <real>1</real>
       </array>
     </map>
+    <key>ObjectIMColor</key>
+    <map>
+      <key>Comment</key>
+      <string>Color of IMs from objects</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Color4</string>
+      <key>Value</key>
+      <array>
+        <real>0.699999988079</real>
+        <real>0.899999976158</real>
+        <real>0.699999988079</real>
+        <real>1</real>
+      </array>
+    </map>
     <key>OpenDebugStatAdvanced</key>
     <map>
       <key>Comment</key>
@@ -6356,6 +6645,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ParticleChat</key>
+                <map>
+                        <key>Comment</key>
+                        <string>Chat target of effect beam to channel 9000</string>
+                        <key>Persist</key>
+                        <integer>1</integer>
+                        <key>Type</key>
+                        <string>Boolean</string>
+                        <key>Value</key>
+                        <integer>1</integer>
+    </map>
     <key>PerAccountSettingsFile</key>
     <map>
       <key>Comment</key>
@@ -6513,7 +6813,7 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-          <integer>13</integer>
+      <integer>13</integer>
     </map>
     <key>PreviewAnimRect</key>
     <map>
@@ -8811,6 +9111,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowStreamTitle</key>
+    <map>
+      <key>Comment</key>
+      <string>Show the title of the song playing on the parcel's stream</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>ShowTangentBasis</key>
     <map>
       <key>Comment</key>
@@ -8877,6 +9188,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowWindlightSettingsPopup</key>
+    <map>
+      <key>Comment</key>
+      <string>Show environment settings popup</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>ShowWorldMap</key>
     <map>
       <key>Comment</key>
@@ -9126,6 +9448,28 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SpamCount</key>
+    <map>
+      <key>Comment</key>
+      <string>Number of items spammed per time set in SpamTime. RECOMMENDED IS 4.000</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>4.0</real>
+    </map>
+    <key>SpamTime</key>
+    <map>
+      <key>Comment</key>
+      <string>Time of Evalulating spam. RECOMMENDED NUMBER IS 1.000</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>1.0</real>
+    </map>
     <key>SpeakingColor</key>
     <map>
       <key>Comment</key>
@@ -9381,7 +9725,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>500.0</real>
+      <real>1000.0</real>
     </map>
     <key>ToolHelpRect</key>
     <map>
@@ -11219,6 +11563,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>VerticalIMTabs</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable vertical layout for IM tabs</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>VivoxAutoPostCrashDumps</key>
     <map>
       <key>Comment</key>
@@ -11626,6 +11981,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>WarnFirstMiniMap</key>
+    <map>
+      <key>Comment</key>
+      <string>Enables FirstMiniMap warning dialog</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>WarnFirstOverrideKeys</key>
     <map>
       <key>Comment</key>
@@ -12016,5 +12382,38 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+  <key>DefaultGrid</key>
+  <map>
+    <key>Comment</key>
+    <string>Nickname of the default grid</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>secondlife</string>
+  </map>
+  <key>KeepAppearance</key>
+  <map>
+    <key>Comment</key>
+    <string>Keep appearance across grid teleport</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <string>0</string>
+  </map>
+  <key>CheckForGridUpdates</key>
+  <map>
+    <key>Comment</key>
+    <string>Check for grid info updates on the web server</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   </map>
 </llsd>
diff --git a/linden/indra/newview/app_settings/settings_per_account.xml b/linden/indra/newview/app_settings/settings_per_account.xml
index 90c7b11..59caac4 100644
--- a/linden/indra/newview/app_settings/settings_per_account.xml
+++ b/linden/indra/newview/app_settings/settings_per_account.xml
@@ -1,6 +1,17 @@
 <llsd>
     <map>
-    <key>BusyModeResponse</key>
+      <key>RLVaLoginLastLocation</key>
+      <map>
+        <key>Comment</key>
+        <string>Determines whether the next login will be forced to the last logoff location (set by the viewer)</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>1</integer>
+      </map>
+      <key>BusyModeResponse</key>
         <map>
         <key>Comment</key>
             <string>Auto response to instant messages while in busy mode.</string>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default1.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default1.xml
new file mode 100644
index 0000000..a9d0f0e
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default1.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0384939114611456</real>
+            <real>0.95795135955843591</real>
+            <real>0.95795135955843591</real>
+            <real>0.60696905358246056</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.20658362946772124</real>
+            <real>0.43003502308076946</real>
+            <real>0.77534221609780829</real>
+            <real>0.61779229342937469</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.34674560611608651</real>
+            <real>0.38732792231055679</real>
+            <real>0.49042100459337234</real>
+            <real>0.58080440759658813</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.33948845342081757</real>
+            <real>0.33948845342081757</real>
+            <real>0.33948845342081757</real>
+            <real>0.6362861692905426</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.95397572096092276</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.1250000037252903</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998722208165</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.314831098603321</real>
+            <real>10.011000171161356</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0002873900482277883</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.87670719623565674</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0000000298023224</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.0000001490116119</real>
+            <real>0.0010000000917914607</real>
+            <real>-0.48000001257440683</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.70000002224998603</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.1784939272396473</real>
+            <real>0.1991560042470284</real>
+            <real>0.1991560042470284</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.49086946249008179</real>
+            <real>-0.87123316526412964</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1205.163865879178</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.6285052299499512</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.5413080077610317</real>
+            <real>1.5705089192829433</real>
+            <real>1.6435112576923672</real>
+            <real>0.56847512722015381</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default2.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default2.xml
new file mode 100644
index 0000000..5367387
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default2.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0499999505996698</real>
+            <real>1.0499999505996698</real>
+            <real>1.0499999505996698</real>
+            <real>0.34999999382495872</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24475815546304436</real>
+            <real>0.44872327986443139</real>
+            <real>0.759999978199005</real>
+            <real>0.38000001338005091</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.49548382238803412</real>
+            <real>0.49548381855426504</real>
+            <real>0.64000000093460097</real>
+            <real>0.32000000046730048</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.40999999671936077</real>
+            <real>0.40999999671936077</real>
+            <real>0.40999999671936077</real>
+            <real>0.40999999671936077</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.99999999999999623</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999999237537178</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.200000040817258</real>
+            <real>10.010999893335338</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998592350524</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.80000001235008633</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000503715134</real>
+            <real>-0.47999998292446122</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998764991744</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.18999999454975031</real>
+            <real>0.19915600071018602</real>
+            <real>0.19915600071018602</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.91269153356552124</real>
+            <real>-0.40864923596382141</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1604.9999921321869</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.9917699098587036</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.73421055009741187</real>
+            <real>0.78157896155557771</real>
+            <real>0.89999997529983111</real>
+            <real>0.29999998147487428</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default3.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default3.xml
new file mode 100644
index 0000000..5185175
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20default3.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0499999460917593</real>
+            <real>1.0499999460917593</real>
+            <real>1.0499999460917593</real>
+            <real>0.34999999512411506</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.2447581519847149</real>
+            <real>0.44872328351986113</real>
+            <real>0.75999999517881633</real>
+            <real>0.38000003464613324</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.49548381839263711</real>
+            <real>0.49548381254157786</real>
+            <real>0.63999999116870609</real>
+            <real>0.31999999558435305</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.40999999615399413</real>
+            <real>0.40999999615399413</real>
+            <real>0.40999999615399413</real>
+            <real>0.40999999615399413</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.99999999999999423</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998778293413</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.199999843971682</real>
+            <real>10.010999677075688</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998844229546</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.80000000975177565</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000429292444</real>
+            <real>-0.47999999271352323</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999999024823012</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.18999999879470264</real>
+            <real>0.19915600203784933</real>
+            <real>0.19915600203784933</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.80060893297195435</real>
+            <real>-0.59918725490570068</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1604.9999940395355</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.2132818698883057</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.73421055652810585</real>
+            <real>0.78157895060378157</real>
+            <real>0.89999998049645447</real>
+            <real>0.29999998164705199</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20neutral.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20neutral.xml
new file mode 100644
index 0000000..e0cdfb1
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20neutral.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.89999997615814209</real>
+            <real>0.89999997615814209</real>
+            <real>0.89999997615814209</real>
+            <real>0.29999998211860657</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.91235297918319702</real>
+            <real>0.93999999761581421</real>
+            <real>0.88470596075057983</real>
+            <real>0.4699999988079071</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.68000000715255737</real>
+            <real>0.93999999761581421</real>
+            <real>1.4399999380111694</real>
+            <real>1.4399999380111694</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.30162510275840759</real>
+            <real>0.30162510275840759</real>
+            <real>0.30162510275840759</real>
+            <real>0.75779753923416138</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.92926150560379028</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.376492500305176</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00013000000035390258</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5499999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>15.799999237060547</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.96999996900558472</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.49818512797355652</real>
+            <real>0.86707067489624023</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>295</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.52150440216064453</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.26999998092651367</real>
+            <real>0.26999998092651367</real>
+            <real>0.51999998092651367</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city%20weirdlights.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city%20weirdlights.xml
new file mode 100644
index 0000000..c2daa99
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city%20weirdlights.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.71999996900558472</real>
+            <real>0.71999996900558472</real>
+            <real>0.71999996900558472</real>
+            <real>0.23999999463558197</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0.43999999761581421</real>
+            <real>0.2199999988079071</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.74000000953674316</real>
+            <real>0.93999999761581421</real>
+            <real>0.20999999344348907</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.52999997138977051</real>
+            <real>0.0099999997764825821</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>18</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.34000000357627869</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00018000000272877514</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>6.7000002861022949</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.5185837745666504</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>17.399999618530273</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.34999999403953552</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.17000000178813934</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.36812454462051392</real>
+            <real>1.7484555314695172e-007</real>
+            <real>-0.92977648973464966</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>1.0399999618530273</real>
+    <key>sun_angle</key>
+        <real>6.2831854820251465</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city.xml
new file mode 100644
index 0000000..0728f66
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20city.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.71999996900558472</real>
+            <real>0.71999996900558472</real>
+            <real>0.71999996900558472</real>
+            <real>0.23999999463558197</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0.43999999761581421</real>
+            <real>0.2199999988079071</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.74000000953674316</real>
+            <real>0.93999999761581421</real>
+            <real>0.20999999344348907</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.52999997138977051</real>
+            <real>0.0099999997764825821</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>18</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.34000000357627869</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00018000000272877514</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>6.7000002861022949</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.5185837745666504</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>17.399999618530273</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.34999999403953552</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.17000000178813934</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.36776852607727051</real>
+            <real>0.043968122452497482</real>
+            <real>-0.92887729406356812</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>1.0399999618530273</real>
+    <key>sun_angle</key>
+        <real>0.043982300907373428</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20night.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20night.xml
new file mode 100644
index 0000000..2f5cfb8
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor%20night.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.13997539444089213</real>
+            <real>0.38665792478461469</real>
+            <real>0.77332294252195766</real>
+            <real>0.95108884837904384</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.22876684367656708</real>
+            <real>0.290018230676651</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0.28883209824562073</real>
+            <real>0.28994369506835938</real>
+            <real>0.28999999165534973</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0.50999999046325684</real>
+            <real>0.91999995708465576</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.079999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.25</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.436104517528292</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0002899999963119626</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1.3000000715255737</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.2619466781616211</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>20</real>
+            <real>0.0010000000474974513</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.024202039465308189</real>
+            <real>0.99950659275054932</real>
+            <real>-0.020021669566631317</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>394.39999389648437</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>4.6809735298156738</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.98999994993209839</real>
+            <real>0.95999997854232788</real>
+            <real>0.95999997854232788</real>
+            <real>1.0799999237060547</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor2.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor2.xml
new file mode 100644
index 0000000..c2e5792
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20outdoor2.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0384939114611456</real>
+            <real>0.95795135955843591</real>
+            <real>0.95795135955843591</real>
+            <real>0.60696905358246056</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.20658362946772124</real>
+            <real>0.43003502308076946</real>
+            <real>0.77534221609780829</real>
+            <real>0.61779229342937469</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.34674560611608651</real>
+            <real>0.38732792231055679</real>
+            <real>0.49042100459337234</real>
+            <real>0.58080440759658813</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.33948845342081757</real>
+            <real>0.33948845342081757</real>
+            <real>0.33948845342081757</real>
+            <real>0.6362861692905426</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.95397572096092276</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.1250000037252903</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998722208165</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.314831098603321</real>
+            <real>10.011000171161356</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0002873900482277883</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.87670719623565674</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.1415927410125732</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0000000298023224</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.0000001490116119</real>
+            <real>0.0010000000917914607</real>
+            <real>-0.48000001257440683</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.70000002224998603</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.1784939272396473</real>
+            <real>0.1991560042470284</real>
+            <real>0.1991560042470284</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>8.7422776573475858e-008</real>
+            <real>0</real>
+            <real>-1</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1205.163865879178</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.5413080077610317</real>
+            <real>1.5705089192829433</real>
+            <real>1.6435112576923672</real>
+            <real>0.56847512722015381</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20shadows.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20shadows.xml
new file mode 100644
index 0000000..01d06a1
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20shadows.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.2226010262966156</real>
+            <real>0.26450860500335693</real>
+            <real>0.35999998450279236</real>
+            <real>0.11999999731779099</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.15130999684333801</real>
+            <real>0.30000001192092896</real>
+            <real>0.35131001472473145</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.12862999737262726</real>
+            <real>0.12862999737262726</real>
+            <real>0.12862999737262726</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.88419097661972046</real>
+            <real>0.53047597408294678</real>
+            <real>0.4270470142364502</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.38419300317764282</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0001250890054507181</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>11.40000057220459</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>1.8849555253982544</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.7300000190734863</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.19999980926513672</real>
+            <real>0.0012815999798476696</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.6499999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.21744099259376526</real>
+            <real>0.21744099259376526</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.95105654001235962</real>
+            <real>0</real>
+            <real>-0.30901694297790527</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>2</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>3</real>
+            <real>3</real>
+            <real>3</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio1.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio1.xml
new file mode 100644
index 0000000..ca448d0
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio1.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.51940256357192993</real>
+            <real>0.61718720197677612</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.15130999684333801</real>
+            <real>0.30000001192092896</real>
+            <real>0.35131001472473145</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.12862999737262726</real>
+            <real>0.12862999737262726</real>
+            <real>0.12862999737262726</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.88419097661972046</real>
+            <real>0.53047597408294678</real>
+            <real>0.4270470142364502</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.38419300317764282</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.59999996423721313</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>7.9999997979030013e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>11.40000057220459</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0099999904632568</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>6.4079799652099609</real>
+            <real>0.0012815999798476696</real>
+            <real>-0.42292699217796326</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.21744099259376526</real>
+            <real>0.21744099259376526</real>
+            <real>0.21744099259376526</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.21200713515281677</real>
+            <real>0.97726809978485107</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>2</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.21362832188606262</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>3</real>
+            <real>3</real>
+            <real>3</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio2.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio2.xml
new file mode 100644
index 0000000..fc32f29
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio2.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.80999994277954102</real>
+            <real>0.6044776439666748</real>
+            <real>0.6044776439666748</real>
+            <real>0.26999998092651367</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.63999998569488525</real>
+            <real>1.1799999475479126</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>0.31999999284744263</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.12862999737262726</real>
+            <real>0.12862999737262726</real>
+            <real>0.12862999737262726</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.88419097661972046</real>
+            <real>0.53047597408294678</real>
+            <real>0.4270470142364502</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.38419300317764282</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998817685992</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>1.0053097009658813</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0799999237060547</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0012815999798476696</real>
+            <real>-0.49999997019767761</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.64999997615814209</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.08999999612569809</real>
+            <real>0.21744099259376526</real>
+            <real>0.21744099259376526</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.84432792663574219</real>
+            <real>0</real>
+            <real>0.53582674264907837</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>188</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>2</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.5799999237060547</real>
+            <real>2.5799999237060547</real>
+            <real>2.5799999237060547</real>
+            <real>2.5799999237060547</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio3.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio3.xml
new file mode 100644
index 0000000..af5676b
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio3.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.71999996900558472</real>
+            <real>0.53731358051300049</real>
+            <real>0.53731358051300049</real>
+            <real>0.23999999463558197</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.47999998927116394</real>
+            <real>1.1799999475479126</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>0.31999999284744263</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.12862999737262726</real>
+            <real>0.12862999737262726</real>
+            <real>0.12862999737262726</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.88419097661972046</real>
+            <real>0.53047597408294678</real>
+            <real>0.4270470142364502</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.38419300317764282</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998817685992</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.2200000286102295</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.8000001907348633</real>
+            <real>0.0012815999798476696</real>
+            <real>-0.44999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.08999999612569809</real>
+            <real>0.21744099259376526</real>
+            <real>0.21744099259376526</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.32094338536262512</real>
+            <real>-0.94709837436676025</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>188</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>2</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.8148672580718994</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.5799999237060547</real>
+            <real>2.5799999237060547</real>
+            <real>2.5799999237060547</real>
+            <real>2.5799999237060547</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio4.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio4.xml
new file mode 100644
index 0000000..c2e5792
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio4.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0384939114611456</real>
+            <real>0.95795135955843591</real>
+            <real>0.95795135955843591</real>
+            <real>0.60696905358246056</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.20658362946772124</real>
+            <real>0.43003502308076946</real>
+            <real>0.77534221609780829</real>
+            <real>0.61779229342937469</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.34674560611608651</real>
+            <real>0.38732792231055679</real>
+            <real>0.49042100459337234</real>
+            <real>0.58080440759658813</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.33948845342081757</real>
+            <real>0.33948845342081757</real>
+            <real>0.33948845342081757</real>
+            <real>0.6362861692905426</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.95397572096092276</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.1250000037252903</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998722208165</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.314831098603321</real>
+            <real>10.011000171161356</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0002873900482277883</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.87670719623565674</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.1415927410125732</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0000000298023224</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.0000001490116119</real>
+            <real>0.0010000000917914607</real>
+            <real>-0.48000001257440683</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.70000002224998603</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.1784939272396473</real>
+            <real>0.1991560042470284</real>
+            <real>0.1991560042470284</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>8.7422776573475858e-008</real>
+            <real>0</real>
+            <real>-1</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1205.163865879178</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1.0000000298023224</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.5413080077610317</real>
+            <real>1.5705089192829433</real>
+            <real>1.6435112576923672</real>
+            <real>0.56847512722015381</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio5.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio5.xml
new file mode 100644
index 0000000..fde46ae
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio5.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>2.0099997520446777</real>
+            <real>1.9199999570846558</real>
+            <real>1.8899999856948853</real>
+            <real>2.0099997520446777</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.63999998569488525</real>
+            <real>1.1799999475479126</real>
+            <real>2</real>
+            <real>2</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>0.31999999284744263</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.39050509865536398</real>
+            <real>0.39050509865536398</real>
+            <real>0.39050509865536398</real>
+            <real>0.39050509865536398</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998254906856</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.199999735331062</real>
+            <real>10.010999579794088</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998391111764</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.1499999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.9999998807907104</real>
+            <real>0.0010000000478643939</real>
+            <real>-0.47999998436731417</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.64999997615814209</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.08999999612569809</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0</real>
+            <real>1</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>188</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.5799999237060547</real>
+            <real>2.5799999237060547</real>
+            <real>2.5799999237060547</real>
+            <real>2.5799999237060547</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio6.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio6.xml
new file mode 100644
index 0000000..f18cc75
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio6.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.5299999713897705</real>
+            <real>1.5299999713897705</real>
+            <real>1.5299999713897705</real>
+            <real>0.50999999046325684</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.72533315420150757</real>
+            <real>0.995555579662323</real>
+            <real>1.2799999713897705</real>
+            <real>0.63999998569488525</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.19999998807907104</real>
+            <real>0.2199999988079071</real>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.29999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.069999776780605</real>
+            <real>10.069999776780605</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00011000000085914508</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>15.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0099999904632568</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>12</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.89999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.95105654001235962</real>
+            <real>0.30901697278022766</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>913</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.2566370964050293</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0.17999999225139618</real>
+            <real>0.17999999225139618</real>
+            <real>0.059999998658895493</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio7.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio7.xml
new file mode 100644
index 0000000..05deb2e
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio7.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.5299999713897705</real>
+            <real>1.5299999713897705</real>
+            <real>1.5299999713897705</real>
+            <real>0.50999999046325684</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.72533315420150757</real>
+            <real>0.995555579662323</real>
+            <real>1.2799999713897705</real>
+            <real>0.63999998569488525</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.19999998807907104</real>
+            <real>0.2199999988079071</real>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.29999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.069999776780605</real>
+            <real>10.069999776780605</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00011000000085914508</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>15.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.2200000286102295</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>11.80000114440918</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.89999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.95105654001235962</real>
+            <real>0.30901697278022766</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>913</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.2566370964050293</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>0.079999998211860657</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio8.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio8.xml
new file mode 100644
index 0000000..0fff0a1
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio8.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.1100000143051147</real>
+            <real>1.1100000143051147</real>
+            <real>1.1100000143051147</real>
+            <real>0.37000000476837158</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.72533315420150757</real>
+            <real>0.995555579662323</real>
+            <real>1.2799999713897705</real>
+            <real>0.63999998569488525</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.19999998807907104</real>
+            <real>0.2199999988079071</real>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.29999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.069999776780605</real>
+            <real>10.069999776780605</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00011000000085914508</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>15.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.8199999332427979</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>12</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.89999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.97452688217163086</real>
+            <real>0.22427067160606384</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>913</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.3446017503738403</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>0.079999998211860657</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio9.xml b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio9.xml
new file mode 100644
index 0000000..198ff7e
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%2EAnaLu%2E%20studio9.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0799999237060547</real>
+            <real>1.0799999237060547</real>
+            <real>1.0799999237060547</real>
+            <real>0.35999998450279236</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.72533315420150757</real>
+            <real>0.995555579662323</real>
+            <real>1.2799999713897705</real>
+            <real>0.63999998569488525</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.19999998807907104</real>
+            <real>0.2199999988079071</real>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>0.29999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.069999776780605</real>
+            <real>10.069999776780605</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00011000000085914508</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>15.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.2200000286102295</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>12</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.89999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.84094464778900146</real>
+            <real>0.54112118482589722</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>913</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.99902653694152832</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.65999996662139893</real>
+            <real>0.65999996662139893</real>
+            <real>0.2199999988079071</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%202012.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%202012.xml
new file mode 100644
index 0000000..657f423
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%202012.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>1</real><real>0.45923501253128052</real><real>0</real><real>1</real></array><key>blue_density</key><array><real>0.25613615825332658</real><real>0.41819368084009056</real><real>0.6726322016895665</real><real>1</real></array><key>blue_horizon</key><array><real>0.47774650705002841</real><real>0.80108383983144904</real><real>0.91266119477967322</real><real>0.98532241580704749</real></array><key>cloud_color</key><array><real>0.52756190160579308</real><real>0.52756190160579308</real><real>0.52756190160579308</real><real>1</real></array><key>cloud_pos_density1</key><array><real>0.72999995946884155</real><real>0.34000000357627869</real><real>0.32999998331069946</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.28999999165534973</real><real>0.84999996423721313</real><real>0.019999999552965164</real><real>1</real></array><key>cloud_scale</key><array><real>0.32999998058761548</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>10.499399946934318</real><real>10.010999746491507</real></array><key>cloud_shadow</key><array><real>0.34999999403953552</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>9.9999997473787516e-006</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>0.69999999890643494</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>0.9424777626991272</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.610000025154136</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>5.7999992370605469</real><real>0.0010000000474974513</real><real>-1.0499999523162842</real><real>1</real></array><key>haze_density</key><array><real>1.5557675468824073</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.33174386620521545</real><real>0.1991559842625179</real><real>0.1991559842625179</real><real>1</real></array><key>lightnorm</key><array><real>-0.76118850708007813</real><real>0.33873793482780457</real><real>0.55303585529327393</real><real>0</real></array><key>max_y</key><array><real>711.42973550362512</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0</real><key>sun_angle</key><real>0.34557521343231201</real><key>sunlight_color</key><array><real>2.3399999141693115</real><real>0.35999998450279236</real><real>0.44999998807907104</real><real>2.3399999141693115</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Alien%20planet.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Alien%20planet.xml
new file mode 100644
index 0000000..ff69e15
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Alien%20planet.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.82999998331069946</real><real>0.18999999761581421</real><real>0.20999999344348907</real><real>0.82999998331069946</real></array><key>blue_density</key><array><real>0</real><real>0.49500009417533875</real><real>0.62999999523162842</real><real>0.62999999523162842</real></array><key>blue_horizon</key><array><real>0.51675063371658325</real><real>0.34671968221664429</real><real>0.65999996662139893</real><real>0.65999996662139893</real></array><key>cloud_color</key><array><real>0.18999999761581421</real><real>0.070000000298023224</real><real>0</real><real>0.18999999761581421</real></array><key>cloud_pos_density1</key><array><real>0.68999999761581421</real><real>0.32999998331069946</real><real>0.51999998092651367</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.2199999988079071</real><real>0.84999996423721313</real><real>0.12999999523162842</real><real>1</real></array><key>cloud_scale</key><array><real>0.47999998927116394</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>10.453993749294909</real><real>10.026071512513319</real></array><key>cloud_shadow</key><array><real>0.28999999165534973</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>1.9999999494757503e-005</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>26.80000114440918</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>4.5867252349853516</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>0.87000000476837158</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>0.19999980926513672</real><real>0.0010000000474974513</real><real>-0.49999997019767761</real><real>1</real></array><key>haze_density</key><array><real>2.2100000381469727</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.25999999046325684</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.86939668655395508</real><real>0.48175376653671265</real><real>0.10983037948608398</real><real>0</real></array><key>max_y</key><array><real>394.39999389648437</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>1.1000000238418579</real><key>sun_angle</key><real>2.6389377117156982</real><key>sunlight_color</key><array><real>1.4399999380111694</real><real>1.8300000429153442</real><real>3</real><real>3</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20An%20incongruent%20truth.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20An%20incongruent%20truth.xml
new file mode 100644
index 0000000..a780e5d
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20An%20incongruent%20truth.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0</real><real>0</real><real>0.44999998807907104</real><real>0.44999998807907104</real></array><key>blue_density</key><array><real>0.13997539444089213</real><real>0.38665792478461469</real><real>0.77332294252195766</real><real>0.95108884837904384</real></array><key>blue_horizon</key><array><real>0</real><real>0.22876684367656708</real><real>0.290018230676651</real><real>0.31999999284744263</real></array><key>cloud_color</key><array><real>0.25999999046325684</real><real>0.28883209824562073</real><real>0.28994369506835938</real><real>0.28999999165534973</real></array><key>cloud_pos_density1</key><array><real>0.17999999225139618</real><real>0.50999999046325684</real><real>0.91999995708465576</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.5</real><real>0.5</real><real>0.079999998211860657</real><real>1</real></array><key>cloud_scale</key><array><real>0.25</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>10.436104517528292</real><real>10.032009389655741</real></array><key>cloud_shadow</key><array><real>0.34000000357627869</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.0002899999963119626</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>1.3000000715255737</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>2.2619466781616211</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.5399999618530273</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>4.0000009536743164</real><real>0.0010000000474974513</real><real>-0.74999994039535522</real><real>1</real></array><key>haze_density</key><array><real>0.12999999523162842</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.14999999105930328</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.74630618095397949</real><real>0.24868990480899811</real><real>-0.61739814281463623</real><real>0</real></array><key>max_y</key><array><real>394.39999389648437</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0.44999998807907104</real><key>sun_angle</key><real>0.25132742524147034</real><key>sunlight_color</key><array><real>2.6999998092651367</real><real>2.3490002155303955</real><real>1.4040002822875977</real><real>0.89999997615814209</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arid%20nestler.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arid%20nestler.xml
new file mode 100644
index 0000000..1eff3af
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arid%20nestler.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.054342277348041534</real>
+            <real>0.249813511967659</real>
+            <real>0.34000000357627869</real>
+            <real>0.34000000357627869</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.4699999988079071</real>
+            <real>0.4699999988079071</real>
+            <real>0.4699999988079071</real>
+            <real>0.4699999988079071</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.2799564003944397</real>
+            <real>0.2199999988079071</real>
+            <real>0.64999997615814209</real>
+            <real>0.64999997615814209</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.34000000357627869</real>
+            <real>0.16604645550251007</real>
+            <real>0.16918087005615234</real>
+            <real>0.34000000357627869</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0.099999994039535522</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.52999997138977051</real>
+            <real>0.059999998658895493</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>9.644780158996582</real>
+            <real>10.423800468444824</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.31000000238418579</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>5.999999848427251e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>15.40000057220459</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0.18849556148052216</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.24999998509883881</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.66999995708465576</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.15999999642372131</real>
+            <real>0.13210900127887726</real>
+            <real>0.13210900127887726</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.18643523752689362</real>
+            <real>0.10036152601242065</real>
+            <real>-0.97732770442962646</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>737</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>3</integer>
+    <key>star_brightness</key>
+        <real>0.62999999523162842</real>
+    <key>sun_angle</key>
+        <real>3.0410618782043457</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.2200000286102295</real>
+            <real>2.2200000286102295</real>
+            <real>2.2200000286102295</real>
+            <real>0.74000000953674316</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arrakissed.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arrakissed.xml
new file mode 100644
index 0000000..66dfef5
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Arrakissed.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0.14482758939266205</real>
+            <real>0.14999999105930328</real>
+            <real>0.21000000834465027</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0.22999770939350128</real>
+            <real>0.45999997854232788</real>
+            <real>0.65999996662139893</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.54652589559555054</real>
+            <real>0.63999998569488525</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.61000001430511475</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.61000001430511475</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.23999999463558197</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.059999998658895493</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.11999999731779099</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00022000000171829015</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.8274333477020264</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.7599999904632568</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.39999961853027344</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.74999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.679999828338623</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.30239814519882202</real>
+            <real>0.20586305856704712</real>
+            <real>-0.93068563938140869</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1128</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.68000000715255737</real>
+    <key>sun_angle</key>
+        <real>3.3489382266998291</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.0999999046325684</real>
+            <real>0.59999978542327881</real>
+            <real>0.31500005722045898</real>
+            <real>0.69999998807907104</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asian%20red%20dawn.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asian%20red%20dawn.xml
new file mode 100644
index 0000000..39813c2
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asian%20red%20dawn.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.039999999105930328</real><real>0.029999999329447746</real><real>0</real><real>0.039999999105930328</real></array><key>blue_density</key><array><real>0</real><real>0.25999999046325684</real><real>0.5</real><real>0.5</real></array><key>blue_horizon</key><array><real>0</real><real>0</real><real>0</real><real>0</real></array><key>cloud_color</key><array><real>0.25999999046325684</real><real>0</real><real>0</real><real>0.25999999046325684</real></array><key>cloud_pos_density1</key><array><real>0.68999999761581421</real><real>0.68999999761581421</real><real>0.5</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.51999998092651367</real><real>0.81000000238418579</real><real>0.10999999940395355</real><real>1</real></array><key>cloud_scale</key><array><real>0.34999999403953552</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>20</real><real>20</real></array><key>cloud_shadow</key><array><real>0.34999999403953552</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00019999999494757503</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>22.100000381469727</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>1.5707963705062866</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.2099999189376831</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>20</real><real>0.0010000000474974513</real><real>0</real><real>1</real></array><key>haze_density</key><array><real>0.0099999997764825821</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>0.99802672863006592</real><real>0.062790460884571075</real><real>4.362513550404401e-008</real><real>0</real></array><key>max_y</key><array><real>1014.1000366210937</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0.75999999046325684</real><key>sun_angle</key><real>3.0787608623504639</real><key>sunlight_color</key><array><real>1.619999885559082</real><real>1.2690000534057617</real><real>0.91800004243850708</real><real>0.53999996185302734</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asiatix.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asiatix.xml
new file mode 100644
index 0000000..bf35008
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Asiatix.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.059999998658895493</real>
+            <real>0</real>
+            <real>0.32999998331069946</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.083504162728786469</real>
+            <real>0.22999770939350128</real>
+            <real>0.45999997854232788</real>
+            <real>0.45999997854232788</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.31871956586837769</real>
+            <real>0.6319204568862915</real>
+            <real>0.74000000953674316</real>
+            <real>0.74000000953674316</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>0.47999998927116394</real>
+            <real>0.69999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.22999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.28999999165534973</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.38999998569488525</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00016999999934341758</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>10.699999809265137</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.5814156532287598</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>6.6000008583068848</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.89999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.2599999904632568</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.4699999988079071</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.4257793128490448</real>
+            <real>0</real>
+            <real>-0.9048270583152771</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1267.5999755859375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.3199999332427979</real>
+            <real>0.84000003337860107</real>
+            <real>0.37800011038780212</real>
+            <real>1.3199999332427979</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation%202.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation%202.xml
new file mode 100644
index 0000000..2edb929
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation%202.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.029999999329447746</real><real>0</real><real>0</real><real>0.029999999329447746</real></array><key>blue_density</key><array><real>0.097999997437000275</real><real>0.2800000011920929</real><real>1</real><real>1</real></array><key>blue_horizon</key><array><real>0.11999999731779099</real><real>0.35094299912452698</real><real>1</real><real>1</real></array><key>cloud_color</key><array><real>0.48999997973442078</real><real>0.79000002145767212</real><real>0.80000001192092896</real><real>1</real></array><key>cloud_pos_density1</key><array><real>0.48999997973442078</real><real>0.5</real><real>0.18999999761581421</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.38999998569488525</real><real>0.5</real><real>0.25999999046325684</real><real>1</real></array><key>cloud_scale</key><array><real>0.37000000476837158</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>9.9300004821488983</real><real>10.199999788063906</real></array><key>cloud_shadow</key><array><real>0.28999999165534973</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00021999998716637492</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>4</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>3.2044246196746826</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.5399999618530273</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>3.8000010331979865</real><real>0.001000000059761974</real><real>-0.49999996688498527</real><real>1</real></array><key>haze_density</key><array><real>0.20999999344348907</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.049999997019767761</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.062759645283222198</real><real>0.031410921365022659</real><real>0.99753427505493164</real><real>0</real></array><key>max_y</key><array><real>676.10003662109375</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0.44999998807907104</real><key>sun_angle</key><real>3.1101765632629395</real><key>sunlight_color</key><array><real>1.7999999523162842</real><real>1.4099999666213989</real><real>1.0199999809265137</real><real>1.7999999523162842</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation.xml
new file mode 100644
index 0000000..4ee8115
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Azure%20desertation.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.029999999329447746</real><real>0</real><real>0</real><real>0.029999999329447746</real></array><key>blue_density</key><array><real>0.097999997437000275</real><real>0.2800000011920929</real><real>1</real><real>1</real></array><key>blue_horizon</key><array><real>0.11999999731779099</real><real>0.35094299912452698</real><real>1</real><real>1</real></array><key>cloud_color</key><array><real>0.48999997973442078</real><real>0.79000002145767212</real><real>0.80000001192092896</real><real>1</real></array><key>cloud_pos_density1</key><array><real>0.53999996185302734</real><real>0.5</real><real>0.39999997615814209</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.38999998569488525</real><real>0.5</real><real>0.08999999612569809</real><real>1</real></array><key>cloud_scale</key><array><real>0.34999999403953552</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>9.9300004821488983</real><real>10.199999788063906</real></array><key>cloud_shadow</key><array><real>0.31000000238418579</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00021999998716637492</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>4</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>3.2044246196746826</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.5399999618530273</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>3.8000010331979865</real><real>0.001000000059761974</real><real>-0.49999996688498527</real><real>1</real></array><key>haze_density</key><array><real>0.20999999344348907</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.049999997019767761</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>0.056814663112163544</real><real>0.42577928304672241</real><real>-0.90304160118103027</real><real>0</real></array><key>max_y</key><array><real>676.10003662109375</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0.44999998807907104</real><key>sun_angle</key><real>0.4398229718208313</real><key>sunlight_color</key><array><real>1.7999999523162842</real><real>1.4099999666213989</real><real>1.0199999809265137</real><real>1.7999999523162842</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Barcelon%20variation%202.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Barcelon%20variation%202.xml
new file mode 100644
index 0000000..ca17be5
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Barcelon%20variation%202.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.106283999979496</real>
+            <real>0.14465400576591492</real>
+            <real>0.32999998331069946</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.56000000238418579</real>
+            <real>0.30000001192092896</real>
+            <real>0.35131001472473145</real>
+            <real>0.56000000238418579</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.51999998092651367</real>
+            <real>0.41999998688697815</real>
+            <real>0.71999996900558472</real>
+            <real>0.71999996900558472</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.50999999046325684</real>
+            <real>0.47999998927116394</real>
+            <real>0.68999999761581421</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.039999999105930328</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.38999998569488525</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00014000000373926014</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>25.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.5132739543914795</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.2000007629394531</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.34999999403953552</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.4798322319984436</real>
+            <real>0.57757276296615601</real>
+            <real>-0.66043221950531006</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>632</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0.059999998658895493</real>
+    <key>sun_angle</key>
+        <real>0.61575222015380859</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.0099997520446777</real>
+            <real>1.3500000238418579</real>
+            <real>1.3500000238418579</real>
+            <real>2.0099997520446777</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Beautiful%20again.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Beautiful%20again.xml
new file mode 100644
index 0000000..4020b04
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Beautiful%20again.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.75</real>
+            <real>0</real>
+            <real>0.43269237875938416</real>
+            <real>0.25</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.45999997854232788</real>
+            <real>0.38665792346000671</real>
+            <real>0.7733229398727417</real>
+            <real>0.81999999284744263</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0.22876684367656708</real>
+            <real>0.290018230676651</real>
+            <real>0.39999997615814209</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0.28883209824562073</real>
+            <real>0.28994369506835938</real>
+            <real>0.28999999165534973</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0.50999999046325684</real>
+            <real>0.91999995708465576</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.079999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.25</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.436104517528292</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.34000000357627869</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998817685992</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>26.80000114440918</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>1.8849555253982544</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6699999570846558</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>9.0000009536743164</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.69999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.45999997854232788</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.070000000298023224</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.93839412927627563</real>
+            <real>0.16263717412948608</real>
+            <real>-0.30490267276763916</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>395</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>1.3999999761581421</real>
+    <key>sun_angle</key>
+        <real>0.16336283087730408</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.3399999141693115</real>
+            <real>1.5422734022140503</real>
+            <real>0.92181861400604248</real>
+            <real>0.77999997138977051</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Breaking%20firmament.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Breaking%20firmament.xml
new file mode 100644
index 0000000..ff87474
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Breaking%20firmament.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.059999998658895493</real><real>0</real><real>0</real><real>0.059999998658895493</real></array><key>blue_density</key><array><real>0.31999999284744263</real><real>0.31999999284744263</real><real>0.82999998331069946</real><real>0.82999998331069946</real></array><key>blue_horizon</key><array><real>0.5</real><real>0.35999998450279236</real><real>0.5</real><real>0.59999996423721313</real></array><key>cloud_color</key><array><real>0.14000000059604645</real><real>0.14000000059604645</real><real>0.14000000059604645</real><real>0.14000000059604645</real></array><key>cloud_pos_density1</key><array><real>0.81999999284744263</real><real>0.93999999761581421</real><real>0.75</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.44999998807907104</real><real>0.35999998450279236</real><real>0.019999999552965164</real><real>1</real></array><key>cloud_scale</key><array><real>0.17999999225139618</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>20</real><real>20</real></array><key>cloud_shadow</key><array><real>0.37000000476837158</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00016999999934341758</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>0</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>3.0787608623504639</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.809999942779541</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>7.5999999046325684</real><real>0.0010000000474974513</real><real>-0.64999997615814209</real><real>1</real></array><key>haze_density</key><array><real>0.22999998927116394</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.18999999761581421</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.062017403542995453</real><real>0.15643446147441864</real><real>-0.98573935031890869</real><real>0</real></array><key>max_y</key><array><real>253.5</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>24</integer><key>star_brightness</key><real>0.39999997615814209</real><key>sun_angle</key><real>0.15707962214946747</real><key>sunlight_color</key><array><real>2.0399999618530273</real><real>2.0399999618530273</real><real>2.0399999618530273</real><real>0.68000000715255737</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Brillianter%20sunset.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Brillianter%20sunset.xml
new file mode 100644
index 0000000..5e9a17f
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Brillianter%20sunset.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.32999998331069946</real><real>0.073474660515785217</real><real>0.099999994039535522</real><real>0.32999998331069946</real></array><key>blue_density</key><array><real>0.13251747190952301</real><real>0.36499634385108948</real><real>0.72999995946884155</real><real>0.72999995946884155</real></array><key>blue_horizon</key><array><real>0.16366751492023468</real><real>0.32450026273727417</real><real>0.37999999523162842</real><real>0.37999999523162842</real></array><key>cloud_color</key><array><real>0.23999999463558197</real><real>0.17508696019649506</real><real>0.17508696019649506</real><real>0.23999999463558197</real></array><key>cloud_pos_density1</key><array><real>0.79999995231628418</real><real>0.75999999046325684</real><real>0.74000000953674316</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.44999998807907104</real><real>0.35999998450279236</real><real>0.079999998211860657</real><real>1</real></array><key>cloud_scale</key><array><real>0.28999999165534973</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>10.49940013885498</real><real>10.01099967956543</real></array><key>cloud_shadow</key><array><real>0.32999998331069946</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00032999998074956238</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>2.7000000476837158</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>3.0787608623504639</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.5999999046325684</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>7.5999999046325684</real><real>0.0010000000474974513</real><real>-2.25</real><real>1</real></array><key>haze_density</key><array><real>0.079999998211860657</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.049999997019767761</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.06251179426908493</real><real>0.094108313322067261</real><real>-0.99359744787216187</real><real>0</real></array><key>max_y</key><array><real>605</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>24</integer><key>star_brightness</key><real>0.12999999523162842</real><key>sun_angle</key><real>0.094247780740261078</real><key>sunlight_color</key><array><real>2.0699999332427979</real><real>2.0024998188018799</real><real>1.5974999666213989</real><real>0.68999999761581421</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bubble%20sun%20severance.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bubble%20sun%20severance.xml
new file mode 100644
index 0000000..2d10b90
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Bubble%20sun%20severance.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.28999999165534973</real><real>0.099999994039535522</real><real>0.19999998807907104</real><real>0.31000000238418579</real></array><key>blue_density</key><array><real>0</real><real>0.39999699592590332</real><real>0.80000197887420654</real><real>1</real></array><key>blue_horizon</key><array><real>0.051684476435184479</real><real>0.10247376561164856</real><real>0.11999999731779099</real><real>0.11999999731779099</real></array><key>cloud_color</key><array><real>0.63231253623962402</real><real>0.64999997615814209</real><real>0.64999997615814209</real><real>0.64999997615814209</real></array><key>cloud_pos_density1</key><array><real>0.50999999046325684</real><real>0.45999997854232788</real><real>0.82999998331069946</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.48999997973442078</real><real>0.5</real><real>0.079999998211860657</real><real>1</real></array><key>cloud_scale</key><array><real>0.32999998331069946</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>10.49940013885498</real><real>10.01099967956543</real></array><key>cloud_shadow</key><array><real>0.25999999046325684</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00041999999666586518</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>16.80000114440918</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>6.2203531265258789</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.7300000190734863</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>5</real><real>0.0010000000474974513</real><real>-0.59999996423721313</real><real>1</real></array><key>haze_density</key><array><real>0.40999999642372131</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.2199999988079071</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>0.062759861350059509</real><real>0.031410761177539825</real><real>0.99753421545028687</real><real>0</real></array><key>max_y</key><array><real>605</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0.14000000059604645</real><key>sun_angle</key><real>0.031415928155183792</real><key>sunlight_color</key><array><real>2.6100001335144043</real><real>2.6100001335144043</real><real>2.6100001335144043</real><real>0.87000000476837158</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Castle%20vain.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Castle%20vain.xml
new file mode 100644
index 0000000..6122d61
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Castle%20vain.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.17000000178813934</real><real>0.11609756201505661</real><real>0.062195118516683578</real><real>0.17000000178813934</real></array><key>blue_density</key><array><real>0</real><real>0.25</real><real>0.13500000536441803</real><real>0.25</real></array><key>blue_horizon</key><array><real>0.10961377620697021</real><real>0.073546595871448517</real><real>0.14000000059604645</real><real>0.14000000059604645</real></array><key>cloud_color</key><array><real>0.18999999761581421</real><real>0.059999998658895493</real><real>0.049999997019767761</real><real>0.22999998927116394</real></array><key>cloud_pos_density1</key><array><real>0.69999998807907104</real><real>0.37000000476837158</real><real>0.87999999523162842</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.2199999988079071</real><real>0.75999999046325684</real><real>0.079999998211860657</real><real>1</real></array><key>cloud_scale</key><array><real>0.47999998927116394</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>10.453993749294909</real><real>10.026071512513319</real></array><key>cloud_shadow</key><array><real>0.29999998211860657</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>1.9999999494757503e-005</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>37.600002288818359</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>3.2672562599182129</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.2799999713897705</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>0.19999980926513672</real><real>0.0010000000474974513</real><real>-0.49999997019767761</real><real>1</real></array><key>haze_density</key><array><real>1.2599999904632568</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.35999998450279236</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.11792353540658951</real><real>0.33873796463012695</real><real>0.93346166610717773</real><real>0</real></array><key>max_y</key><array><real>309.89999389648437</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>1.0799999237060547</real><key>sun_angle</key><real>2.7960174083709717</real><key>sunlight_color</key><array><real>0.93000000715255737</real><real>0.44639992713928223</real><real>0.66030013561248779</real><real>0.31000000238418579</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Climacontrasty.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Climacontrasty.xml
new file mode 100644
index 0000000..3f8483a
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Climacontrasty.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.84000003337860107</real>
+            <real>0.71999996900558472</real>
+            <real>0.84000003337860107</real>
+            <real>0.2800000011920929</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.38399907946586609</real>
+            <real>0.63999354839324951</real>
+            <real>1.2799999713897705</real>
+            <real>0.63999998569488525</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0.26181814074516296</real>
+            <real>0.31999999284744263</real>
+            <real>0.15999999642372131</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.2800000011920929</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0.09771379828453064</real>
+            <real>0.87000000476837158</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.4699999988079071</real>
+            <real>0.079999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.28999999165534973</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00042999998549930751</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>3.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0.56548666954040527</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.4699999988079071</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>6.2000012397766113</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.15999999642372131</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.53277301788330078</real>
+            <real>0.10661106556653976</real>
+            <real>-0.83951592445373535</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>644</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>3</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.0347785949707031</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.5799999237060547</real>
+            <real>2.5799999237060547</real>
+            <real>2.5799999237060547</real>
+            <real>0.85999995470046997</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Clouds%20indifferent.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Clouds%20indifferent.xml
new file mode 100644
index 0000000..3b6ebe9
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Clouds%20indifferent.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0</real><real>0</real><real>0.26999998092651367</real><real>0.26999998092651367</real></array><key>blue_density</key><array><real>0.34457135200500488</real><real>0.55514287948608398</real><real>0.66999995708465576</real><real>0.66999995708465576</real></array><key>blue_horizon</key><array><real>0.33888885378837585</real><real>0.47444438934326172</real><real>0.61000001430511475</real><real>0.61000001430511475</real></array><key>cloud_color</key><array><real>0.70999997854232788</real><real>0.74000000953674316</real><real>1</real><real>1</real></array><key>cloud_pos_density1</key><array><real>0.79999995231628418</real><real>0.90999996662139893</real><real>0.69999998807907104</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.44999998807907104</real><real>0.35999998450279236</real><real>0.0099999997764825821</real><real>1</real></array><key>cloud_scale</key><array><real>0.14000000059604645</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>20</real><real>20</real></array><key>cloud_shadow</key><array><real>0.35999998450279236</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00049999996554106474</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>0.10000000149011612</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>4.0840702056884766</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.7400000095367432</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>13.19999885559082</real><real>0.0010000000474974513</real><real>-1.4499999284744263</real><real>1</real></array><key>haze_density</key><array><real>0.25999999046325684</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.18999999761581421</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>0.80542641878128052</real><real>0.094108313322067261</real><real>-0.58517682552337646</real><real>0</real></array><key>max_y</key><array><real>112.70000457763672</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>24</integer><key>star_brightness</key><real>0.20999999344348907</real><key>sun_angle</key><real>0.094247780740261078</real><key>sunlight_color</key><array><real>1.0499999523162842</real><real>1.5299999713897705</real><real>1.6500000953674316</real><real>1.6500000953674316</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cobraring.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cobraring.xml
new file mode 100644
index 0000000..e05abc6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Cobraring.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0</real><real>0</real><real>0</real><real>0</real></array><key>blue_density</key><array><real>0</real><real>0.35499647259712219</real><real>0.70999997854232788</real><real>0.70999997854232788</real></array><key>blue_horizon</key><array><real>0</real><real>0.79999995231628418</real><real>1</real><real>1</real></array><key>cloud_color</key><array><real>0.39999997615814209</real><real>0.34999999403953552</real><real>0.099999994039535522</real><real>0.39999997615814209</real></array><key>cloud_pos_density1</key><array><real>0.51999998092651367</real><real>0.40999999642372131</real><real>0.69999998807907104</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.5</real><real>0.5</real><real>0.029999999329447746</real><real>1</real></array><key>cloud_scale</key><array><real>0.14999999105930328</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>10.49940013885498</real><real>10.01099967956543</real></array><key>cloud_shadow</key><array><real>0.47999998927116394</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00038999997195787728</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>8.6999998092651367</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>0.8796459436416626</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.0900000333786011</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>8.600001335144043</real><real>0.0010000000474974513</real><real>-1.1999999284744263</real><real>1</real></array><key>haze_density</key><array><real>0.71999996900558472</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.14999999105930328</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.74749541282653809</real><real>0.2425992339849472</real><real>0.61838197708129883</real><real>0</real></array><key>max_y</key><array><real>158</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0</real><key>sun_angle</key><real>0.24504423141479492</real><key>sunlight_color</key><array><real>3</real><real>1.2599999904632568</real><real>0.27000004053115845</real><real>3</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coral%20reef.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coral%20reef.xml
new file mode 100644
index 0000000..0f2ebdb
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Coral%20reef.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.25356096029281616</real>
+            <real>0.40908080339431763</real>
+            <real>0.65999996662139893</real>
+            <real>0.2199999988079071</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.3884127140045166</real>
+            <real>0.63416171073913574</real>
+            <real>1.0199999809265137</real>
+            <real>0.50999999046325684</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.79566740989685059</real>
+            <real>1.3341723680496216</real>
+            <real>1.5199999809265137</real>
+            <real>0.75999999046325684</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.35999998450279236</real>
+            <real>0.35834389925003052</real>
+            <real>0.35834389925003052</real>
+            <real>0.35999998450279236</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.34000000357627869</real>
+            <real>0.32999998331069946</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.28999999165534973</real>
+            <real>0.84999996423721313</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.32999998058761548</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.499399946934318</real>
+            <real>10.010999746491507</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00045999998110346496</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.8274333477020264</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.3500000238418579</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.2366936635580714</real>
+            <real>0.0010000000718780599</real>
+            <real>-0.49272174722960926</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.2699999809265137</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.19915598630905151</real>
+            <real>0.19915598630905151</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.2967471182346344</real>
+            <real>0.27899089455604553</real>
+            <real>0.91329360008239746</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>403</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.8588495254516602</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.56603914499282837</real>
+            <real>0.62662863731384277</real>
+            <real>0.77999997138977051</real>
+            <real>0.25999999046325684</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Damage%20down.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Damage%20down.xml
new file mode 100644
index 0000000..7fe8a59
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Damage%20down.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>2.5199999809265137</real>
+            <real>0.89999997615814209</real>
+            <real>0</real>
+            <real>0.8399999737739563</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0.22953487932682037</real>
+            <real>0.41999998688697815</real>
+            <real>0.5</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0.35094299912452698</real>
+            <real>0.8399999737739563</real>
+            <real>0.87999999523162842</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.56049990653991699</real>
+            <real>0.7504999041557312</real>
+            <real>0.75999999046325684</real>
+            <real>0.75999999046325684</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.10999999940395355</real>
+            <real>5.6909198760986328</real>
+            <real>0.74000000953674316</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>6.9909601211547852</real>
+            <real>0.079999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.35999998450279236</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>12.40999960899353</real>
+            <real>10.199999809265137</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.34000000357627869</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00026999998954124749</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1.3000000715255737</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.94999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.91999995708465576</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.10999999940395355</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.55164581537246704</real>
+            <real>-0.83407843112945557</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>2228</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.5572564601898193</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.4600000381469727</real>
+            <real>1.5</real>
+            <real>0.89999997615814209</real>
+            <real>2.4600000381469727</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Dark%20came%20over.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Dark%20came%20over.xml
new file mode 100644
index 0000000..e184cdc
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Dark%20came%20over.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.08999999612569809</real><real>0.08999999612569809</real><real>0</real><real>0.08999999612569809</real></array><key>blue_density</key><array><real>0.10500001907348633</real><real>0.29999998211860657</real><real>0.59999996423721313</real><real>0.59999996423721313</real></array><key>blue_horizon</key><array><real>0.11220983415842056</real><real>0.32816043496131897</real><real>0.68999999761581421</real><real>0.68999999761581421</real></array><key>cloud_color</key><array><real>0.63999998569488525</real><real>0.56685715913772583</real><real>0.31085717678070068</real><real>0.63999998569488525</real></array><key>cloud_pos_density1</key><array><real>0.79999995231628418</real><real>1</real><real>0.87000000476837158</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.69999998807907104</real><real>0.70999997854232788</real><real>0.079999998211860657</real><real>1</real></array><key>cloud_scale</key><array><real>0.19999998807907104</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>9.9300003051757813</real><real>10.199999809265137</real></array><key>cloud_shadow</key><array><real>0.31999999284744263</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00047999998787418008</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>7.4000000953674316</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>2.6389377117156982</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.3399999141693115</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>2.9999995231628418</real><real>0.0010000000474974513</real><real>-0.99999994039535522</real><real>1</real></array><key>haze_density</key><array><real>0.53999996185302734</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.12999999523162842</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>0.47582259774208069</real><real>0.15643444657325745</real><real>0.86551785469055176</real><real>0</real></array><key>max_y</key><array><real>1971.800048828125</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>24</integer><key>star_brightness</key><real>0.56000000238418579</real><key>sun_angle</key><real>2.9845130443572998</real><key>sunlight_color</key><array><real>0.87000000476837158</real><real>0.6421428918838501</real><real>0.42000001668930054</real><real>0.28999999165534973</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Das%20fog.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Das%20fog.xml
new file mode 100644
index 0000000..3dc815f
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Das%20fog.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>3</real>
+            <real>3</real>
+            <real>3</real>
+            <real>1</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00089999998454004526</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>100</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>6.2831854820251465</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.19999980926513672</real>
+            <real>0.0010000000474974513</real>
+            <real>-2.5</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.25</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-1.7484555314695172e-007</real>
+            <real>1.7484555314695172e-007</real>
+            <real>1</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>6.2831854820251465</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>3</real>
+            <real>3</real>
+            <real>3</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Deep%20blue%20sky.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Deep%20blue%20sky.xml
new file mode 100644
index 0000000..212da90
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Deep%20blue%20sky.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.28464806749374816</real><real>0.45923502031814678</real><real>0.7409173846244812</real><real>0.7409173846244812</real></array><key>blue_density</key><array><real>0.25613615825332658</real><real>0.41819368084009056</real><real>0.6726322016895665</real><real>1</real></array><key>blue_horizon</key><array><real>0.47774650705002841</real><real>0.80108383983144904</real><real>0.91266119477967322</real><real>0.98532241580704749</real></array><key>cloud_color</key><array><real>0.52756190160579308</real><real>0.52756190160579308</real><real>0.52756190160579308</real><real>1</real></array><key>cloud_pos_density1</key><array><real>0.72999995946884155</real><real>0.34000000357627869</real><real>0.32999998331069946</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.28999999165534973</real><real>0.84999996423721313</real><real>0.019999999552965164</real><real>1</real></array><key>cloud_scale</key><array><real>0.32999998058761548</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>10.499399946934318</real><real>10.010999746491507</real></array><key>cloud_shadow</key><array><real>0.25999999046325684</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>9.9999997473787516e-006</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>0.69999999890643494</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>3.1415927410125732</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.610000025154136</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>4.2366936635580714</real><real>0.0010000000718780599</real><real>-0.49272174722960926</real><real>1</real></array><key>haze_density</key><array><real>1.5557675468824073</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.33174386620521545</real><real>0.1991559842625179</real><real>0.1991559842625179</real><real>1</real></array><key>lightnorm</key><array><real>-6.1817239327410789e-008</real><real>0.70710676908493042</real><real>0.70710676908493042</real><real>0</real></array><key>max_y</key><array><real>711.42973550362512</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0</real><key>sun_angle</key><real>2.3561944961547852</real><key>sunlight_color</key><array><real>0.62994743245872087</real><real>0.69737775977682759</real><real>0.86806544391379248</real><real>0.28935515608276319</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Desert%20Sunset%20mod.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Desert%20Sunset%20mod.xml
new file mode 100644
index 0000000..2e2a2f3
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Desert%20Sunset%20mod.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.48999997973442078</real>
+            <real>0.088169597089290619</real>
+            <real>0.11999999731779099</real>
+            <real>0.48999997973442078</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999997615814209</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.10767599940299988</real>
+            <real>0.18999999761581421</real>
+            <real>0.25</real>
+            <real>0.26999998092651367</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.37000000476837158</real>
+            <real>0.22615399956703186</real>
+            <real>0.37000000476837158</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.199999809265137</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.35999998450279236</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00046999999904073775</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>7.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>5.2778754234313965</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>3.8000011444091797</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.87000000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.84266197681427002</real>
+            <real>0.062790460884571075</real>
+            <real>-0.53476929664611816</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>553</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.0787608623504639</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.1899998188018799</real>
+            <real>2.8385701179504395</real>
+            <real>2.8385701179504395</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Early%20warning.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Early%20warning.xml
new file mode 100644
index 0000000..43c343a
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Early%20warning.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.87000000476837158</real>
+            <real>0.54375004768371582</real>
+            <real>0.24468749761581421</real>
+            <real>0.28999999165534973</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.31000000238418579</real>
+            <real>0.36606386303901672</real>
+            <real>0.62000000476837158</real>
+            <real>0.31000000238418579</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.85999995470046997</real>
+            <real>0.35698121786117554</real>
+            <real>0.56792449951171875</real>
+            <real>0.42999997735023499</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.31428584456443787</real>
+            <real>0.55000001192092896</real>
+            <real>0.39285731315612793</real>
+            <real>0.55000001192092896</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.45999997854232788</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.71999996900558472</real>
+            <real>0.41999998688697815</real>
+            <real>0.059999998658895493</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.44999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.200000040817258</real>
+            <real>10.010999893335338</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00016999999934341758</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>4.7000002861022949</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>6.0946898460388184</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.94999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>7.7999997138977051</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.55000001192092896</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.75999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.19999998807907104</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.17994101345539093</real>
+            <real>0.27899089455604553</real>
+            <real>-0.94328433275222778</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1208</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0.95999997854232788</real>
+    <key>sun_angle</key>
+        <real>2.8588495254516602</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.2899999618530273</real>
+            <real>0.78157889842987061</real>
+            <real>0.89999997615814209</real>
+            <real>0.42999997735023499</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eno%20would%20be%20proud.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eno%20would%20be%20proud.xml
new file mode 100644
index 0000000..dede67c
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Eno%20would%20be%20proud.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0.14962118864059448</real>
+            <real>0.2036362886428833</real>
+            <real>0.2800000011920929</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.13977900147438049</real>
+            <real>0.38499599695205688</real>
+            <real>0.93999999761581421</real>
+            <real>0.93999999761581421</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0.18999999761581421</real>
+            <real>0.079999998211860657</real>
+            <real>0.41999998688697815</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.22615399956703186</real>
+            <real>0.53999996185302734</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.51999998092651367</real>
+            <real>0.62000000476837158</real>
+            <real>0.41999998688697815</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.48999997973442078</real>
+            <real>0.079999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.20999999344348907</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.739999771118164</real>
+            <real>10.600000381469727</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00038999997195787728</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0.12566371262073517</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.89999997615814209</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.8000001907348633</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.49999997019767761</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.2099999189376831</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.10999999940395355</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.11373797059059143</real>
+            <real>0.42008551955223083</real>
+            <real>-0.90032875537872314</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>789</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>28</integer>
+    <key>star_brightness</key>
+        <real>0.099999994039535522</real>
+    <key>sun_angle</key>
+        <real>2.7080531120300293</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.1610879898071289</real>
+            <real>1.5523307323455811</real>
+            <real>2.8799998760223389</real>
+            <real>0.95999997854232788</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Evil%20machinery.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Evil%20machinery.xml
new file mode 100644
index 0000000..22e82a3
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Evil%20machinery.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.5899999141693115</real>
+            <real>0.53999996185302734</real>
+            <real>0</real>
+            <real>1.5899999141693115</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.52199989557266235</real>
+            <real>0.32480010390281677</real>
+            <real>0.57999998331069946</real>
+            <real>0.28999999165534973</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.85999995470046997</real>
+            <real>0.63999998569488525</real>
+            <real>1</real>
+            <real>1.059999942779541</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.37000000476837158</real>
+            <real>0.25999999046325684</real>
+            <real>0.039999999105930328</real>
+            <real>0.37000000476837158</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.51999998092651367</real>
+            <real>0.38999998569488525</real>
+            <real>0.68999999761581421</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.17000000178813934</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00089999998454004526</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>100</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0.12566371262073517</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.4699999988079071</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>11.600000381469727</real>
+            <real>0.0010000000474974513</real>
+            <real>-1.4999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.0099999997764825821</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.10497009009122849</real>
+            <real>0.54639440774917603</real>
+            <real>0.83092385530471802</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.57805311679840088</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.3499999046325684</real>
+            <real>1.559999942779541</real>
+            <real>0.56999999284744263</real>
+            <real>1.559999942779541</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Farmatronic%20sepia.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Farmatronic%20sepia.xml
new file mode 100644
index 0000000..d2b489d
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Farmatronic%20sepia.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0</real><real>0</real><real>0</real><real>0</real></array><key>blue_density</key><array><real>0</real><real>0.099999994039535522</real><real>0.11999999731779099</real><real>0.11999999731779099</real></array><key>blue_horizon</key><array><real>0.029999999329447746</real><real>0.029999999329447746</real><real>0.029999999329447746</real><real>0.029999999329447746</real></array><key>cloud_color</key><array><real>0.37999999523162842</real><real>0.31999999284744263</real><real>0.22999998927116394</real><real>0.37999999523162842</real></array><key>cloud_pos_density1</key><array><real>0.74000000953674316</real><real>0.93999999761581421</real><real>0.84999996423721313</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.65999996662139893</real><real>0.52999997138977051</real><real>0.039999999105930328</real><real>1</real></array><key>cloud_scale</key><array><real>0.18999999761581421</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>20</real><real>20</real></array><key>cloud_shadow</key><array><real>0.32999998331069946</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00013000000035390258</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>1.3000000715255737</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>2.3247785568237305</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.9499999284744263</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>17.399999618530273</real><real>0.0010000000474974513</real><real>-0.64999997615814209</real><real>1</real></array><key>haze_density</key><array><real>0.62000000476837158</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.20999999344348907</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.72322046756744385</real><real>0.12533323466777802</real><real>-0.67914927005767822</real><real>0</real></array><key>max_y</key><array><real>281.70001220703125</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>24</integer><key>star_brightness</key><real>0.39999997615814209</real><key>sun_angle</key><real>0.12566371262073517</real><key>sunlight_color</key><array><real>1.5899999141693115</real><real>1.5299999713897705</real><real>1.5899999141693115</real><real>1.5899999141693115</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fogvari.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fogvari.xml
new file mode 100644
index 0000000..addb480
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Fogvari.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.3952941596508026123046875</real>
+            <real>0.3952941596508026123046875</real>
+            <real>0.420000016689300537109375</real>
+            <real>0.1400000005960464477539062</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.1452250033617019653320312</real>
+            <real>0.3999969959259033203125</real>
+            <real>0.80000197887420654296875</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.430702149868011474609375</real>
+            <real>0.853946685791015625</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.699999988079071044921875</real>
+            <real>0.699999988079071044921875</real>
+            <real>0.699999988079071044921875</real>
+            <real>0.699999988079071044921875</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.53999996185302734375</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.2999999821186065673828125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498046875</real>
+            <real>10.0109996795654296875</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.2199999988079071044921875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0003100000030826777219772339</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697265625</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.949999988079071044921875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.99999904632568359375</real>
+            <real>0.001000000047497451305389404</real>
+            <real>-2.5</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.64999997615814208984375</real>
+            <real>0.1991560012102127075195312</real>
+            <real>0.1991560012102127075195312</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.99715888500213623046875</real>
+            <real>-0.0753269493579864501953125</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>54</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.6461946964263916015625</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.599999964237213134765625</real>
+            <real>0.599999964237213134765625</real>
+            <real>0.599999964237213134765625</real>
+            <real>0.199999988079071044921875</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Grit%20%26%20shame.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Grit%20%26%20shame.xml
new file mode 100644
index 0000000..a9fda37
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Grit%20%26%20shame.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0.22736841440200806</real>
+            <real>0</real>
+            <real>0.08999999612569809</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.038261249661445618</real>
+            <real>0.43999999761581421</real>
+            <real>0.11478374153375626</real>
+            <real>0.2199999988079071</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.60503017902374268</real>
+            <real>0.89999997615814209</real>
+            <real>0.44999998807907104</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.45999997854232788</real>
+            <real>0.61000001430511475</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.039999999105930328</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00014999999257270247</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>10.100000381469727</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.6442475318908691</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.2799999713897705</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.39999961853027344</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.55000001192092896</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.8599998950958252</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.44999998807907104</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.48175370693206787</real>
+            <real>1.7484555314695172e-007</real>
+            <real>-0.87630665302276611</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>886</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>6.2831854820251465</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.86999994516372681</real>
+            <real>0.71999996900558472</real>
+            <real>1.7699999809265137</real>
+            <real>1.7699999809265137</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Herr%20Gracken.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Herr%20Gracken.xml
new file mode 100644
index 0000000..ab35e75
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Herr%20Gracken.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.68999993801116943</real>
+            <real>0.55225539207458496</real>
+            <real>0.5645453929901123</real>
+            <real>0.22999998927116394</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.079999998211860657</real>
+            <real>0.21999964118003845</real>
+            <real>0.39999997615814209</real>
+            <real>0.39999997615814209</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>1.1200000047683716</real>
+            <real>0.37999999523162842</real>
+            <real>0.19999998807907104</real>
+            <real>1.1200000047683716</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.55000001192092896</real>
+            <real>0.47999998927116394</real>
+            <real>0.31999999284744263</real>
+            <real>0.55000001192092896</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.89999997615814209</real>
+            <real>0.94999998807907104</real>
+            <real>0.75999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0.18999999761581421</real>
+            <real>0.049999997019767761</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.25</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>9.993240904292179</real>
+            <real>10.179008409703329</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.34999999403953552</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00022000000171829015</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>39.900001525878906</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>1.7592918872833252</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0799999237060547</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>3.600001335144043</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.39999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.1100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.073992699384689331</real>
+            <real>0.99715888500213623</real>
+            <real>0.014114863239228725</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>456</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>0.26999998092651367</real>
+    <key>sun_angle</key>
+        <real>1.6461946964263916</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.8899999856948853</real>
+            <real>1.2300000190734863</real>
+            <real>1.2899999618530273</real>
+            <real>1.8899999856948853</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Holy%20romance.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Holy%20romance.xml
new file mode 100644
index 0000000..4515e5e
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Holy%20romance.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.31535112857818604</real>
+            <real>0.37471914291381836</real>
+            <real>0.50999999046325684</real>
+            <real>0.17000000178813934</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.019999999552965164</real>
+            <real>0.31999650597572327</real>
+            <real>0.63999998569488525</real>
+            <real>0.69999998807907104</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0.34158006310462952</real>
+            <real>0.39999997615814209</real>
+            <real>0.39999997615814209</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.34000000357627869</real>
+            <real>0.21396400034427643</real>
+            <real>0.21396400034427643</real>
+            <real>0.34000000357627869</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.27044001221656799</real>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.10062900185585022</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>9.644780158996582</real>
+            <real>10.423800468444824</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.32704401016235352</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00015849100600462407</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>3.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0013735899701714516</real>
+            <real>-0.55000001192092896</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.6792449951171875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.13210900127887726</real>
+            <real>0.13210900127887726</real>
+            <real>0.13210900127887726</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.031410444527864456</real>
+            <real>-0.99950659275054932</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1308.1800537109375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>5</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.1101770401000977</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>3</real>
+            <real>3</real>
+            <real>3</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Hong%20Kong.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Hong%20Kong.xml
new file mode 100644
index 0000000..6f16a16
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Hong%20Kong.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.81999999284744263</real><real>0.34119853377342224</real><real>0.60482907295227051</real><real>0.81999999284744263</real></array><key>blue_density</key><array><real>0</real><real>0.54214274883270264</real><real>0.68999999761581421</real><real>0.68999999761581421</real></array><key>blue_horizon</key><array><real>0.32884129881858826</real><real>0.22063982486724854</real><real>0.41999998688697815</real><real>0.41999998688697815</real></array><key>cloud_color</key><array><real>0.34999999403953552</real><real>0.13600000739097595</real><real>0.17000000178813934</real><real>0.34999999403953552</real></array><key>cloud_pos_density1</key><array><real>0.68999999761581421</real><real>0.34000000357627869</real><real>0.70999997854232788</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.28999999165534973</real><real>0.84999996423721313</real><real>0.14000000059604645</real><real>1</real></array><key>cloud_scale</key><array><real>0.39999997615814209</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>10.453993749294909</real><real>10.026071512513319</real></array><key>cloud_shadow</key><array><real>0.37000000476837158</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>1.9999999494757503e-005</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>24.80000114440918</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>5.5292034149169922</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>0.53999996185302734</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>14.800000190734863</real><real>0.0010000000474974513</real><real>-0.79999995231628418</real><real>1</real></array><key>haze_density</key><array><real>1.1000000238418579</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.28999999165534973</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.68420904874801636</real><real>0.031410921365022659</real><real>-0.72860914468765259</real><real>0</real></array><key>max_y</key><array><real>394.39999389648437</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>1.1799999475479126</real><key>sun_angle</key><real>3.1101765632629395</real><key>sunlight_color</key><array><real>1.2422535419464111</real><real>1.9665026664733887</real><real>2.5199999809265137</real><real>0.8399999737739563</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ivory%20flowers.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ivory%20flowers.xml
new file mode 100644
index 0000000..7838e49
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Ivory%20flowers.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.87000000476837158</real>
+            <real>0.69088232517242432</real>
+            <real>0.69088232517242432</real>
+            <real>0.28999999165534973</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.63999998569488525</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.71999996900558472</real>
+            <real>0.37999999523162842</real>
+            <real>0.39999997615814209</real>
+            <real>0.71999996900558472</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0.17000000178813934</real>
+            <real>0.22615399956703186</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.4699999988079071</real>
+            <real>0.31999999284744263</real>
+            <real>0.75999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0.35999998450279236</real>
+            <real>0.25</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.56999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>5.1099996566772461</real>
+            <real>9.339999794960022</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0004400000034365803</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>3.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>5.4035391807556152</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.94999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>11.400001525878906</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.39999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.10999999940395355</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.76612204313278198</real>
+            <real>0.10661106556653976</real>
+            <real>-0.63379108905792236</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>859</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0.19999998807907104</real>
+    <key>sun_angle</key>
+        <real>3.0347785949707031</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.4600000381469727</real>
+            <real>2.4600000381469727</real>
+            <real>2.4600000381469727</real>
+            <real>0.81999999284744263</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Liz%20gluft.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Liz%20gluft.xml
new file mode 100644
index 0000000..2c5b7f8
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Liz%20gluft.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.23999999463558197</real><real>0.3031410276889801</real><real>0.30667626857757568</real><real>0.32999998331069946</real></array><key>blue_density</key><array><real>0.10031381994485855</real><real>0.2849995493888855</real><real>0.56999999284744263</real><real>0.56999999284744263</real></array><key>blue_horizon</key><array><real>0.15806560218334198</real><real>0.31211113929748535</real><real>0.52999997138977051</real><real>0.52999997138977051</real></array><key>cloud_color</key><array><real>0.62000000476837158</real><real>0.72737622261047363</real><real>0.73626559972763062</real><real>1</real></array><key>cloud_pos_density1</key><array><real>0.89999997615814209</real><real>0.93999999761581421</real><real>0.96999996900558472</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.41999998688697815</real><real>0.23999999463558197</real><real>0.029999999329447746</real><real>1</real></array><key>cloud_scale</key><array><real>0.29999998211860657</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>9.993240904292179</real><real>10.179008409703329</real></array><key>cloud_shadow</key><array><real>0.31000000238418579</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00018000000272877514</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>6.7000002861022949</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>2.1362831592559814</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.5399999618530273</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>3.600001335144043</real><real>0.0010000000474974513</real><real>-0.14999999105930328</real><real>1</real></array><key>haze_density</key><array><real>0.74000000953674316</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.18999999761581421</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.82937246561050415</real><real>0.187381312251091</real><real>-0.5263359546661377</real><real>0</real></array><key>max_y</key><array><real>1105</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>24</integer><key>star_brightness</key><real>0.18999999761581421</real><key>sun_angle</key><real>0.18849556148052216</real><key>sunlight_color</key><array><real>1.2599999904632568</real><real>1.2599999904632568</real><real>1.2599999904632568</real><real>0.41999998688697815</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lonely%20cyberpunks.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lonely%20cyberpunks.xml
new file mode 100644
index 0000000..e3281cf
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Lonely%20cyberpunks.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.051724139600992203</real>
+            <real>0.10344827920198441</real>
+            <real>0.049999997019767761</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.051684476435184479</real>
+            <real>0.31999999284744263</real>
+            <real>0.11999999731779099</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.63231253623962402</real>
+            <real>0.64999997615814209</real>
+            <real>0.64999997615814209</real>
+            <real>0.64999997615814209</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.50999999046325684</real>
+            <real>0.45999997854232788</real>
+            <real>0.68000000715255737</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.48999997973442078</real>
+            <real>0.5</real>
+            <real>0.079999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00031999999191612005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>49.299999237060547</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>5.9690260887145996</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.7300000190734863</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.2000007629394531</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.79999995231628418</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.2199999988079071</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.30879738926887512</real>
+            <real>0.037690185010433197</real>
+            <real>0.95038080215454102</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>940</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.14000000059604645</real>
+    <key>sun_angle</key>
+        <real>0.03769911453127861</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.95999997854232788</real>
+            <real>0.6731034517288208</real>
+            <real>0.95999997854232788</real>
+            <real>0.31999999284744263</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moon%20berries.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moon%20berries.xml
new file mode 100644
index 0000000..864933b
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Moon%20berries.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.079999998211860657</real><real>0.070000000298023224</real><real>0</real><real>0.099999994039535522</real></array><key>blue_density</key><array><real>0.13125002384185791</real><real>0.375</real><real>0.75</real><real>0.75</real></array><key>blue_horizon</key><array><real>0.12196721881628036</real><real>0.35669612884521484</real><real>0.75</real><real>0.75</real></array><key>cloud_color</key><array><real>0.69999998807907104</real><real>0.62000000476837158</real><real>0.34000000357627869</real><real>0.77999997138977051</real></array><key>cloud_pos_density1</key><array><real>0.79999995231628418</real><real>1</real><real>1</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.69999998807907104</real><real>0.70999997854232788</real><real>0.10999999940395355</real><real>1</real></array><key>cloud_scale</key><array><real>0.20999999344348907</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>9.9300003051757813</real><real>10.199999809265137</real></array><key>cloud_shadow</key><array><real>0.31000000238418579</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00036000000545755029</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>7.4000000953674316</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>2.7017695903778076</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.5399999618530273</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>4.0000009536743164</real><real>0.0010000000474974513</real><real>-0.89999997615814209</real><real>1</real></array><key>haze_density</key><array><real>0.14999999105930328</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.23999999463558197</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.35949742794036865</real><real>0.53582680225372314</real><real>-0.76397073268890381</real><real>0</real></array><key>max_y</key><array><real>2084.5</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>24</integer><key>star_brightness</key><real>0.68000000715255737</real><key>sun_angle</key><real>0.56548666954040527</real><key>sunlight_color</key><array><real>1.2599999904632568</real><real>0.93000000715255737</real><real>0.89999997615814209</real><real>1.2599999904632568</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Noxumic.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Noxumic.xml
new file mode 100644
index 0000000..3471ed2
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Noxumic.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.40799996256828308</real>
+            <real>0.42000001668930054</real>
+            <real>0.26400002837181091</real>
+            <real>0.14000000059604645</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.17045657336711884</real>
+            <real>0.77999997138977051</real>
+            <real>0.529285728931427</real>
+            <real>0.38999998569488525</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.69882345199584961</real>
+            <real>0.71999996900558472</real>
+            <real>0.58235287666320801</real>
+            <real>0.35999998450279236</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0.28999999165534973</real>
+            <real>0.57999998331069946</real>
+            <real>0.57999998331069946</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.4699999988079071</real>
+            <real>0.32999998331069946</real>
+            <real>0.77999997138977051</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0.15999999642372131</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.34000000357627869</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.069999776780605</real>
+            <real>9.6399997770786285</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00019999999494757503</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>7.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0099999904632568</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>13.399999618530273</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.39999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.2400000095367432</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.23649881780147552</real>
+            <real>-0.97163176536560059</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>725</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.9028317928314209</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.3499999046325684</real>
+            <real>1.3240385055541992</real>
+            <real>1.2201924324035645</real>
+            <real>0.44999998807907104</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oriental%20delight.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oriental%20delight.xml
new file mode 100644
index 0000000..679b9e8
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Oriental%20delight.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.89999997615814209</real><real>0.22999998927116394</real><real>0</real><real>0.89999997615814209</real></array><key>blue_density</key><array><real>0.5444445013999939</real><real>0.4714285135269165</real><real>0.59999996423721313</real><real>0.59999996423721313</real></array><key>blue_horizon</key><array><real>0.62999999523162842</real><real>0.29418638348579407</real><real>0.20999999344348907</real><real>0.62999999523162842</real></array><key>cloud_color</key><array><real>0.12999999523162842</real><real>0.079999998211860657</real><real>0</real><real>0.12999999523162842</real></array><key>cloud_pos_density1</key><array><real>0.25999999046325684</real><real>0.31000000238418579</real><real>0.52999997138977051</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.18999999761581421</real><real>0.89999997615814209</real><real>0.070000000298023224</real><real>1</real></array><key>cloud_scale</key><array><real>0.41999998688697815</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>10.453993749294909</real><real>10.026071512513319</real></array><key>cloud_shadow</key><array><real>0.32999998331069946</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>3.9999998989515007e-005</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>4.7000002861022949</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>3.5185837745666504</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>0.93999999761581421</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>18.599998474121094</real><real>0.0010000000474974513</real><real>-1.25</real><real>1</real></array><key>haze_density</key><array><real>0.87000000476837158</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.53999996185302734</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>-0.35010725259780884</real><real>0.30901703238487244</real><real>0.88426995277404785</real><real>0</real></array><key>max_y</key><array><real>366.20001220703125</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0.37999999523162842</real><key>sun_angle</key><real>2.8274333477020264</real><key>sunlight_color</key><array><real>1.5899999141693115</real><real>1.1811429262161255</real><real>0.95783114433288574</real><real>0.52999997138977051</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Our%20night%20together.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Our%20night%20together.xml
new file mode 100644
index 0000000..1ee2df7
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Our%20night%20together.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.15812495350837708</real>
+            <real>0.10834565013647079</real>
+            <real>0.32999998331069946</real>
+            <real>0.32999998331069946</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0.22842106223106384</real>
+            <real>0.56000000238418579</real>
+            <real>0.56000000238418579</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.34999999403953552</real>
+            <real>0.21593084931373596</real>
+            <real>0.30163845419883728</real>
+            <real>0.34999999403953552</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.68507599830627441</real>
+            <real>0.80405128002166748</real>
+            <real>0.81000000238418579</real>
+            <real>0.81000000238418579</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.20999999344348907</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.11999999731779099</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.31000000238418579</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.33593833803161</real>
+            <real>10.065257411083678</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00026000000070780516</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>43</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.7646017074584961</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.8600000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>8.8000011444091797</real>
+            <real>0.0010000000474974513</real>
+            <real>-1.0499999523162842</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.4900000095367432</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.36322319507598877</real>
+            <real>0.16263668239116669</real>
+            <real>0.91739749908447266</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1474</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>1.6499999761581421</real>
+    <key>sun_angle</key>
+        <real>6.1198229789733887</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.9799998998641968</real>
+            <real>1.3627382516860962</real>
+            <real>1.1429417133331299</real>
+            <real>0.65999996662139893</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Polaron%20charge%20II.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Polaron%20charge%20II.xml
new file mode 100644
index 0000000..2547726
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Polaron%20charge%20II.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.84000003337860107</real>
+            <real>0.2892836332321167</real>
+            <real>0.39371848106384277</real>
+            <real>0.2800000011920929</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0.85999995470046997</real>
+            <real>0.68083322048187256</real>
+            <real>0.85999995470046997</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>0.19999998807907104</real>
+            <real>0.42999997735023499</real>
+            <real>0.77999997138977051</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.51999998092651367</real>
+            <real>0.56999999284744263</real>
+            <real>0.44999998807907104</real>
+            <real>0.62999999523162842</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5899999737739563</real>
+            <real>0.37000000476837158</real>
+            <real>0.57999998331069946</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.84999996423721313</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.499399908684609</real>
+            <real>10.010999908119629</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00033999999868683517</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>17.600000381469727</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.0159289836883545</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.1999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>9.2000007629394531</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.85000002384185791</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.7799999713897705</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.12533320486545563</real>
+            <real>0</real>
+            <real>0.99211472272872925</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>537</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.63999998569488525</real>
+    <key>sun_angle</key>
+        <real>3.1604423522949219</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.90927821397781372</real>
+            <real>2.9399998188018799</real>
+            <real>1.6367011070251465</real>
+            <real>0.97999995946884155</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Red%20city.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Red%20city.xml
new file mode 100644
index 0000000..924c2b6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Red%20city.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1</real>
+            <real>0.019999999552965164</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.099999994039535522</real>
+            <real>0.24640001356601715</real>
+            <real>0.87999999523162842</real>
+            <real>0.87999999523162842</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>1</real>
+            <real>0.70652174949645996</real>
+            <real>0.95652180910110474</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.59800004959106445</real>
+            <real>0.68137490749359131</real>
+            <real>0.68999999761581421</real>
+            <real>0.68999999761581421</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5899999737739563</real>
+            <real>0.53999996185302734</real>
+            <real>0.37000000476837158</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.20999999344348907</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.28999999165534973</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00026000000070780516</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>10.100000381469727</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>4.9008846282958984</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.3999999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>15</real>
+            <real>0.0010000000474974513</real>
+            <real>-2.5</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.08999999612569809</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.98180252313613892</real>
+            <real>0.031410444527864456</real>
+            <real>-0.18728893995285034</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>632</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>1.059999942779541</real>
+    <key>sun_angle</key>
+        <real>3.1101770401000977</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>3</real>
+            <real>2.0099997520446777</real>
+            <real>1.2721518278121948</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sparz%20puft.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sparz%20puft.xml
new file mode 100644
index 0000000..a127d36
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Sparz%20puft.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.4699999094009399</real>
+            <real>1.4699999094009399</real>
+            <real>1.4699999094009399</real>
+            <real>0.48999997973442078</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.50068968534469604</real>
+            <real>0.65999996662139893</real>
+            <real>0.59172403812408447</real>
+            <real>0.32999998331069946</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.81999999284744263</real>
+            <real>0.59653842449188232</real>
+            <real>0.4696153998374939</real>
+            <real>0.81999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22999998927116394</real>
+            <real>0.17000000178813934</real>
+            <real>0.17000000178813934</real>
+            <real>0.22999998927116394</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.89999997615814209</real>
+            <real>0.42999997735023499</real>
+            <real>0.2800000011920929</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0</real>
+            <real>0.19999998807907104</real>
+            <real>0.45999997854232788</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.42999997735023499</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.200000040817258</real>
+            <real>10.010999893335338</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.22999998927116394</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>1.9999999494757503e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>12.800000190734863</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0.62831848859786987</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.87999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>9.8000001907348633</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.85000002384185791</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.0499999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.42594048380851746</real>
+            <real>0.68911367654800415</real>
+            <real>-0.58625680208206177</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>295</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>27</integer>
+    <key>star_brightness</key>
+        <real>1.0799999237060547</real>
+    <key>sun_angle</key>
+        <real>2.3813273906707764</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.2599999904632568</real>
+            <real>0.72947371006011963</real>
+            <real>0.84000003337860107</real>
+            <real>1.2599999904632568</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Stay%20stonkin%27.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Stay%20stonkin%27.xml
new file mode 100644
index 0000000..57ce616
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Stay%20stonkin%27.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.079999998211860657</real><real>0.2800000011920929</real><real>0.28653734922409058</real><real>0.31000000238418579</real></array><key>blue_density</key><array><real>0.78999996185302734</real><real>0.34725272655487061</real><real>0</real><real>0.78999996185302734</real></array><key>blue_horizon</key><array><real>0.45999997854232788</real><real>0.35633799433708191</real><real>0.34338021278381348</real><real>0.45999997854232788</real></array><key>cloud_color</key><array><real>0.25777778029441833</real><real>0.43999999761581421</real><real>0</real><real>0.43999999761581421</real></array><key>cloud_pos_density1</key><array><real>0.47999998927116394</real><real>0.77999997138977051</real><real>0.78999996185302734</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.5</real><real>0.5</real><real>0.17000000178813934</real><real>1</real></array><key>cloud_scale</key><array><real>0.26999998092651367</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>10.072908222972274</real><real>10.152564609237686</real></array><key>cloud_shadow</key><array><real>0.25999999046325684</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00014000000373926014</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>8.1000003814697266</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>6.2831854820251465</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.4699999094009399</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>4.101177011798768</real><real>0.0010000000397674888</real><real>-0.49498037251770732</real><real>1</real></array><key>haze_density</key><array><real>0</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.50999999046325684</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>7.4445637210374116e-008</real><real>0.90482699871063232</real><real>-0.42577937245368958</real><real>0</real></array><key>max_y</key><array><real>921</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0</real><key>sun_angle</key><real>2.0106194019317627</real><key>sunlight_color</key><array><real>1.9499999284744263</real><real>0.71999996900558472</real><real>1.6899898052215576</real><real>1.9499999284744263</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Study%20vessels.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Study%20vessels.xml
new file mode 100644
index 0000000..0047172
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Study%20vessels.xml
@@ -0,0 +1 @@
+<llsd><map><key>ambient</key><array><real>0.53999996185302734</real><real>0</real><real>0</real><real>0.53999996185302734</real></array><key>blue_density</key><array><real>0.086239993572235107</real><real>0.24640001356601715</real><real>0.87999999523162842</real><real>0.87999999523162842</real></array><key>blue_horizon</key><array><real>0.10560000687837601</real><real>0.30882984399795532</real><real>0.87999999523162842</real><real>0.87999999523162842</real></array><key>cloud_color</key><array><real>0.47774997353553772</real><real>0.77024996280670166</real><real>0.77999997138977051</real><real>0.77999997138977051</real></array><key>cloud_pos_density1</key><array><real>0.48999997973442078</real><real>0.5</real><real>0.35999998450279236</real><real>1</real></array><key>cloud_pos_density2</key><array><real>0.34000000357627869</real><real>0.42999997735023499</real><real>0.37000000476837158</real><real>1</real></array><key>cloud_scale</key><array><real>0.28999999165534973</real><real>0</real><real>0</real><real>1</real></array><key>cloud_scroll_rate</key><array><real>9.930000339250185</real><real>10.199999625297616</real></array><key>cloud_shadow</key><array><real>0.35999998450279236</real><real>0</real><real>0</real><real>1</real></array><key>density_multiplier</key><array><real>0.00016999999934341758</real><real>0</real><real>0</real><real>1</real></array><key>distance_multiplier</key><array><real>29.5</real><real>0</real><real>0</real><real>1</real></array><key>east_angle</key><real>1.8221237659454346</real><key>enable_cloud_scroll</key><array><boolean>0</boolean><boolean>0</boolean></array><key>gamma</key><array><real>1.4800000190734863</real><real>0</real><real>0</real><real>1</real></array><key>glow</key><array><real>11.200000762939453</real><real>0.0010000000474974513</real><real>-2.3999998569488525</real><real>1</real></array><key>haze_density</key><array><real>0.5899999737739563</real><real>0</real><real>0</real><real>1</real></array><key>haze_horizon</key><array><real>0.48999997973442078</real><real>0.19915600121021271</real><real>0.19915600121021271</real><real>1</real></array><key>lightnorm</key><array><real>0.96810519695281982</real><real>0.031410921365022659</real><real>0.24856719374656677</real><real>0</real></array><key>max_y</key><array><real>450.70001220703125</real><real>0</real><real>0</real><real>1</real></array><key>preset_num</key><integer>18</integer><key>star_brightness</key><real>0.68999999761581421</real><key>sun_angle</key><real>3.1101765632629395</real><key>sunlight_color</key><array><real>2.0099997520446777</real><real>1.3892644643783569</real><real>1.0049998760223389</real><real>0.66999995708465576</real></array></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Teak%20weak.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Teak%20weak.xml
new file mode 100644
index 0000000..c865b39
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Teak%20weak.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.42000001668930054</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.42000001668930054</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.019999999552965164</real>
+            <real>0.059999998658895493</real>
+            <real>0.019999999552965164</real>
+            <real>0.059999998658895493</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.89999997615814209</real>
+            <real>0.71999996900558472</real>
+            <real>0.53999996185302734</real>
+            <real>1.0799999237060547</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.47999998927116394</real>
+            <real>0.23999999463558197</real>
+            <real>0.34999999403953552</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.17000000178813934</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.072908222972274</real>
+            <real>10.152564609237686</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00018999999156221747</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>9.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0.8796459436416626</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0799999237060547</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.101177011798768</real>
+            <real>0.0010000000397674888</real>
+            <real>-0.49498037251770732</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.52999997138977051</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.43309280276298523</real>
+            <real>0.82708048820495605</real>
+            <real>-0.35828551650047302</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>993</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.1676990985870361</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.9499999284744263</real>
+            <real>1.3799998760223389</real>
+            <real>1.6899898052215576</real>
+            <real>1.9499999284744263</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Wuxia%20nights.xml b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Wuxia%20nights.xml
new file mode 100644
index 0000000..2774c08
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/%5BTOR%5D%20Wuxia%20nights.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.87185126543045044</real>
+            <real>1.0359940528869629</real>
+            <real>1.4099999666213989</real>
+            <real>0.4699999988079071</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.5</real>
+            <real>0.019999999552965164</real>
+            <real>0.5</real>
+            <real>0.51999998092651367</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.84959989786148071</real>
+            <real>1.1799999475479126</real>
+            <real>1.1799999475479126</real>
+            <real>0.5899999737739563</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0</real>
+            <real>0.23999999463558197</real>
+            <real>0.34999999403953552</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>5.9584097862243652</real>
+            <real>6.9909601211547852</real>
+            <real>0.0099999997764825821</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.19999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00026999998954124749</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.69999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.6799999475479126</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>1</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>18</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>6.1512389183044434</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>1.6170113086700439</real>
+            <real>3</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%201.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%201.xml
new file mode 100644
index 0000000..896abf6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%201.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.35999998450279236</real>
+            <real>0.42000001668930054</real>
+            <real>0.42000001668930054</real>
+            <real>0.42000001668930054</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.51999998092651367</real>
+            <real>0.2800000011920929</real>
+            <real>0.51999998092651367</real>
+            <real>0.51999998092651367</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+            <real>0.68000000715255737</real>
+            <real>0.69999998807907104</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>0.79000002145767212</real>
+            <real>0.80000001192092896</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.39999997615814209</real>
+            <real>0.88999998569488525</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.28999999165534973</real>
+            <real>0.32999998331069946</real>
+            <real>0.039999999105930328</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.809999465942383</real>
+            <real>12.799999237060547</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00021999998716637492</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.8327431678771973</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>14.40000057220459</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.85000002384185791</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.0399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.049999997019767761</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.63680768013000488</real>
+            <real>0.043968122452497482</real>
+            <real>-0.76976805925369263</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>676.10003662109375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>0.043982300907373428</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.369999885559082</real>
+            <real>1.4099999666213989</real>
+            <real>1.0199999809265137</real>
+            <real>2.369999885559082</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%202.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%202.xml
new file mode 100644
index 0000000..3b170ac
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%202.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.84000003337860107</real>
+            <real>0.56999999284744263</real>
+            <real>0.56999999284744263</real>
+            <real>0.84000003337860107</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.0799999237060547</real>
+            <real>0.51999998092651367</real>
+            <real>0.51999998092651367</real>
+            <real>1.0799999237060547</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>0.25999999046325684</real>
+            <real>0.25999999046325684</real>
+            <real>0.57999998331069946</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>0.79000002145767212</real>
+            <real>0.80000001192092896</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.39999997615814209</real>
+            <real>0.88999998569488525</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.28999999165534973</real>
+            <real>0.32999998331069946</real>
+            <real>0.039999999105930328</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.809999465942383</real>
+            <real>12.799999237060547</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0002899999963119626</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>5.5999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.8327431678771973</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>14.40000057220459</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.85000002384185791</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.0399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.049999997019767761</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.63495957851409912</real>
+            <real>0.087851203978061676</real>
+            <real>-0.76753407716751099</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>676.10003662109375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>0.087964601814746857</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.2799999713897705</real>
+            <real>0.75</real>
+            <real>0.59999996423721313</real>
+            <real>2.2799999713897705</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%203.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%203.xml
new file mode 100644
index 0000000..5cc7a61
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%203.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.71999996900558472</real>
+            <real>0.71999996900558472</real>
+            <real>0.71999996900558472</real>
+            <real>0.23999999463558197</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0.094117648899555206</real>
+            <real>0.094117648899555206</real>
+            <real>0.15999999642372131</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.45999997854232788</real>
+            <real>0</real>
+            <real>0.039999999105930328</real>
+            <real>0.45999997854232788</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+            <real>0.14000000059604645</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.74000000953674316</real>
+            <real>0.93999999761581421</real>
+            <real>0.20999999344348907</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.52999997138977051</real>
+            <real>0.0099999997764825821</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>18</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.34000000357627869</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00018000000272877514</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>6.7000002861022949</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.5185837745666504</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>17.399999618530273</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.17000000178813934</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.3677685558795929</real>
+            <real>0.043968122452497482</real>
+            <real>-0.92887735366821289</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>1.0399999618530273</real>
+    <key>sun_angle</key>
+        <real>0.043982300907373428</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+            <real>1.5899999141693115</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%204.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%204.xml
new file mode 100644
index 0000000..d48a4a2
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%204.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.42000001668930054</real>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.42000001668930054</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.59999996423721313</real>
+            <real>0.15999999642372131</real>
+            <real>0.2199999988079071</real>
+            <real>0.59999996423721313</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.029999999329447746</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.079999998211860657</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.81999999284744263</real>
+            <real>0.18999999761581421</real>
+            <real>0.039999999105930328</real>
+            <real>0.81999999284744263</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.74000000953674316</real>
+            <real>0.93999999761581421</real>
+            <real>0.20999999344348907</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.52999997138977051</real>
+            <real>0.0099999997764825821</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>18</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00015999999595806003</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>17.399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.3247785568237305</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5299999713897705</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>17.399999618530273</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.079999998211860657</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.72615015506744385</real>
+            <real>0.087851203978061676</real>
+            <real>-0.68190038204193115</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1048</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>1.3199999332427979</real>
+    <key>sun_angle</key>
+        <real>0.087964601814746857</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.5899999141693115</real>
+            <real>0.47999998927116394</real>
+            <real>0.53999996185302734</real>
+            <real>1.5899999141693115</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%205.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%205.xml
new file mode 100644
index 0000000..3ceb600
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%205.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.77999997138977051</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.5799999237060547</real>
+            <real>0.45999997854232788</real>
+            <real>0.45999997854232788</real>
+            <real>1.5799999237060547</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.97999995946884155</real>
+            <real>0.34000000357627869</real>
+            <real>0.35999998450279236</real>
+            <real>0.97999995946884155</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.74000000953674316</real>
+            <real>0.93999999761581421</real>
+            <real>0.19999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>2.8600001335144043</real>
+            <real>17.589999675750732</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.42999997735023499</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00015999999595806003</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2.1000001430511475</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.7699110507965088</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.1100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>14.000000953674316</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.89999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.82999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.48999997973442078</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.58778512477874756</real>
+            <real>0</real>
+            <real>-0.80901706218719482</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>276</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>1.1699999570846558</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.099999994039535522</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Rouge%206.xml b/linden/indra/newview/app_settings/windlight/skies/Rouge%206.xml
new file mode 100644
index 0000000..c36da85
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Rouge%206.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.77999997138977051</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.58384609222412109</real>
+            <real>0.58384609222412109</real>
+            <real>0.32999998331069946</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0.34000000357627869</real>
+            <real>0.35999998450279236</real>
+            <real>0.37999999523162842</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.74000000953674316</real>
+            <real>0.93999999761581421</real>
+            <real>0.19999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.070000000298023224</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>2.8600001335144043</real>
+            <real>17.589999675750732</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.42999997735023499</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00015999999595806003</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2.1000001430511475</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.7699110507965088</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.1100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>14.000000953674316</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.89999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.82999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.58778512477874756</real>
+            <real>0</real>
+            <real>-0.80901706218719482</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>276</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>1.1699999570846558</real>
+    <key>sun_angle</key>
+        <real>0</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.29999998211860657</real>
+            <real>0.099999994039535522</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Arrakissed%20variation.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Arrakissed%20variation.xml
new file mode 100644
index 0000000..138b9c3
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Arrakissed%20variation.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0</real>
+    <key>fresnelOffset</key>
+        <real>0.44999998807907104</real>
+    <key>fresnelScale</key>
+        <real>0.29999998211860657</real>
+    <key>normScale</key>
+        <array>
+            <real>4.2000002861022949</real>
+            <real>3.2000000476837158</real>
+            <real>5</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>d0512dd3-2d6f-8970-1d16-3829d8f8299d</uuid>
+    <key>scaleAbove</key>
+        <real>0.39999997615814209</real>
+    <key>scaleBelow</key>
+        <real>0.2800000011920929</real>
+    <key>underWaterFogMod</key>
+        <real>0.98999994993209839</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0.5</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>29.857057571411133</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>1.2199999094009399</real>
+            <real>-0.22000008821487427</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-2.7200000286102295</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist%202.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist%202.xml
new file mode 100644
index 0000000..c0c422b
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist%202.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.010000000707805157</real>
+    <key>fresnelOffset</key>
+        <real>0.87000000476837158</real>
+    <key>fresnelScale</key>
+        <real>0.70999997854232788</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0.30000001192092896</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>d727239c-056f-cce0-0681-e190ba7d9e50</uuid>
+    <key>scaleAbove</key>
+        <real>0.099999994039535522</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>0.25</real>
+            <real>0.5</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>0.57434922456741333</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.10000008344650269</real>
+            <real>-0.11000008881092072</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-0.12000008672475815</real>
+            <real>0.23999990522861481</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist.xml
new file mode 100644
index 0000000..49aa4e1
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Atomist.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0020000000949949026</real>
+    <key>fresnelOffset</key>
+        <real>0.87999999523162842</real>
+    <key>fresnelScale</key>
+        <real>1</real>
+    <key>normScale</key>
+        <array>
+            <real>0.30000001192092896</real>
+            <real>0.60000002384185791</real>
+            <real>1.2000000476837158</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.099999994039535522</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>0.25</real>
+            <real>0.5</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>0.088388346135616302</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.10000008344650269</real>
+            <real>-0.11000008881092072</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-0.12000008672475815</real>
+            <real>0.23999990522861481</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Bayouette.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Bayouette.xml
new file mode 100644
index 0000000..2ab6743
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Bayouette.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.024000000208616257</real>
+    <key>fresnelOffset</key>
+        <real>0.42999997735023499</real>
+    <key>fresnelScale</key>
+        <real>0.17000000178813934</real>
+    <key>normScale</key>
+        <array>
+            <real>1.8999999761581421</real>
+            <real>1.1000000238418579</real>
+            <real>0.69999998807907104</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.039999999105930328</real>
+    <key>scaleBelow</key>
+        <real>0.15999999642372131</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.79999995231628418</real>
+            <real>0.40000015497207642</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>18.379177093505859</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.58000010251998901</real>
+            <real>-0.21000008285045624</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.46999990940093994</real>
+            <real>-0.16000008583068848</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Chivandria%20clair.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Chivandria%20clair.xml
new file mode 100644
index 0000000..6f4ac78
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Chivandria%20clair.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0</real>
+    <key>fresnelOffset</key>
+        <real>0.65999996662139893</real>
+    <key>fresnelScale</key>
+        <real>0.059999998658895493</real>
+    <key>normScale</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>1a29d128-f6cb-874f-b39a-bbb68605f950</uuid>
+    <key>scaleAbove</key>
+        <real>1</real>
+    <key>scaleBelow</key>
+        <real>0.099999994039535522</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.5</real>
+            <real>0</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>0.5</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.260000079870224</real>
+            <real>-0.260000079870224</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-0.260000079870224</real>
+            <real>-0.260000079870224</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Claira.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Claira.xml
new file mode 100644
index 0000000..d6476dd
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Claira.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.017000000923871994</real>
+    <key>fresnelOffset</key>
+        <real>0.69999998807907104</real>
+    <key>fresnelScale</key>
+        <real>0.59999996423721313</real>
+    <key>normScale</key>
+        <array>
+            <real>2</real>
+            <real>1</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.049999997019767761</real>
+    <key>scaleBelow</key>
+        <real>0.099999994039535522</real>
+    <key>underWaterFogMod</key>
+        <real>0</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.059999998658895493</real>
+            <real>0.37999999523162842</real>
+            <real>0.52999997138977051</real>
+            <real>0.52999997138977051</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>1</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-1.3300000429153442</real>
+            <real>-1.8799999952316284</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-1.8100000619888306</real>
+            <real>-1.3300000429153442</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Coral%20reef.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Coral%20reef.xml
new file mode 100644
index 0000000..0da3e52
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Coral%20reef.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0080000003799796104</real>
+    <key>fresnelOffset</key>
+        <real>1</real>
+    <key>fresnelScale</key>
+        <real>1</real>
+    <key>normScale</key>
+        <array>
+            <real>10</real>
+            <real>5</real>
+            <real>2.5</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>2211e97d-e6ed-c592-3bac-c00cad2a86c0</uuid>
+    <key>scaleAbove</key>
+        <real>0.039999999105930328</real>
+    <key>scaleBelow</key>
+        <real>0.039999999105930328</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>1</real>
+            <real>0.5</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>0.61557221412658691</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.20000007748603821</real>
+            <real>-0.25000008940696716</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.099999904632568359</real>
+            <real>0.14999990165233612</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Crosshatched%20plans.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Crosshatched%20plans.xml
new file mode 100644
index 0000000..cee0a26
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Crosshatched%20plans.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0040000001899898052</real>
+    <key>fresnelOffset</key>
+        <real>0.5899999737739563</real>
+    <key>fresnelScale</key>
+        <real>0.17999999225139618</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>1.6000000238418579</real>
+            <real>0.5</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>22229d16-3871-7dee-2042-dbfa25cd8bce</uuid>
+    <key>scaleAbove</key>
+        <real>0.049999997019767761</real>
+    <key>scaleBelow</key>
+        <real>0.14999999105930328</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0.39999997615814209</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>4.9245781898498535</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-1.0500000715255737</real>
+            <real>-1.0500000715255737</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-1.0500000715255737</real>
+            <real>-0.95000004768371582</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Eyeballin%27.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Eyeballin%27.xml
new file mode 100644
index 0000000..d95bd6d
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Eyeballin%27.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0</real>
+    <key>fresnelOffset</key>
+        <real>0.87999999523162842</real>
+    <key>fresnelScale</key>
+        <real>0.64999997615814209</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.0099999997764825821</real>
+    <key>scaleBelow</key>
+        <real>0.019999999552965164</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>3.2490098476409912</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.049999907612800598</real>
+            <real>0.10999990999698639</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.049999907612800598</real>
+            <real>0.11999990791082382</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Fantastuck.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Fantastuck.xml
new file mode 100644
index 0000000..652efdb
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Fantastuck.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0070000002160668373</real>
+    <key>fresnelOffset</key>
+        <real>1</real>
+    <key>fresnelScale</key>
+        <real>0.26999998092651367</real>
+    <key>normScale</key>
+        <array>
+            <real>3.1000001430511475</real>
+            <real>2.6000001430511475</real>
+            <real>1.3999999761581421</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>5748decc-f629-461c-9a36-a35a221fe21f</uuid>
+    <key>scaleAbove</key>
+        <real>0.049999997019767761</real>
+    <key>scaleBelow</key>
+        <real>0</real>
+    <key>underWaterFogMod</key>
+        <real>0</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>0.5</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>1</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.010000089183449745</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>0.009999910369515419</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Featuresque.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Featuresque.xml
new file mode 100644
index 0000000..98bec18
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Featuresque.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0</real>
+    <key>fresnelOffset</key>
+        <real>0.79999995231628418</real>
+    <key>fresnelScale</key>
+        <real>1</real>
+    <key>normScale</key>
+        <array>
+            <real>4.7000002861022949</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>f9df2fcd-4895-77ec-3fcd-4cb1cef21588</uuid>
+    <key>scaleAbove</key>
+        <real>0.039999999105930328</real>
+    <key>scaleBelow</key>
+        <real>0</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.79999995231628418</real>
+            <real>0.40000015497207642</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>18.379177093505859</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.58000010251998901</real>
+            <real>-0.21000008285045624</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.46999990940093994</real>
+            <real>-0.16000008583068848</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Freak%2DA%2Ddermia.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Freak%2DA%2Ddermia.xml
new file mode 100644
index 0000000..d9c715a
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Freak%2DA%2Ddermia.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0</real>
+    <key>fresnelOffset</key>
+        <real>1</real>
+    <key>fresnelScale</key>
+        <real>1</real>
+    <key>normScale</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>1a29d128-f6cb-874f-b39a-bbb68605f950</uuid>
+    <key>scaleAbove</key>
+        <real>1</real>
+    <key>scaleBelow</key>
+        <real>1</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0.5</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>32</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>3.9999997615814209</real>
+            <real>3.9999997615814209</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>3.9999997615814209</real>
+            <real>3.9999997615814209</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Glaznost.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Glaznost.xml
new file mode 100644
index 0000000..267f786
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Glaznost.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.082000002264976501</real>
+    <key>fresnelOffset</key>
+        <real>0.66999995708465576</real>
+    <key>fresnelScale</key>
+        <real>0</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0</real>
+    <key>scaleBelow</key>
+        <real>0</real>
+    <key>underWaterFogMod</key>
+        <real>0</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.049999997019767761</real>
+            <real>0.37999999523162842</real>
+            <real>0.52999997138977051</real>
+            <real>0.52999997138977051</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>1</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Grantamount.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Grantamount.xml
new file mode 100644
index 0000000..4ec8b36
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Grantamount.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.16000001132488251</real>
+    <key>fresnelOffset</key>
+        <real>1</real>
+    <key>fresnelScale</key>
+        <real>1</real>
+    <key>normScale</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.88999998569488525</real>
+    <key>scaleBelow</key>
+        <real>1</real>
+    <key>underWaterFogMod</key>
+        <real>0.31999999284744263</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0.5</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>1024</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-4</real>
+            <real>-3.8299999237060547</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-4</real>
+            <real>-3.8299999237060547</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Hpmod.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Hpmod.xml
new file mode 100644
index 0000000..10994dc
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Hpmod.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.014000000432133675</real>
+    <key>fresnelOffset</key>
+        <real>0.65999996662139893</real>
+    <key>fresnelScale</key>
+        <real>0.070000000298023224</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0</real>
+    <key>scaleBelow</key>
+        <real>0</real>
+    <key>underWaterFogMod</key>
+        <real>0</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.059999998658895493</real>
+            <real>0.37999999523162842</real>
+            <real>0.52999997138977051</real>
+            <real>0.52999997138977051</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>64</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Ice%2Dlike.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Ice%2Dlike.xml
new file mode 100644
index 0000000..8489a2e
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Ice%2Dlike.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.040000002831220627</real>
+    <key>fresnelOffset</key>
+        <real>0.25</real>
+    <key>fresnelScale</key>
+        <real>0.5</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0</real>
+    <key>scaleBelow</key>
+        <real>0</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>64</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Impure.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Impure.xml
new file mode 100644
index 0000000..b118198
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Impure.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.01100000087171793</real>
+    <key>fresnelOffset</key>
+        <real>0.39999997615814209</real>
+    <key>fresnelScale</key>
+        <real>0.55000001192092896</real>
+    <key>normScale</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>0db3718c-49e9-ad61-b6c4-4e5b84d9e589</uuid>
+    <key>scaleAbove</key>
+        <real>0.15999999642372131</real>
+    <key>scaleBelow</key>
+        <real>0.34999999403953552</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>16</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.16000008583068848</real>
+            <real>-0.21000008285045624</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-0.32000008225440979</real>
+            <real>-0.32000008225440979</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Linear%20puddles.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Linear%20puddles.xml
new file mode 100644
index 0000000..08d82a6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Linear%20puddles.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.024000000208616257</real>
+    <key>fresnelOffset</key>
+        <real>0.50999999046325684</real>
+    <key>fresnelScale</key>
+        <real>0.81000000238418579</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>2</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>78b6ea66-f557-811f-dec7-b21552cc5c51</uuid>
+    <key>scaleAbove</key>
+        <real>0.039999999105930328</real>
+    <key>scaleBelow</key>
+        <real>0.029999999329447746</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>0.43750005960464478</real>
+            <real>0.43749997019767761</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>8.574188232421875</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-1.0500000715255737</real>
+            <real>-1.0000001192092896</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-1.3200000524520874</real>
+            <real>-1.4200000762939453</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Listeryne.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Listeryne.xml
new file mode 100644
index 0000000..1036fe4
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Listeryne.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.018000001087784767</real>
+    <key>fresnelOffset</key>
+        <real>0.47999998927116394</real>
+    <key>fresnelScale</key>
+        <real>0.11999999731779099</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>1.6000000238418579</real>
+            <real>1.7000000476837158</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>2124abf0-8733-8e3e-ff9b-2245f11884f5</uuid>
+    <key>scaleAbove</key>
+        <real>0.049999997019767761</real>
+    <key>scaleBelow</key>
+        <real>0.099999994039535522</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>0.5</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>1.4142136573791504</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.8899998664855957</real>
+            <real>0.52999991178512573</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-0.47000008821487427</real>
+            <real>-0.11000008881092072</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Liz%20Taylor.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Liz%20Taylor.xml
new file mode 100644
index 0000000..c36dd7f
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Liz%20Taylor.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.029000001028180122</real>
+    <key>fresnelOffset</key>
+        <real>0.37999999523162842</real>
+    <key>fresnelScale</key>
+        <real>0.23999999463558197</real>
+    <key>normScale</key>
+        <array>
+            <real>1</real>
+            <real>0.90000003576278687</real>
+            <real>0.60000002384185791</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>d727239c-056f-cce0-0681-e190ba7d9e50</uuid>
+    <key>scaleAbove</key>
+        <real>0.059999998658895493</real>
+    <key>scaleBelow</key>
+        <real>0.11999999731779099</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.47399908304214478</real>
+            <real>0.361328125</real>
+            <real>0.638671875</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>14.928528785705566</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.42000007629394531</real>
+            <real>-0.050000086426734924</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-0.050000086426734924</real>
+            <real>-0.050000086426734924</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Maldives.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Maldives.xml
new file mode 100644
index 0000000..6da53e8
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Maldives.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0030000000260770321</real>
+    <key>fresnelOffset</key>
+        <real>0.50999999046325684</real>
+    <key>fresnelScale</key>
+        <real>0.19999998807907104</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.079999998211860657</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0.5</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>21.112127304077148</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.17000000178813934</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Meridian%20verde.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Meridian%20verde.xml
new file mode 100644
index 0000000..6e52b20
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Meridian%20verde.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.01900000125169754</real>
+    <key>fresnelOffset</key>
+        <real>0.38999998569488525</real>
+    <key>fresnelScale</key>
+        <real>0.62999999523162842</real>
+    <key>normScale</key>
+        <array>
+            <real>3.2000000476837158</real>
+            <real>2.7000000476837158</real>
+            <real>1.8999999761581421</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>1a5348cb-7164-b03e-8a45-70ad4cabe682</uuid>
+    <key>scaleAbove</key>
+        <real>0.19999998807907104</real>
+    <key>scaleBelow</key>
+        <real>0.19999998807907104</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>0.25</real>
+            <real>0.25</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>3.4822025299072266</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-1.0000001192092896</real>
+            <real>-0.90000009536743164</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-0.80000007152557373</real>
+            <real>-0.70000004768371582</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Negative%20ultraspace.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Negative%20ultraspace.xml
new file mode 100644
index 0000000..3cb1d07
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Negative%20ultraspace.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0080000003799796104</real>
+    <key>fresnelOffset</key>
+        <real>1</real>
+    <key>fresnelScale</key>
+        <real>1</real>
+    <key>normScale</key>
+        <array>
+            <real>10</real>
+            <real>5</real>
+            <real>2.5</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>2211e97d-e6ed-c592-3bac-c00cad2a86c0</uuid>
+    <key>scaleAbove</key>
+        <real>0.039999999105930328</real>
+    <key>scaleBelow</key>
+        <real>0.039999999105930328</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>1</real>
+            <real>0.5</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>0.61557221412658691</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.20000007748603821</real>
+            <real>-0.25000008940696716</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.099999904632568359</real>
+            <real>0.14999990165233612</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Placida%20brite.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Placida%20brite.xml
new file mode 100644
index 0000000..b822322
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Placida%20brite.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.01100000087171793</real>
+    <key>fresnelOffset</key>
+        <real>0.65999996662139893</real>
+    <key>fresnelScale</key>
+        <real>0</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0</real>
+    <key>scaleBelow</key>
+        <real>0</real>
+    <key>underWaterFogMod</key>
+        <real>0</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0.5</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>1</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.010000089183449745</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>0.009999910369515419</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Pretty%20placid.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Pretty%20placid.xml
new file mode 100644
index 0000000..4f5a18b
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Pretty%20placid.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.013000000268220901</real>
+    <key>fresnelOffset</key>
+        <real>0.39999997615814209</real>
+    <key>fresnelScale</key>
+        <real>0.19999998807907104</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0.20000000298023224</real>
+            <real>0.40000000596046448</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>0db3718c-49e9-ad61-b6c4-4e5b84d9e589</uuid>
+    <key>scaleAbove</key>
+        <real>0.049999997019767761</real>
+    <key>scaleBelow</key>
+        <real>0.10999999940395355</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.19013670086860657</real>
+            <real>0.2818920910358429</real>
+            <real>0.39986327290534973</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>4.5947937965393066</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.010000089183449745</real>
+            <real>-0.020000088959932327</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.24999991059303284</real>
+            <real>0.39999991655349731</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Raw%20sewage.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Raw%20sewage.xml
new file mode 100644
index 0000000..d072409
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Raw%20sewage.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0</real>
+    <key>fresnelOffset</key>
+        <real>0.19999998807907104</real>
+    <key>fresnelScale</key>
+        <real>0.79999995231628418</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>56b9a89e-6851-0ca6-6200-beddd03e08e0</uuid>
+    <key>scaleAbove</key>
+        <real>0</real>
+    <key>scaleBelow</key>
+        <real>0</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.15906250476837158</real>
+            <real>0.13064941763877869</real>
+            <real>0.00093749165534973145</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>16</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Showing%20age.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Showing%20age.xml
new file mode 100644
index 0000000..deb6638
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Showing%20age.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.02200000174343586</real>
+    <key>fresnelOffset</key>
+        <real>0.099999994039535522</real>
+    <key>fresnelScale</key>
+        <real>0.91999995708465576</real>
+    <key>normScale</key>
+        <array>
+            <real>10</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>56b9a89e-6851-0ca6-6200-beddd03e08e0</uuid>
+    <key>scaleAbove</key>
+        <real>0.31999999284744263</real>
+    <key>scaleBelow</key>
+        <real>0.15999999642372131</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.084000006318092346</real>
+            <real>0.1586667001247406</real>
+            <real>0.19599999487400055</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>29.857057571411133</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.32000008225440979</real>
+            <real>-0.260000079870224</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-0.260000079870224</real>
+            <real>-0.32000008225440979</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Soldier%27s%20legacy.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Soldier%27s%20legacy.xml
new file mode 100644
index 0000000..9b93f3a
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Soldier%27s%20legacy.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.040000002831220627</real>
+    <key>fresnelOffset</key>
+        <real>0.32999998331069946</real>
+    <key>fresnelScale</key>
+        <real>0.62999999523162842</real>
+    <key>normScale</key>
+        <array>
+            <real>3</real>
+            <real>3.1000001430511475</real>
+            <real>3.2000000476837158</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>0297ce61-77f8-581e-b19d-2509881463e8</uuid>
+    <key>scaleAbove</key>
+        <real>0.039999999105930328</real>
+    <key>scaleBelow</key>
+        <real>0.14999999105930328</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.1803436279296875</real>
+            <real>0.2337188720703125</real>
+            <real>0.19869136810302734</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>64</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-1.6800000667572021</real>
+            <real>-1.6800000667572021</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.46999990940093994</real>
+            <real>0.31999990344047546</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Subtleties.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Subtleties.xml
new file mode 100644
index 0000000..e8b730d
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Subtleties.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0040000001899898052</real>
+    <key>fresnelOffset</key>
+        <real>0.47999998927116394</real>
+    <key>fresnelScale</key>
+        <real>0.32999998331069946</real>
+    <key>normScale</key>
+        <array>
+            <real>1.2000000476837158</real>
+            <real>1.3000000715255737</real>
+            <real>1.3999999761581421</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.079999998211860657</real>
+    <key>scaleBelow</key>
+        <real>0.15999999642372131</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.065683603286743164</real>
+            <real>0.41682437062263489</real>
+            <real>0.52431637048721313</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>5.6568551063537598</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.45999988913536072</real>
+            <real>-0.18000008165836334</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-0.260000079870224</real>
+            <real>-0.69000005722045898</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Trandshan.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Trandshan.xml
new file mode 100644
index 0000000..d0211b6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Trandshan.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.069000005722045898</real>
+    <key>fresnelOffset</key>
+        <real>0.59999996423721313</real>
+    <key>fresnelScale</key>
+        <real>0.41999998688697815</real>
+    <key>normScale</key>
+        <array>
+            <real>2</real>
+            <real>1</real>
+            <real>2</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.11999999731779099</real>
+    <key>scaleBelow</key>
+        <real>0.28999999165534973</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>0.5</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>12.125733375549316</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.84000009298324585</real>
+            <real>-0.95000004768371582</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-2</real>
+            <real>-1.0500000715255737</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Watermelon%20juice.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Watermelon%20juice.xml
new file mode 100644
index 0000000..b6413a9
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Watermelon%20juice.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0050000003539025784</real>
+    <key>fresnelOffset</key>
+        <real>0.43999999761581421</real>
+    <key>fresnelScale</key>
+        <real>0.14000000059604645</real>
+    <key>normScale</key>
+        <array>
+            <real>3</real>
+            <real>3</real>
+            <real>3</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.14000000059604645</real>
+    <key>scaleBelow</key>
+        <real>0.2800000011920929</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0.5</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>21.112127304077148</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.43999990820884705</real>
+            <real>0.43999990820884705</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.43999990820884705</real>
+            <real>0.43999990820884705</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Waterslides.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Waterslides.xml
new file mode 100644
index 0000000..097748d
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Waterslides.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0040000001899898052</real>
+    <key>fresnelOffset</key>
+        <real>0.59999996423721313</real>
+    <key>fresnelScale</key>
+        <real>0.64999997615814209</real>
+    <key>normScale</key>
+        <array>
+            <real>2</real>
+            <real>4</real>
+            <real>8</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.039999999105930328</real>
+    <key>scaleBelow</key>
+        <real>0.079999998211860657</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>2.1435470581054687</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-2</real>
+            <real>-2</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.99999988079071045</real>
+            <real>0.99999988079071045</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20What%27s%20on%20TV.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20What%27s%20on%20TV.xml
new file mode 100644
index 0000000..beed3cc
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20What%27s%20on%20TV.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.040000002831220627</real>
+    <key>fresnelOffset</key>
+        <real>1</real>
+    <key>fresnelScale</key>
+        <real>1</real>
+    <key>normScale</key>
+        <array>
+            <real>10</real>
+            <real>5</real>
+            <real>2.5</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>22229d16-3871-7dee-2042-dbfa25cd8bce</uuid>
+    <key>scaleAbove</key>
+        <real>0.039999999105930328</real>
+    <key>scaleBelow</key>
+        <real>0.039999999105930328</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>0.26794338226318359</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>3.9999997615814209</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-4</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Wickedly.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Wickedly.xml
new file mode 100644
index 0000000..510614c
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Wickedly.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0</real>
+    <key>fresnelOffset</key>
+        <real>1</real>
+    <key>fresnelScale</key>
+        <real>0</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>cb51029b-360b-81e6-a3e1-5620c44e0b71</uuid>
+    <key>scaleAbove</key>
+        <real>0.50999999046325684</real>
+    <key>scaleBelow</key>
+        <real>0.099999994039535522</real>
+    <key>underWaterFogMod</key>
+        <real>0</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.5</real>
+            <real>0</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>25.992082595825195</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-2.3900001049041748</real>
+            <real>-1.8900001049041748</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-1.3300000429153442</real>
+            <real>-1.0000001192092896</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20You%27re%20in%20luck.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20You%27re%20in%20luck.xml
new file mode 100644
index 0000000..72fe40d
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20You%27re%20in%20luck.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0</real>
+    <key>fresnelOffset</key>
+        <real>0.50999999046325684</real>
+    <key>fresnelScale</key>
+        <real>0.48999997973442078</real>
+    <key>normScale</key>
+        <array>
+            <real>3</real>
+            <real>2.9000000953674316</real>
+            <real>2.7999999523162842</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.099999994039535522</real>
+    <key>scaleBelow</key>
+        <real>0.099999994039535522</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.63937491178512573</real>
+            <real>0.65999996662139893</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>6.4980192184448242</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>0.099999904632568359</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.19999989867210388</real>
+            <real>0.2999998927116394</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Yung%20buk.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Yung%20buk.xml
new file mode 100644
index 0000000..2067b7c
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Yung%20buk.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.048000000417232513</real>
+    <key>fresnelOffset</key>
+        <real>0.72999995946884155</real>
+    <key>fresnelScale</key>
+        <real>0.26999998092651367</real>
+    <key>normScale</key>
+        <array>
+            <real>3.1000001430511475</real>
+            <real>2.6000001430511475</real>
+            <real>2.7000000476837158</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>5748decc-f629-461c-9a36-a35a221fe21f</uuid>
+    <key>scaleAbove</key>
+        <real>0</real>
+    <key>scaleBelow</key>
+        <real>0</real>
+    <key>underWaterFogMod</key>
+        <real>0</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>0.5</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>4</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.010000089183449745</real>
+            <real>-8.9406967163085938e-008</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-8.9406967163085938e-008</real>
+            <real>0.009999910369515419</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/floaterlogin.cpp b/linden/indra/newview/floaterlogin.cpp
new file mode 100644
index 0000000..f1afc53
--- /dev/null
+++ b/linden/indra/newview/floaterlogin.cpp
@@ -0,0 +1,723 @@
+/*
+ *  floaterlogin.cpp (floatergridmanager.cpp pls)
+ *  This is Meerkats grid manager, and I accidentally finished it with the wrong name :)
+ *  -Patrick Sapinski (Monday, August 17, 2009)
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include <boost/algorithm/string.hpp>
+#include "llviewercontrol.h"
+#include "llviewerbuild.h"
+#include "llcombobox.h"
+#include "llscrolllistctrl.h"
+#include "llmd5.h"
+#include "llurlsimstring.h"
+#include "lluictrlfactory.h"
+#include "floaterlogin.h"
+#include "hippoGridManager.h"
+#include "llviewernetwork.h"
+#include "llpanellogin.h"
+
+#define PASSWORD_FILLER "123456789!123456"
+
+LoginFloater* LoginFloater::sInstance = NULL;
+LoginController* LoginFloater::sController = NULL;
+bool LoginFloater::sIsInitialLogin;
+std::string LoginFloater::sGrid;
+
+LoginFloater::LoginFloater()
+:       LLFloater("floater_login")
+{
+        
+        mState = NORMAL;
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_login.xml");
+        
+        
+        llwarns << "LoginFloater called" << llendl;
+        
+
+        // configure the floater interface for non-initial login
+        setCanMinimize(!sIsInitialLogin);
+        setCanClose(!sIsInitialLogin);
+        setCanDrag(!sIsInitialLogin);
+        childSetVisible("server_combo", sIsInitialLogin);
+        
+        if(!sIsInitialLogin)
+        {
+                LLButton* quit_btn = getChild<LLButton>("quit_btn");
+                quit_btn->setLabel(std::string("Cancel"));
+                setTitle(std::string("Grid Manager"));
+        }
+        
+        center();
+        LLLineEditor* edit = getChild<LLLineEditor>("avatar_password_edit");
+        if (edit) edit->setDrawAsterixes(TRUE);
+        LLComboBox* combo = getChild<LLComboBox>("start_location_combo");
+        combo->setAllowTextEntry(TRUE, 128, FALSE);
+        
+        BOOL login_last = gSavedSettings.getBOOL("LoginLastLocation");
+        std::string sim_string = LLURLSimString::sInstance.mSimString;
+        if (!sim_string.empty())
+        {
+                // Replace "<Type region name>" with this region name
+                combo->remove(2);
+                combo->add( sim_string );
+                combo->setTextEntry(sim_string);
+                combo->setCurrentByIndex( 2 );
+        }
+        else if (login_last)
+        {
+                combo->setCurrentByIndex( 1 );
+        }
+        else
+        {
+                combo->setCurrentByIndex( 0 );
+        }
+}
+
+
+LoginFloater::~LoginFloater()
+{
+        LoginFloater::sController = NULL;
+        LoginFloater::sInstance = NULL;
+}
+
+void LoginFloater::close()
+{
+        if(sInstance)
+        {
+                delete sInstance;
+                sInstance = NULL;
+        }
+}
+
+BOOL LoginFloater::postBuild()
+{
+        requires<LLScrollListCtrl>("grid_selector");
+        requires<LLLineEditor>("gridnick");
+        requires<LLLineEditor>("gridname");
+        requires<LLLineEditor>("loginuri");
+        requires<LLLineEditor>("loginpage");
+        requires<LLLineEditor>("helperuri");
+        requires<LLLineEditor>("website");
+        requires<LLLineEditor>("support");
+        requires<LLLineEditor>("register");
+        requires<LLLineEditor>("password");
+        requires<LLLineEditor>("first_name");
+        requires<LLLineEditor>("last_name");
+        requires<LLLineEditor>("avatar_password");
+        //requires<LLLineEditor>("search");
+        requires<LLButton>("btn_delete");
+        requires<LLButton>("btn_add");
+        requires<LLButton>("btn_copy");
+        requires<LLButton>("set_default");
+        requires<LLButton>("btn_gridinfo");
+        requires<LLButton>("btn_help_render_compat");
+        if (!checkRequirements()) return false;
+        LLLineEditor* password_edit = getChild<LLLineEditor>("avatar_password");
+        if (password_edit) password_edit->setDrawAsterixes(TRUE);
+
+        childSetAction("btn_delete", onClickDelete, this);
+        childSetAction("btn_add", onClickAdd, this);
+        childSetAction("btn_copy", onClickCopy, this);
+        childSetAction("btn_ok", onClickOk, this);
+        childSetAction("btn_apply", onClickApply, this);
+        // childSetAction("set_default", onClickDefault, this);
+        childSetAction("btn_cancel", onClickCancel, this);
+        childSetAction("btn_gridinfo", onClickGridInfo, this);
+        // childSetAction("btn_help_render_compat", onClickHelpRenderCompat, this);
+
+        childSetCommitCallback("grid_selector", onSelectGrid, this);
+//KOW   childSetCommitCallback("platform", onSelectPlatform, this);
+
+        // !!!###       server_choice_combo->setFocusLostCallback(onServerComboLostFocus);
+
+//KOW   update();
+        return TRUE;
+}
+
+void LoginFloater::refresh_grids()
+{
+        const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick();
+        LLScrollListCtrl *grids = sInstance->getChild<LLScrollListCtrl>("grid_selector");
+        S32 selectIndex = -1, i = 0;
+        grids->deleteAllItems();
+        if (defaultGrid != "") {
+                LLSD value;
+                value["id"] = defaultGrid;
+                value["columns"][0]["column"] = "grid";
+                value["columns"][0]["value"] = defaultGrid;
+                grids->addElement(value);
+                selectIndex = i++;
+        }
+        
+        HippoGridManager::GridIterator it, end = gHippoGridManager->endGrid();
+        for (it = gHippoGridManager->beginGrid(); it != end; ++it) {
+                const std::string &grid = it->second->getGridNick();
+                if (grid != defaultGrid) {
+                        LLSD value;
+                        value["id"] = grid;
+                        value["columns"][0]["column"] = "grid";
+                        value["columns"][0]["value"] = grid;
+                        grids->addElement(value);
+
+                        if (grid == sInstance->mCurGrid) selectIndex = i;
+                        i++;
+                }
+        }
+        if ((sInstance->mState == ADD_NEW) || (sInstance->mState == ADD_COPY)) {
+                grids->addElement("<new>");
+                selectIndex = i++;
+        }
+        if (selectIndex >= 0) {
+                //grids->setCurrentByIndex(selectIndex);
+        } else {
+                //grids->setLabel(LLStringExplicit(""));  // LLComboBox::removeall() does not clear the label
+        }
+                        
+        // sInstance->childSetTextArg("default_grid", "[DEFAULT]", (defaultGrid != "")? defaultGrid: " ");
+
+        sInstance->childSetEnabled("btn_delete", (selectIndex >= 0));
+        sInstance->childSetEnabled("btn_copy", (sInstance->mState == NORMAL) && (selectIndex >= 0));
+        // sInstance->childSetEnabled("set_default", (sInstance->mState == NORMAL) && (selectIndex > 0));
+        sInstance->childSetEnabled("gridnick", (sInstance->mState == ADD_NEW) || (sInstance->mState == ADD_COPY));
+
+        if (sInstance->mState == NORMAL) {
+                HippoGridInfo *gridInfo = gHippoGridManager->getGrid(sInstance->mCurGrid);
+                if (gridInfo) {
+                        sInstance->childSetText("gridnick", gridInfo->getGridNick());
+                        //sInstance->childSetText("grid_name", gridInfo->getGridName());
+                        sInstance->childSetText("loginuri", gridInfo->getLoginUri());
+                        sInstance->childSetText("loginpage", gridInfo->getLoginPage());
+                        sInstance->childSetText("helperuri", gridInfo->getHelperUri());
+                        sInstance->childSetText("website", gridInfo->getWebSite());
+                        sInstance->childSetText("support", gridInfo->getSupportUrl());
+                        sInstance->childSetText("register", gridInfo->getRegisterUrl());
+                        sInstance->childSetText("password", gridInfo->getPasswordUrl());
+
+                        // sInstance->childSetText("first_name", gridInfo->getFirstName());
+                        // sInstance->childSetText("last_name", gridInfo->getLastName());
+                        // if(gridInfo->getAvatarPassword().length() == 32)
+                        //      sInstance->childSetText("avatar_password", std::string(PASSWORD_FILLER));
+                        // else if(gridInfo->getPasswordUrl().empty())
+                        //      sInstance->childSetText("avatar_password", std::string(""));
+
+                        // if (gridInfo->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
+                        //      //childSetEnabled("search", false);
+                        //      //childSetText("search", LLStringExplicit(""));
+                        //      childSetEnabled("render_compat", false);
+                        //      childSetValue("render_compat", false);
+                        // } else {
+                        //      //childSetEnabled("search", true);
+                        //      //childSetText("search", gridInfo->getSearchUrl());
+                        //      childSetEnabled("render_compat", true);
+                        //      childSetValue("render_compat", gridInfo->isRenderCompat());
+                        // }
+
+                }       else {
+                        std::string empty = "";
+                        sInstance->childSetText("gridnick", empty);
+                        sInstance->childSetText("gridname", empty);
+                        sInstance->childSetText("loginuri", empty);
+                        sInstance->childSetText("loginpage", empty);
+                        sInstance->childSetText("helperuri", empty);
+                        sInstance->childSetText("website", empty);
+                        // sInstance->childSetText("first_name", empty);
+                        // sInstance->childSetText("last_name", empty);
+                        // sInstance->childSetText("avatar_password", empty);
+                }
+        } else if (sInstance->mState == ADD_NEW) {
+                        llwarns << "ADD_NEW" << llendl;
+                std::string required = "<required>";
+                std::string empty = "";
+                sInstance->childSetText("gridnick", required);
+                sInstance->childSetText("gridname", empty);
+                sInstance->childSetText("loginuri", required);
+                sInstance->childSetText("loginpage", empty);
+                sInstance->childSetText("helperuri", empty);
+                sInstance->childSetText("website", empty);
+                sInstance->childSetText("support", empty);
+                sInstance->childSetText("register", empty);
+                sInstance->childSetText("password", empty);
+                // sInstance->childSetText("first_name", empty);
+                // sInstance->childSetText("last_name", empty);
+                // sInstance->childSetText("avatar_password", empty);
+                //childSetEnabled("search", true);
+                //childSetText("search", empty);
+        } else if (sInstance->mState == ADD_COPY) {
+                        llwarns << "ADD_COPY" << llendl;
+                sInstance->childSetText("gridnick", LLStringExplicit("<required>"));
+        } else {
+                llwarns << "Illegal state " << sInstance->mState << '.' << llendl;      
+        }
+        return;
+}
+
+void LoginFloater::update()
+{
+        mState = NORMAL;
+        mCurGrid = gHippoGridManager->getCurrentGridNick();
+        refresh_grids();
+        //KOW gHippoLimits->setLimits();
+}
+
+void LoginFloater::applyChanges()
+{ 
+        HippoGridInfo *gridInfo = gHippoGridManager->getGrid(mCurGrid);
+        if (gridInfo) 
+        {
+                if (gridInfo->getGridNick() == childGetValue("gridnick").asString()) 
+                {
+                        gridInfo->setGridName(childGetValue("gridname"));
+                        gridInfo->setLoginUri(childGetValue("loginuri"));
+                        gridInfo->setLoginPage(childGetValue("loginpage"));
+                        gridInfo->setHelperUri(childGetValue("helperuri"));
+                        gridInfo->setWebSite(childGetValue("website"));
+                        gridInfo->setSupportUrl(childGetValue("support"));
+                        gridInfo->setRegisterUrl(childGetValue("register"));
+                        gridInfo->setPasswordUrl(childGetValue("password"));
+                        //gridInfo->setSearchUrl(childGetValue("search"));
+                        gridInfo->setRenderCompat(childGetValue("render_compat"));
+                        
+                        // gridInfo->setFirstName(childGetValue("first_name"));
+                        // gridInfo->setLastName(childGetValue("last_name"));
+                        // if(childGetValue("avatar_password").asString().empty())
+                        //      gridInfo->setAvatarPassword(std::string(""));
+                        // else if(childGetValue("avatar_password").asString() != std::string(PASSWORD_FILLER))
+                        // {
+                        //      // store account authentication data
+                        //      std::string auth_password = childGetValue("avatar_password");
+                        //      std::string hashed_password;
+                        //      hashPassword(auth_password, hashed_password);
+                        //      gridInfo->setAvatarPassword(hashed_password);
+                        // }
+
+                        //this bug was a feature -Patrick Sapinski (Friday, August 21, 2009)
+                        //LLPanelLogin::setFields(gridInfo->getFirstName(), gridInfo->getLastName(),
+                        //                                              gridInfo->getAvatarPassword(), true);
+                } 
+                else 
+                {
+                        llwarns << "Grid nickname mismatch, ignoring changes." << llendl;
+                }
+        }
+}
+
+
+bool LoginFloater::createNewGrid()
+{
+        // check nickname
+        std::string gridnick = childGetValue("gridnick");
+        if (gridnick == "<required>") gridnick = "";
+        if (gridnick == "") {
+                //KOW gViewerWindow->alertXml("GridsNoNick");
+                return false;
+        }
+        if (gHippoGridManager->getGrid(gridnick)) {
+                LLStringUtil::format_map_t args;
+                args["[NAME]"] = gridnick;
+                //KOW gViewerWindow->alertXml("GridExists", args);
+                return false;
+        }
+
+        // check login URI
+        std::string loginuri = childGetValue("loginuri");
+        if ((loginuri == "") || (loginuri == "<required>")) {
+                LLStringUtil::format_map_t args;
+                args["[NAME]"] = gridnick;
+                //KOW gViewerWindow->alertXml("GridsNoLoginUri", args);
+                return false;
+        }
+
+        // create new grid
+        HippoGridInfo *grid = new HippoGridInfo(gridnick);
+        grid->setGridName(childGetValue("gridname"));
+        grid->setLoginUri(loginuri);
+        grid->setLoginPage(childGetValue("loginpage"));
+        grid->setHelperUri(childGetValue("helperuri"));
+        grid->setWebSite(childGetValue("website"));
+        grid->setSupportUrl(childGetValue("support"));
+        grid->setRegisterUrl(childGetValue("register"));
+        grid->setPasswordUrl(childGetValue("password"));
+        //grid->setSearchUrl(childGetValue("search"));
+        grid->setRenderCompat(childGetValue("render_compat"));
+        gHippoGridManager->addGrid(grid);
+        
+        // grid->setFirstName(childGetValue("first_name"));
+        // grid->setLastName(childGetValue("last_name"));
+        // if(childGetValue("avatar_password").asString().empty())
+        //      grid->setAvatarPassword(std::string(""));
+        // else
+        // {
+        //      std::string hashed_password;
+        //      hashPassword(childGetValue("avatar_password"), hashed_password);
+        //      grid->setAvatarPassword(hashed_password);
+        // }
+        
+        mCurGrid = gridnick;
+        return true;
+}
+
+void LoginFloater::retrieveGridInfo()
+{
+        std::string loginuri = childGetValue("loginuri");
+        if ((loginuri == "") || (loginuri == "<required>")) {
+                //KOW gViewerWindow->alertXml("GridInfoNoLoginUri");
+                return;
+        }
+
+        HippoGridInfo *grid = 0;
+        bool cleanupGrid = false;
+        if (mState == NORMAL) {
+                grid = gHippoGridManager->getGrid(mCurGrid);
+        } else if ((mState == ADD_NEW) || (mState == ADD_COPY)) {
+                grid = new HippoGridInfo("");
+                cleanupGrid = true;
+        } else {
+                llerrs << "Illegal state " << mState << '.' << llendl;
+                return;
+        }
+        if (!grid) {
+                llerrs << "Internal error retrieving grid info." << llendl;
+                return;
+        }
+
+        grid->setLoginUri(loginuri);
+        if (grid->retrieveGridInfo()) {
+                if (grid->getGridNick() != "") childSetText("gridnick", grid->getGridNick());
+                if (grid->getGridName() != "") childSetText("gridname", grid->getGridName());
+                if (grid->getLoginUri() != "") childSetText("loginuri", grid->getLoginUri());
+                if (grid->getLoginPage() != "") childSetText("loginpage", grid->getLoginPage());
+                if (grid->getHelperUri() != "") childSetText("helperuri", grid->getHelperUri());
+                if (grid->getWebSite() != "") childSetText("website", grid->getWebSite());
+                if (grid->getSupportUrl() != "") childSetText("support", grid->getSupportUrl());
+                if (grid->getRegisterUrl() != "") childSetText("register", grid->getRegisterUrl());
+                if (grid->getPasswordUrl() != "") childSetText("password", grid->getPasswordUrl());
+                //if (grid->getSearchUrl() != "") childSetText("search", grid->getSearchUrl());
+        } else {
+                //KOW gViewerWindow->alertXml("GridInfoError");
+        }
+
+        if (cleanupGrid) delete grid;
+}
+
+void LoginFloater::apply()
+{
+        if (mState == NORMAL) {
+                applyChanges();
+        } else if ((mState == ADD_NEW) || (mState == ADD_COPY)) {
+                if (!createNewGrid()) return;
+        } else {
+                llwarns << "Illegal state " << mState << '.' << llendl;
+                return;
+        }
+        //gHippoGridManager->setCurrentGrid(mCurGrid);
+        //gHippoGridManager->setDefaultGrid(mCurGrid);
+        //LLPanelLogin::refreshLoginPage();
+        gHippoGridManager->saveFile();
+        LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel());
+}
+
+void LoginFloater::setDefault()
+{
+        if (mState == NORMAL) {
+                applyChanges();
+        } else if ((mState == ADD_NEW) || (mState == ADD_COPY)) {
+                if (!createNewGrid()) return;
+        } else {
+                llwarns << "Illegal state " << mState << '.' << llendl;
+                return;
+        }
+        gHippoGridManager->setCurrentGrid(mCurGrid);
+        gHippoGridManager->setDefaultGrid(mCurGrid);
+        gHippoGridManager->saveFile();
+        LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel());
+}
+
+void LoginFloater::cancel()
+{
+        gHippoGridManager->discardAndReload();
+        update();
+}
+
+void LoginFloater::onSelectGrid(LLUICtrl* ctrl, void *data)
+{
+        LoginFloater* self = (LoginFloater*)data;
+        if (self->mState == NORMAL) {
+                self->applyChanges();
+        } else if ((self->mState == ADD_NEW) || (self->mState == ADD_COPY)) {
+                if (self->createNewGrid()) {
+                        self->mState = NORMAL;
+                } else {
+                        //LLScrollListCtrl *grids = self->getChild<LLScrollListCtrl>("grid_selector");
+                        //grids->setCurrentByIndex(grids->getItemCount() - 1);
+                        return;
+                }
+        } else {
+                llwarns << "Illegal state " << self->mState << '.' << llendl;
+                return;
+        }
+        self->mCurGrid = ctrl->getValue().asString();
+        self->refresh_grids();
+}
+
+//static
+void LoginFloater::onClickDelete(void *data)
+{
+                        llwarns << "onclickdelete" << llendl;
+        LoginFloater* self = (LoginFloater*)data;
+        if (self->mState == NORMAL)
+                gHippoGridManager->deleteGrid(self->mCurGrid);
+        self->update();
+}
+
+//static
+void LoginFloater::onClickAdd(void *data)
+{
+                        llwarns << "add" << llendl;
+        LoginFloater* self = (LoginFloater*)data;
+        self->mState = ADD_NEW;
+        self->refresh_grids();
+}
+
+
+//static
+void LoginFloater::onClickCopy(void *data)
+{
+                        llwarns << "copy" << llendl;
+        LoginFloater* self = (LoginFloater*)data;
+        self->mState = ADD_COPY;
+        self->refresh_grids();
+}
+
+// static
+void LoginFloater::onClickOk(void* data)
+{
+        if(NULL==sInstance)
+                return;
+
+        sInstance->apply();
+        sInstance->close();
+}
+
+//static
+void LoginFloater::onClickApply(void *data)
+{
+        if(NULL==sInstance)
+                return;
+
+        sInstance->apply();
+        refresh_grids();
+}
+
+//static
+void LoginFloater::onClickDefault(void *data)
+{
+        sInstance->setDefault();
+        sInstance->refresh_grids();
+}
+
+//static
+void LoginFloater::onClickGridInfo(void *data)
+{
+        //HippoPanelGrids* self = (HippoPanelGrids*)data;
+        sInstance->retrieveGridInfo();
+}
+
+//static
+void LoginFloater::onClickCancel(void *data)
+{
+        sInstance->cancel();
+}
+
+void LoginFloater::setAlwaysRefresh(bool refresh)
+{
+        // wargames 2: dead code, LLPanelLogin compatibility
+        return;
+}
+
+void LoginFloater::refreshLocation( bool force_visible )
+{
+        
+                llwarns << "refreshLocation called" << llendl;
+        
+        if (!sInstance) return;
+
+        LLComboBox* combo = sInstance->getChild<LLComboBox>("start_location_combo");
+        
+        if (LLURLSimString::parse())
+        {
+                combo->setCurrentByIndex( 3 );          // BUG?  Maybe 2?
+                combo->setTextEntry(LLURLSimString::sInstance.mSimString);
+        }
+        else
+        {
+                BOOL login_last = gSavedSettings.getBOOL("LoginLastLocation");
+                combo->setCurrentByIndex( login_last ? 1 : 0 );
+        }
+        
+        BOOL show_start = TRUE;
+        
+        if ( ! force_visible )
+                show_start = gSavedSettings.getBOOL("ShowStartLocation");
+        
+        sInstance->childSetVisible("start_location_combo", show_start);
+        sInstance->childSetVisible("start_location_text", show_start);
+        sInstance->childSetVisible("server_combo", TRUE);
+}
+
+void LoginFloater::newShow(const std::string &grid, bool initialLogin)
+{
+        
+        llwarns << "newShow called" << llendl;
+        if(NULL==sInstance) 
+        {
+                LoginFloater::sGrid = grid;
+                LoginFloater::sIsInitialLogin = initialLogin;
+                sInstance = new LoginFloater();
+                
+                llwarns << "sInstance assigned. sInstance=" << sInstance << llendl;
+        }
+
+        llwarns << "newshow called" << llendl;
+        sInstance->mCurGrid = gHippoGridManager->getCurrentGridNick();
+        refresh_grids();
+
+                sInstance->open();      /*Flawfinder: ignore*/
+        // we're important
+        //sInstance->setFrontmost(TRUE);
+        //sInstance->setFocus(TRUE);
+
+}
+
+void LoginFloater::show(const LLRect &rect, BOOL show_server, 
+                                                void (*callback)(S32 option, void* user_data), 
+                                                void* callback_data)
+{
+        // we don't need a grid passed in because this is old-style login
+        std::string grid = "";
+        newShow(grid, TRUE);
+}
+
+void LoginFloater::setFocus(BOOL b)
+{
+        if(b != hasFocus())
+        {
+                if(b)
+                {
+                        LoginFloater::giveFocus();
+                }
+                else
+                {
+                        LLPanel::setFocus(b);
+                }
+        }
+}
+
+void LoginFloater::giveFocus()
+{
+        LLScrollListCtrl *combo = NULL;
+        
+        if(NULL==sInstance)
+        {
+                llwarns << "giveFocus has no LoginFloater instance. sInstance=" << sInstance << llendl;
+                return;
+        }
+        
+        // for our combo box approach, selecting the combo box is almost always
+        // the right thing to do on the floater receiving focus
+        combo = sInstance->getChild<LLScrollListCtrl>("grid_selector");
+        combo->setFocus(TRUE);
+}
+
+BOOL LoginFloater::isGridComboDirty()
+{
+        BOOL user_picked = FALSE;
+        if (!sInstance)
+        {
+                llwarns << "Attempted getServer with no login view shown" << llendl;
+        }
+        else
+        {
+                LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
+                user_picked = combo->isDirty();
+        }
+        return user_picked;
+}
+
+void LoginFloater::getLocation(std::string &location)
+{
+        if (!sInstance)
+        {
+                llwarns << "Attempted getLocation with no login view shown" << llendl;
+                return;
+        }
+        
+        LLComboBox* combo = sInstance->getChild<LLComboBox>("start_location_combo");
+        location = combo->getValue().asString();
+}
+
+std::string& LoginFloater::getPassword()
+{
+        return mMungedPassword;
+}
+
+void LoginFloater::setPassword(std::string &password)
+{
+        mMungedPassword = password;
+}
+
+bool LoginFloater::isSamePassword(std::string &password)
+{
+        return mMungedPassword == password;
+}
+
+void LoginFloater::addServer(const std::string& server, S32 domain_name)
+{
+        if (!sInstance)
+        {
+                llwarns << "Attempted addServer with no login view shown" << llendl;
+                return;
+        }
+        
+        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
+        combo->add(server, LLSD(domain_name) );
+        combo->setCurrentByIndex(0);
+}
+
+void LoginFloater::cancel_old()
+{
+        if(NULL==sInstance)
+                return;
+        
+        if(sInstance->sIsInitialLogin)
+        {
+                // send a callback that indicates we're quitting or closing
+                if(sInstance->mCallback)
+                        sInstance->mCallback(LOGIN_OPTION_QUIT, sInstance->mCallbackData);
+                return;
+        }
+        
+        sInstance->close();
+}
+
+void LoginFloater::hashPassword(const std::string& password, std::string& hashedPassword)
+{
+        // Max "actual" password length is 16 characters.
+        // Hex digests are always 32 characters.
+        if (password.length() == 32)
+        {
+                hashedPassword = password;
+        }
+        else
+        {
+                // this is a normal text password
+                LLMD5 pass((unsigned char *)password.c_str());
+                char munged_password[MD5HEX_STR_SIZE];
+                pass.hex_digest(munged_password);
+                hashedPassword = munged_password;
+        }
+        
+}
+
diff --git a/linden/indra/newview/floaterlogin.h b/linden/indra/newview/floaterlogin.h
new file mode 100644
index 0000000..cdb60b0
--- /dev/null
+++ b/linden/indra/newview/floaterlogin.h
@@ -0,0 +1,90 @@
+/*
+ *  floaterlogin.h (floatergridmanager.h pls)
+ *  This is Meerkats grid manager, and I accidentally finished it with the wrong name :)
+ *  -Patrick Sapinski (Monday, August 17, 2009)
+ */
+
+#ifndef PL_floaterlogin_H
+#define PL_floaterlogin_H
+
+#define LOGIN_OPTION_CONNECT 0
+#define LOGIN_OPTION_QUIT 1
+
+#include "llfloater.h"
+
+class LoginController;
+class AuthenticationModel;
+
+class LoginFloater : public LLFloater
+{
+public:
+        LoginFloater();
+        virtual ~LoginFloater();
+        
+        virtual BOOL postBuild();
+
+        static void refresh_grids();
+        void apply();
+        void setDefault();
+        void cancel();
+
+        // new-style login methods
+        static void newShow(const std::string &grid, bool initialLogin);
+        virtual std::string& getPassword();
+        virtual void setPassword(std::string &password);
+        virtual bool isSamePassword(std::string &password);
+        static void getFields(std::string &loginname, std::string &password,
+                                                  BOOL &remember);
+        static void setFields(const std::string &loginname, const std::string &password,
+                                                  BOOL remember);
+        
+        // LLLoginPanel compatibility
+        //TODO: Make this not suck
+        static void show(const LLRect &rect, BOOL show_server, 
+                                         void (*callback)(S32 option, void *user_data), 
+                                         void *callback_data);
+        static void close();
+        static void setAlwaysRefresh(bool refresh);
+        static void refreshLocation(bool force_visible);
+        virtual void setFocus(BOOL b);
+        static void giveFocus();
+        static void getLocation(std::string &location);
+        static BOOL isGridComboDirty();
+        static void addServer(const std::string& server, S32 domain_name);
+        static void cancel_old();
+        static void hashPassword(const std::string& password, std::string& hashedPassword);
+protected:
+        static bool sIsInitialLogin;
+        static std::string sGrid;
+private:
+        enum State { NORMAL, ADD_NEW, ADD_COPY };
+        State mState;
+        std::string mCurGrid;
+
+        std::string mIncomingPassword;
+        std::string mMungedPassword;
+        
+        void applyChanges();
+        bool createNewGrid();
+        void update();
+        void retrieveGridInfo();
+
+        static void onSelectGrid(LLUICtrl *ctrl, void *data);
+        static void onClickDelete(void *data);
+        static void onClickAdd(void *data);
+        static void onClickCopy(void *data);
+        static void onClickOk(void *data);
+        static void onClickApply(void *data);
+        static void onClickDefault(void *data);
+        static void onClickGridInfo(void *data);
+        static void onClickCancel(void *data);
+
+        static LoginFloater *sInstance;
+        static LoginController *sController;
+        static AuthenticationModel *sModel;
+        
+        void (*mCallback)(S32 option, void *userdata);
+        void *mCallbackData;
+};
+
+#endif // PL_floaterlogin_H
diff --git a/linden/indra/newview/gpu_table.txt b/linden/indra/newview/gpu_table.txt
index 56de9c6..c08e2b5 100644
--- a/linden/indra/newview/gpu_table.txt
+++ b/linden/indra/newview/gpu_table.txt
@@ -162,7 +162,11 @@ Intel Montara					.*Intel.*Montara.*					0		0
 Intel Springdale                                .*Intel.*Springdale.*                           0               0
 Matrox                                                  .*Matrox.*                                                      0               0
 Mesa                                                    .*Mesa.*                                                        0               0
+NVIDIA GT 120                                   .*NVIDIA.*GeForce.*GT.*12.*                     2               1
+NVIDIA GT 130                                   .*NVIDIA.*GeForce.*GT.*13.*                     3               1
+NVIDIA GTS 250                                  .*NVIDIA.*GeForce.*GTS.*25.*            3               1
 NVIDIA GTX 260                                  .*NVIDIA.*GeForce.*GTX.*26.*            3               1
+NVIDIA GTX 270                                  .*NVIDIA.*GeForce.*GTX.*27.*            3               1
 NVIDIA GTX 280                                  .*NVIDIA.*GeForce.*GTX.*28.*            3               1
 NVIDIA GTX 290                                  .*NVIDIA.*GeForce.*GTX.*29.*            3               1
 NVIDIA C51                                              .*NVIDIA.*C51.*                                         0               1
diff --git a/linden/indra/newview/hippoGridManager.cpp b/linden/indra/newview/hippoGridManager.cpp
new file mode 100644
index 0000000..71e3a95
--- /dev/null
+++ b/linden/indra/newview/hippoGridManager.cpp
@@ -0,0 +1,819 @@
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "hippoGridManager.h"
+
+#include <cctype>
+
+#include <stdtypes.h>
+#include <lldir.h>
+#include <lleconomy.h>
+#include <llerror.h>
+#include <llfile.h>
+#include <llhttpclient.h>
+#include <llsdserialize.h>
+#include "llviewercontrol.h"
+#include "llweb.h"
+
+#include "hippoRestRequest.h"
+
+
+// ********************************************************************
+// Global Variables
+
+HippoGridManager *gHippoGridManager = 0;
+
+HippoGridInfo HippoGridInfo::FALLBACK_GRIDINFO("");
+
+
+
+// ********************************************************************
+// ********************************************************************
+// HippoGridInfo
+// ********************************************************************
+// ********************************************************************
+
+
+// ********************************************************************
+// Initialize
+
+HippoGridInfo::HippoGridInfo(const std::string &gridNick) :
+    mPlatform(PLATFORM_OTHER),
+    mRenderCompat(true),
+    mCurrencySymbol("OS$"),
+    mRealCurrencySymbol("US$"),
+    mDirectoryFee(30)
+{
+        std::string nick = gridNick;
+        mGridNick = sanitizeGridNick( nick );
+}
+
+
+// ********************************************************************
+// Getters
+
+HippoGridInfo::Platform HippoGridInfo::getPlatform()
+{
+        return mPlatform;
+}
+
+bool HippoGridInfo::isOpenSimulator() const
+{
+        return (mPlatform == HippoGridInfo::PLATFORM_OPENSIM);
+}
+
+bool HippoGridInfo::isSecondLife() const
+{
+        return (mPlatform == HippoGridInfo::PLATFORM_SECONDLIFE);
+}
+
+const std::string& HippoGridInfo::getGridNick() const
+{
+        return mGridNick;
+}
+
+const std::string& HippoGridInfo::getGridName() const
+{
+        return mGridName;
+}
+
+const std::string& HippoGridInfo::getLoginUri() const
+{
+        return mLoginUri;
+}
+
+const std::string& HippoGridInfo::getLoginPage() const
+{
+        return mLoginPage;
+}
+
+const std::string& HippoGridInfo::getHelperUri() const
+{
+        return mHelperUri;
+}
+
+const std::string& HippoGridInfo::getWebSite() const
+{
+        return mWebSite;
+}
+
+const std::string& HippoGridInfo::getSupportUrl() const
+{
+        return mSupportUrl;
+}
+
+const std::string& HippoGridInfo::getRegisterUrl() const
+{
+        return mRegisterUrl;
+}
+
+const std::string& HippoGridInfo::getPasswordUrl() const
+{
+        return mPasswordUrl;
+}
+
+const std::string& HippoGridInfo::getSearchUrl() const
+{
+        return mSearchUrl;
+}
+
+const std::string& HippoGridInfo::getFirstName() const
+{
+        return mFirstName;
+}
+
+const std::string& HippoGridInfo::getLastName() const
+{
+        return mLastName;
+}
+
+const std::string& HippoGridInfo::getAvatarPassword() const
+{
+        return mAvatarPassword;
+}
+
+bool HippoGridInfo::isRenderCompat() const
+{
+        return mRenderCompat;
+}
+
+const std::string& HippoGridInfo::getCurrencySymbol() const
+{
+        return mCurrencySymbol;
+}
+
+const std::string& HippoGridInfo::getRealCurrencySymbol() const
+{
+        return mRealCurrencySymbol;
+}
+
+
+
+// ********************************************************************
+// Setters
+
+void HippoGridInfo::setPlatform(Platform platform)
+{
+        mPlatform = platform;
+        mCurrencySymbol = (mPlatform == PLATFORM_SECONDLIFE)? "L$": "OS$";
+}
+
+
+void HippoGridInfo::setPlatform(const std::string &platform)
+{
+        std::string tmp = platform;
+        for (unsigned i=0; i<platform.size(); i++)
+                tmp[i] = tolower(tmp[i]);
+
+        if (tmp == "opensim") {
+                setPlatform(PLATFORM_OPENSIM);
+        } else if (tmp == "secondlife") {
+                setPlatform(PLATFORM_SECONDLIFE);
+        } else {
+                setPlatform(PLATFORM_OTHER);
+                llwarns << "Unknown platform '" << platform << "'." << llendl;
+        }
+}
+
+void HippoGridInfo::setGridName(const std::string &gridName)
+{
+        mGridName = gridName;
+}
+
+void HippoGridInfo::setLoginUri(const std::string &loginUri)
+{
+        std::string uri = loginUri;
+        mLoginUri = sanitizeUri(uri);
+}
+
+void HippoGridInfo::setLoginPage(const std::string &loginPage)
+{
+        mLoginPage = loginPage;
+}
+
+void HippoGridInfo::setHelperUri(const std::string &helperUri)
+{
+        std::string uri = helperUri;
+        mHelperUri = sanitizeUri(uri);
+}
+
+void HippoGridInfo::setWebSite(const std::string &website)
+{
+        mWebSite = website;
+}
+
+void HippoGridInfo::setSupportUrl(const std::string &url)
+{
+        mSupportUrl = url;
+}
+
+void HippoGridInfo::setRegisterUrl(const std::string &url)
+{
+        mRegisterUrl = url;
+}
+
+void HippoGridInfo::setPasswordUrl(const std::string &url)
+{
+        mPasswordUrl = url;
+}
+
+void HippoGridInfo::setSearchUrl(const std::string &url)
+{
+        mSearchUrl = url;
+}
+
+void HippoGridInfo::setFirstName(const std::string &firstName)
+{
+        mFirstName = firstName;
+}
+
+void HippoGridInfo::setLastName(const std::string &lastName)
+{
+        mLastName = lastName;
+}
+
+void HippoGridInfo::setAvatarPassword(const std::string &avatarPassword)
+{
+        mAvatarPassword = avatarPassword;
+}
+
+void HippoGridInfo::setRenderCompat(bool compat)
+{
+        mRenderCompat = compat;
+}
+
+void HippoGridInfo::setCurrencySymbol(const std::string &sym)
+{
+        mCurrencySymbol = sym.substr(0, 3);
+}
+
+void HippoGridInfo::setRealCurrencySymbol(const std::string &sym)
+{
+        mRealCurrencySymbol = sym.substr(0, 3);
+}
+
+void HippoGridInfo::setDirectoryFee(int fee)
+{
+        mDirectoryFee = fee;
+}
+
+
+
+// ********************************************************************
+// Grid Info
+
+std::string HippoGridInfo::getSearchUrl(SearchType ty) const
+{
+    if ((mPlatform == PLATFORM_SECONDLIFE) || mSearchUrl.empty()) {
+        // Second Life defaults
+        if (ty == SEARCH_ALL_EMPTY) {
+            return gSavedSettings.getString("SearchURLDefault");
+        } else if (ty == SEARCH_ALL_QUERY) {
+            return gSavedSettings.getString("SearchURLQuery");
+        } else if (ty == SEARCH_ALL_TEMPLATE) {
+            return gSavedSettings.getString("SearchURLSuffix2");
+        } else {
+            llinfos << "Illegal search URL type " << ty << llendl;
+            return "";
+        }
+    } else {
+        // OpenSim and other
+        if (ty == SEARCH_ALL_EMPTY) {
+            return (mSearchUrl + "panel=All&");
+        } else if (ty == SEARCH_ALL_QUERY) {
+            return (mSearchUrl + "q=[QUERY]&s=[COLLECTION]&");
+        } else if (ty == SEARCH_ALL_TEMPLATE) {
+            return "lang=[LANG]&m=[MATURE]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]";
+        } else {
+            llinfos << "Illegal search URL type " << ty << llendl;
+            return "";
+        }
+    }
+}
+
+
+//static
+void HippoGridInfo::onXmlElementStart(void *userData, const XML_Char *name, const XML_Char **atts)
+{
+        HippoGridInfo *self = (HippoGridInfo*)userData;
+        if (strcasecmp(name, "gridnick") == 0)
+                self->mXmlState = XML_GRIDNICK;
+        else if (strcasecmp(name, "gridname") == 0)
+                self->mXmlState = XML_GRIDNAME;
+        else if (strcasecmp(name, "platform") == 0)
+                self->mXmlState = XML_PLATFORM;
+        else if ((strcasecmp(name, "login") == 0) || (strcasecmp(name, "loginuri") == 0))
+                self->mXmlState = XML_LOGINURI;
+        else if ((strcasecmp(name, "welcome") == 0) || (strcasecmp(name, "loginpage") == 0))
+                self->mXmlState = XML_LOGINPAGE;
+        else if ((strcasecmp(name, "economy") == 0) || (strcasecmp(name, "helperuri") == 0))
+                self->mXmlState = XML_HELPERURI;
+        else if ((strcasecmp(name, "about") == 0) || (strcasecmp(name, "website") == 0))
+                self->mXmlState = XML_WEBSITE;
+        else if ((strcasecmp(name, "help") == 0) || (strcasecmp(name, "support") == 0))
+                self->mXmlState = XML_SUPPORT;
+        else if ((strcasecmp(name, "register") == 0) || (strcasecmp(name, "account") == 0))
+                self->mXmlState = XML_REGISTER;
+        else if (strcasecmp(name, "password") == 0)
+                self->mXmlState = XML_PASSWORD;
+        //else if (strcasecmp(name, "search") == 0)
+                //self->mXmlState = XML_SEARCH;
+}
+
+//static
+void HippoGridInfo::onXmlElementEnd(void *userData, const XML_Char *name)
+{
+        HippoGridInfo *self = (HippoGridInfo*)userData;
+        self->mXmlState = XML_VOID;
+}
+
+//static
+void HippoGridInfo::onXmlCharacterData(void *userData, const XML_Char *s, int len)
+{
+        HippoGridInfo *self = (HippoGridInfo*)userData;
+        switch (self->mXmlState) {
+                
+                case XML_GRIDNICK: {
+                        if (self->mGridNick == "") self->mGridNick.assign(s, len);
+                        self->mGridNick = sanitizeGridNick(self->mGridNick);
+                        break;
+                }
+
+                case XML_PLATFORM: {
+                        std::string platform(s, len);
+                        self->setPlatform(platform); 
+                        break;
+                }       
+
+                case XML_LOGINURI: {
+                        std::string loginuri(s, len);
+                        self->mLoginUri = sanitizeUri( loginuri );
+                        break;
+                }
+
+                case XML_HELPERURI: {
+                        std::string helperuri(s, len);
+                        self->mHelperUri = sanitizeUri( helperuri );
+                        break;
+                }
+
+                case XML_SEARCH: {
+                        //self->mSearchUrl.assign(s, len);
+                        //sanitizeQueryUrl(mSearchUrl);
+                        break;
+                }
+
+                case XML_GRIDNAME: self->mGridName.assign(s, len); break;
+                case XML_LOGINPAGE: self->mLoginPage.assign(s, len); break;
+                case XML_WEBSITE: self->mWebSite.assign(s, len); break;
+                case XML_SUPPORT: self->mSupportUrl.assign(s, len); break;
+                case XML_REGISTER: self->mRegisterUrl.assign(s, len); break;
+                case XML_PASSWORD: self->mPasswordUrl.assign(s, len); break;
+
+                case XML_VOID: break;
+        }
+}
+
+
+bool HippoGridInfo::retrieveGridInfo()
+{
+        if (mLoginUri == "") return false;
+
+        std::string reply;
+        int result = HippoRestRequest::getBlocking(mLoginUri + "get_grid_info", &reply);
+        if (result != 200) return false;
+
+        llinfos << "Received: " << reply << llendl;
+
+        bool success = true;
+        XML_Parser parser = XML_ParserCreate(0);
+        XML_SetUserData(parser, this);
+        XML_SetElementHandler(parser, onXmlElementStart, onXmlElementEnd);
+        XML_SetCharacterDataHandler(parser, onXmlCharacterData);
+        mXmlState = XML_VOID;
+        if (!XML_Parse(parser, reply.data(), reply.size(), TRUE)) {
+                llwarns << "XML Parse Error: " << XML_ErrorString(XML_GetErrorCode(parser)) << llendl;
+                success = false;
+        }
+        XML_ParserFree(parser);
+
+        return success;
+}
+
+
+std::string HippoGridInfo::getUploadFee() const
+{
+    std::string fee;
+    formatFee(fee, LLGlobalEconomy::Singleton::getInstance()->getPriceUpload(), true);
+    return fee;
+}
+
+std::string HippoGridInfo::getGroupCreationFee() const
+{
+    std::string fee;
+    formatFee(fee, LLGlobalEconomy::Singleton::getInstance()->getPriceGroupCreate(), false);
+    return fee;
+}
+
+std::string HippoGridInfo::getDirectoryFee() const
+{
+    std::string fee;
+    formatFee(fee, mDirectoryFee, true);
+    if (fee != "free") fee += "/week";
+    return fee;
+}
+
+void HippoGridInfo::formatFee(std::string &fee, int cost, bool showFree) const
+{
+    if (showFree && (cost == 0)) {
+        fee = "free";
+    } else {
+        fee = llformat("%s%d", getCurrencySymbol().c_str(), cost);
+    }
+}
+
+
+// ********************************************************************
+// Static Helpers
+
+// static
+const char *HippoGridInfo::getPlatformString(Platform platform)
+{
+        static const char *platformStrings[PLATFORM_LAST] = {
+                "Other", "OpenSim", "SecondLife"
+        };
+
+        if ((platform < PLATFORM_OTHER) || (platform >= PLATFORM_LAST))
+                platform = PLATFORM_OTHER;
+        return platformStrings[platform];
+}
+
+
+// static
+std::string HippoGridInfo::sanitizeGridNick(std::string &gridnick)
+{
+        std::string tmp;
+        int size = gridnick.size();
+        for (int i=0; i<size; i++) {
+                char c = gridnick[i];
+                if ((c == '_') || isalnum(c)) {
+                        tmp += tolower(c);
+                } else if (isspace(c)) {
+                        tmp += "_";
+                }
+        }
+        return tmp;
+}
+
+// static
+std::string HippoGridInfo::sanitizeUri(std::string &uri)
+{
+        // if (uri.empty()) {
+        //      return "";
+        // }
+
+        // // If last character in uri is not "/"
+        // // NOTE: This wrongly assumes that all URIs should end with "/"!
+        // if (uri.compare(uri.length()-1, 1, "/") != 0) {
+        //      return uri + '/';
+        // }
+
+        return uri;
+}
+
+
+void HippoGridInfo::initFallback()
+{
+        FALLBACK_GRIDINFO.mGridNick = "secondlife";
+        FALLBACK_GRIDINFO.setPlatform(PLATFORM_SECONDLIFE);
+        FALLBACK_GRIDINFO.setGridName("Second Life");
+        FALLBACK_GRIDINFO.setLoginUri("https://login.agni.lindenlab.com/cgi-bin/login.cgi");
+        FALLBACK_GRIDINFO.setLoginPage("http://secondlife.com/app/login/");
+        FALLBACK_GRIDINFO.setHelperUri("https://secondlife.com/helpers/");
+        FALLBACK_GRIDINFO.setWebSite("http://secondlife.com/");
+}
+
+
+
+// ********************************************************************
+// ********************************************************************
+// HippoGridManager
+// ********************************************************************
+// ********************************************************************
+
+
+// ********************************************************************
+// Initialize
+
+HippoGridManager::HippoGridManager() :
+    mConnectedGrid(0),
+    mDefaultGridsVersion(0)
+{
+}
+
+HippoGridManager::~HippoGridManager()
+{
+        cleanup();
+}
+
+
+void HippoGridManager::cleanup()
+{
+        std::map<std::string, HippoGridInfo*>::iterator it, end = mGridInfo.end();
+        for (it=mGridInfo.begin(); it != end; ++it) {
+                delete it->second;
+        }
+        mGridInfo.clear();
+}
+
+
+void HippoGridManager::init()
+{
+        HippoGridInfo::initFallback();
+        loadFromFile();
+
+        // !!!### gSavedSettings.getControl("CmdLineLoginURI");
+        // !!!### gSavedSettings.getString("CmdLineLoginPage");
+        // !!!### gSavedSettings.getString("CmdLineHelperURI");
+        // !!!### LLString::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name.c_str()))
+}
+
+
+void HippoGridManager::discardAndReload()
+{
+        cleanup();
+        loadFromFile();
+}
+
+
+// ********************************************************************
+// Public Access
+
+HippoGridInfo* HippoGridManager::getGrid(const std::string &grid) const
+{
+        std::map<std::string, HippoGridInfo*>::const_iterator it;
+        it = mGridInfo.find(grid);
+        if (it != mGridInfo.end()) {
+                return it->second;
+        } else {
+                return 0;
+        }       
+}
+
+
+HippoGridInfo* HippoGridManager::getConnectedGrid() const
+{
+        return (mConnectedGrid)? mConnectedGrid: getCurrentGrid();
+}
+
+
+HippoGridInfo* HippoGridManager::getCurrentGrid() const
+{
+        HippoGridInfo *grid = getGrid(mCurrentGrid);
+        if (grid) {
+                return grid;
+        } else {
+                return &HippoGridInfo::FALLBACK_GRIDINFO;
+        }
+}
+
+const std::string& HippoGridManager::getDefaultGridNick() const
+{
+        return mDefaultGrid;
+}
+
+const std::string& HippoGridManager::getCurrentGridNick() const
+{
+        return mCurrentGrid;
+}
+
+void HippoGridManager::setCurrentGridAsConnected()
+{
+        mConnectedGrid = getCurrentGrid();
+}
+
+
+void HippoGridManager::addGrid(HippoGridInfo *grid)
+{
+        if (!grid) return;
+        const std::string &nick = grid->getGridNick();
+        if (nick == "") {
+                llwarns << "Ignoring to try adding grid with empty nick." << llendl;
+                delete grid;
+                return;
+        }
+        if (mGridInfo.find(nick) != mGridInfo.end()) {
+                llwarns << "Ignoring to try adding existing grid " << nick << '.' << llendl;
+                delete grid;
+                return;
+        }
+        mGridInfo[nick] = grid;
+}
+
+
+void HippoGridManager::deleteGrid(const std::string &grid)
+{
+        GridIterator it = mGridInfo.find(grid);
+        if (it == mGridInfo.end()) {
+                llwarns << "Trying to delete non-existing grid " << grid << '.' << llendl;
+                return;
+        }
+        mGridInfo.erase(it);
+        llinfos << "Number of grids now: " << mGridInfo.size() << llendl;
+        if (mGridInfo.empty()) llinfos << "Grid info map is empty." << llendl;
+        if (grid == mDefaultGrid)
+                setDefaultGrid("");  // sets first grid, if map not empty
+        if (grid == mCurrentGrid)
+                mCurrentGrid = mDefaultGrid;
+}
+
+
+void HippoGridManager::setDefaultGrid(const std::string &grid)
+{
+        GridIterator it = mGridInfo.find(grid);
+        if (it != mGridInfo.end()) {
+                mDefaultGrid = grid;
+        } else if (mGridInfo.find("secondlife") != mGridInfo.end()) {
+                mDefaultGrid = "secondlife";
+        } else if (!mGridInfo.empty()) {
+        mDefaultGrid = mGridInfo.begin()->first;
+        } else {
+                mDefaultGrid = "";
+        }
+}
+
+
+void HippoGridManager::setCurrentGrid(const std::string &grid)
+{
+        GridIterator it = mGridInfo.find(grid);
+        if (it != mGridInfo.end()) {
+                mCurrentGrid = grid;
+        } else if (!mGridInfo.empty()) {
+                llwarns << "Unknown grid '" << grid << "'. Setting to default grid." << llendl;
+        mCurrentGrid = mDefaultGrid;
+        }
+}
+
+
+// ********************************************************************
+// Persistent Store
+
+void HippoGridManager::loadFromFile()
+{
+        mDefaultGridsVersion = 0;
+        // load user grid info
+        parseFile(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grid_info.xml"), false);
+        // merge default grid info, if newer. Force load, if list of grids is empty.
+        parseFile(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "default_grids.xml"), !mGridInfo.empty());
+        // merge grid info from web site, if newer. Force load, if list of grids is empty.
+        if (gSavedSettings.getBOOL("CheckForGridUpdates"))
+                parseUrl("http://imprudenceviewer.org/app/grids/", !mGridInfo.empty());
+
+        setDefaultGrid(gSavedSettings.getString("DefaultGrid"));
+        setCurrentGrid(gSavedSettings.getString("DefaultGrid"));
+}
+
+
+void HippoGridManager::parseUrl(const char *url, bool mergeIfNewer)
+{
+        llinfos << "Loading grid info from '" << url << "'." << llendl;
+
+        // query update server
+        std::string escaped_url = LLWeb::escapeURL(url);
+        LLSD response = LLHTTPClient::blockingGet(url);
+
+        // check response, return on error
+        S32 status = response["status"].asInteger();
+        if ((status != 200) || !response["body"].isArray()) {
+                llinfos << "GridInfo Update failed (" << status << "): "
+                        << (response["body"].isString()? response["body"].asString(): "<unknown error>")
+                        << llendl;
+                return;
+        }
+
+        LLSD gridInfo = response["body"];
+        parseData(gridInfo, mergeIfNewer);
+}
+
+void HippoGridManager::parseFile(const std::string &fileName, bool mergeIfNewer)
+{
+        llifstream infile;
+        infile.open(fileName.c_str());
+        if(!infile.is_open()) {
+                llwarns << "Cannot find grid info file " << fileName << " to load." << llendl;
+                return;
+        }
+
+        LLSD gridInfo;
+        if (LLSDSerialize::fromXML(gridInfo, infile) <= 0) {
+                llwarns << "Unable to parse grid info file " << fileName << '.' << llendl;              
+                return;
+        }
+
+        llinfos << "Loading grid info file " << fileName << '.' << llendl;
+        parseData(gridInfo, mergeIfNewer);
+}
+
+
+void HippoGridManager::parseData(LLSD &gridInfo, bool mergeIfNewer)
+{
+        if (mergeIfNewer) {
+                LLSD::array_const_iterator it, end = gridInfo.endArray();
+                for (it = gridInfo.beginArray(); it != end; ++it) {
+                        LLSD gridMap = *it;
+                        if (gridMap.has("default_grids_version")) {
+                                int version = gridMap["default_grids_version"];
+                                if (version <= mDefaultGridsVersion) return;
+                                else break;
+                        }
+                }
+                if (it == end) {
+                        llwarns << "Grid data has no version number." << llendl;
+                        return;
+                }
+        }
+
+        llinfos << "Loading grid data." << llendl;
+
+        LLSD::array_const_iterator it, end = gridInfo.endArray();
+        for (it = gridInfo.beginArray(); it != end; ++it) {
+                LLSD gridMap = *it;
+                if (gridMap.has("default_grids_version")) {
+                        mDefaultGridsVersion = gridMap["default_grids_version"];
+                } else if (gridMap.has("gridnick") && gridMap.has("loginuri")) {
+                        std::string gridnick = gridMap["gridnick"];
+                        HippoGridInfo *grid;
+                        GridIterator it = mGridInfo.find(gridnick);
+                        bool newGrid = (it == mGridInfo.end());
+                        if (newGrid) {
+                                // create new grid info
+                                grid = new HippoGridInfo(gridnick);
+                        } else {
+                                // update existing grid info
+                                grid = it->second;
+                        }
+                        grid->setLoginUri(gridMap["loginuri"]);
+                        if (gridMap.has("platform")) grid->setPlatform(gridMap["platform"]);
+                        if (gridMap.has("gridname")) grid->setGridName(gridMap["gridname"]);
+                        if (gridMap.has("loginpage")) grid->setLoginPage(gridMap["loginpage"]);
+                        if (gridMap.has("helperuri")) grid->setHelperUri(gridMap["helperuri"]);
+                        if (gridMap.has("website")) grid->setWebSite(gridMap["website"]);
+                        if (gridMap.has("support")) grid->setSupportUrl(gridMap["support"]);
+                        if (gridMap.has("register")) grid->setRegisterUrl(gridMap["register"]);
+                        if (gridMap.has("password")) grid->setPasswordUrl(gridMap["password"]);
+                        //if (gridMap.has("search")) grid->setSearchUrl(gridMap["search"]);
+                        if (gridMap.has("render_compat")) grid->setRenderCompat(gridMap["render_compat"]);
+                        // if (gridMap.has("firstname")) grid->setFirstName(gridMap["firstname"]);
+                        // if (gridMap.has("lastname")) grid->setLastName(gridMap["lastname"]);
+                        // if (gridMap.has("avatarpassword")) grid->setAvatarPassword(gridMap["avatarpassword"]);
+                        if (newGrid) addGrid(grid);
+                }
+        }
+}
+
+
+void HippoGridManager::saveFile()
+{
+        // save default grid to client settings
+        gSavedSettings.setString("DefaultGrid", mDefaultGrid);
+
+        // build LLSD
+        LLSD gridInfo;
+        gridInfo[0]["default_grids_version"] = mDefaultGridsVersion;
+
+        // add grids
+        S32 i = 1;
+        GridIterator it, end = mGridInfo.end();
+        for (it = mGridInfo.begin(); it != end; ++it, i++) {
+                HippoGridInfo *grid = it->second;
+                gridInfo[i]["gridnick"] = grid->getGridNick();
+                gridInfo[i]["platform"] = HippoGridInfo::getPlatformString(grid->getPlatform());
+                gridInfo[i]["gridname"] = grid->getGridName();
+                gridInfo[i]["loginuri"] = grid->getLoginUri();
+                gridInfo[i]["loginpage"] = grid->getLoginPage();
+                gridInfo[i]["helperuri"] = grid->getHelperUri();
+                gridInfo[i]["website"] = grid->getWebSite();
+                gridInfo[i]["support"] = grid->getSupportUrl();
+                gridInfo[i]["register"] = grid->getRegisterUrl();
+                gridInfo[i]["password"] = grid->getPasswordUrl();
+                // gridInfo[i]["firstname"] = grid->getFirstName();
+                // gridInfo[i]["lastname"] = grid->getLastName();
+                // gridInfo[i]["avatarpassword"] = grid->getAvatarPassword();
+                
+                //gridInfo[i]["search"] = grid->getSearchUrl();
+                gridInfo[i]["render_compat"] = grid->isRenderCompat();
+        }
+
+        // write client grid info file
+        std::string fileName = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "grid_info.xml");
+        llofstream file;
+        file.open(fileName.c_str());
+        if (file.is_open()) {
+                LLSDSerialize::toPrettyXML(gridInfo, file);
+                file.close();
+                llinfos << "Saved grids to " << fileName << llendl;
+        } else {
+                llerrs << "Unable to open grid info file: " << fileName << llendl;
+        }
+}
diff --git a/linden/indra/newview/hippoGridManager.h b/linden/indra/newview/hippoGridManager.h
new file mode 100644
index 0000000..ef351d9
--- /dev/null
+++ b/linden/indra/newview/hippoGridManager.h
@@ -0,0 +1,174 @@
+#ifndef __HIPPO_GRID_MANAGER_H__
+#define __HIPPO_GRID_MANAGER_H__
+
+
+#include <map>
+#include <string>
+
+#ifndef XML_STATIC
+#define XML_STATIC
+#endif
+
+#ifdef LL_STANDALONE
+#include <expat.h>
+#else
+#include "expat/expat.h"
+#endif
+
+class LLSD;
+
+
+class HippoGridInfo
+{
+public:
+    enum Platform {
+        PLATFORM_OTHER = 0,
+        PLATFORM_OPENSIM,
+        PLATFORM_SECONDLIFE,
+        PLATFORM_LAST
+    };
+    enum SearchType {
+        SEARCH_ALL_EMPTY,
+        SEARCH_ALL_QUERY,
+        SEARCH_ALL_TEMPLATE
+    };
+
+    explicit HippoGridInfo(const std::string &gridNick);
+
+    Platform           getPlatform();
+    bool isOpenSimulator() const;
+    bool isSecondLife() const;
+    const std::string& getGridNick()        const;
+    const std::string& getGridName()        const;
+    const std::string& getLoginUri()        const;
+    const std::string& getLoginPage()       const;
+    const std::string& getHelperUri()       const;
+    const std::string& getWebSite()         const;
+    const std::string& getSupportUrl()      const;
+    const std::string& getRegisterUrl()     const;
+    const std::string& getPasswordUrl()     const;
+    const std::string& getSearchUrl()       const;
+    const std::string& getFirstName()       const;
+    const std::string& getLastName()        const;
+    const std::string& getAvatarPassword()  const;
+    std::string getSearchUrl(SearchType ty) const;
+    bool isRenderCompat()                   const;
+
+    const std::string& getCurrencySymbol()     const;
+    const std::string& getRealCurrencySymbol() const;
+    std::string getUploadFee()                 const;
+    std::string getGroupCreationFee()          const;
+    std::string getDirectoryFee()              const;
+
+    void setPlatform (const std::string &platform);
+    void setPlatform (Platform platform);
+    void setGridName (const std::string &gridName);
+    void setLoginUri (const std::string &loginUri);
+    void setLoginPage(const std::string &loginPage);
+    void setHelperUri(const std::string &helperUri);
+    void setWebSite  (const std::string &website);
+    void setSupportUrl(const std::string &url);
+    void setRegisterUrl(const std::string &url);
+    void setPasswordUrl(const std::string &url);
+    void setSearchUrl(const std::string &url);
+    void setRenderCompat(bool compat);
+    void setFirstName(const std::string &firstName);
+    void setLastName(const std::string &lastName);
+    void setAvatarPassword(const std::string &avatarPassword);
+
+    void setCurrencySymbol(const std::string &sym);
+    void setRealCurrencySymbol(const std::string &sym);
+    void setDirectoryFee(int fee);
+
+    bool retrieveGridInfo();
+
+    static const char *getPlatformString(Platform platform);
+    static std::string sanitizeGridNick(std::string &gridnick);
+
+    static HippoGridInfo FALLBACK_GRIDINFO;
+    static void initFallback();
+
+private:
+    Platform mPlatform;
+    std::string mGridNick;
+    std::string mGridName;
+    std::string mLoginUri;
+    std::string mLoginPage;
+    std::string mHelperUri;
+    std::string mWebSite;
+    std::string mSupportUrl;
+    std::string mRegisterUrl;
+    std::string mPasswordUrl;
+    std::string mSearchUrl;
+    std::string mFirstName;
+    std::string mLastName;
+    std::string mAvatarPassword;
+    bool mRenderCompat;
+
+    std::string mCurrencySymbol;
+    std::string mRealCurrencySymbol;
+    int mDirectoryFee;
+
+    // for parsing grid info XML
+    enum XmlState {
+        XML_VOID, XML_GRIDNICK, XML_PLATFORM, XML_GRIDNAME,
+        XML_LOGINURI, XML_LOGINPAGE, XML_HELPERURI,
+        XML_WEBSITE, XML_SUPPORT, XML_REGISTER, XML_PASSWORD, XML_SEARCH
+    };
+    XmlState mXmlState;
+
+    static std::string sanitizeUri(std::string &uri);
+    void formatFee(std::string &fee, int cost, bool showFree) const;
+
+    static void onXmlElementStart(void *userData, const XML_Char *name, const XML_Char **atts);
+    static void onXmlElementEnd(void *userData, const XML_Char *name);
+    static void onXmlCharacterData(void *userData, const XML_Char *s, int len);
+};
+
+
+class HippoGridManager
+{
+public:
+    HippoGridManager();
+    ~HippoGridManager();
+
+    void init();
+    void saveFile();
+    void discardAndReload();
+
+    HippoGridInfo* getGrid(const std::string &grid) const;
+    HippoGridInfo* getConnectedGrid()               const;
+    HippoGridInfo* getCurrentGrid()                 const;
+    const std::string& getDefaultGridNick()         const;
+    const std::string& getCurrentGridNick()         const;
+
+    void setDefaultGrid(const std::string &grid);
+    void setCurrentGrid(const std::string &grid);
+    void setCurrentGridAsConnected();
+
+    void addGrid(HippoGridInfo *grid);
+    void deleteGrid(const std::string &grid);
+
+    typedef std::map<std::string, HippoGridInfo*>::iterator GridIterator;
+    GridIterator beginGrid() { return mGridInfo.begin(); }
+    GridIterator endGrid() { return mGridInfo.end(); }
+
+private:
+    std::map<std::string, HippoGridInfo*> mGridInfo;
+    std::string mDefaultGrid;
+    std::string mCurrentGrid;
+    HippoGridInfo *mConnectedGrid;
+    int mDefaultGridsVersion;
+
+    void cleanup();
+    void loadFromFile();
+    void parseFile(const std::string &fileName, bool mergeIfNewer);
+    void parseUrl(const char *url, bool mergeIfNewer);
+    void parseData(LLSD &gridInfo, bool mergeIfNewer);
+};
+
+
+extern HippoGridManager *gHippoGridManager;
+
+
+#endif
diff --git a/linden/indra/newview/hippoLimits.cpp b/linden/indra/newview/hippoLimits.cpp
new file mode 100644
index 0000000..dae81a6
--- /dev/null
+++ b/linden/indra/newview/hippoLimits.cpp
@@ -0,0 +1,56 @@
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "hippoLimits.h"
+
+#include "hippoGridManager.h"
+
+#include <llerror.h>
+
+
+HippoLimits *gHippoLimits = 0;
+
+
+HippoLimits::HippoLimits()
+{
+        setLimits();
+}
+
+
+void HippoLimits::setLimits()
+{
+        if (gHippoGridManager->getConnectedGrid()->getPlatform() == HippoGridInfo::PLATFORM_SECONDLIFE) {
+                setSecondLifeLimits();
+        } else {
+                setOpenSimLimits();
+        }
+}
+
+
+void HippoLimits::setOpenSimLimits()
+{
+        mMaxAgentGroups = 100;
+        mMaxPrimScale = 256.0f;
+        mMaxHeight = 10000.0f;
+        if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) {
+                llinfos << "Using rendering compatible OpenSim limits." << llendl;
+                mMinHoleSize = 0.05f;  
+                mMaxHollow = 0.95f;
+        } else {
+                llinfos << "Using Hippo OpenSim limits." << llendl;
+                mMinHoleSize = 0.01f;  
+                mMaxHollow = 0.99f;
+        }
+}
+
+void HippoLimits::setSecondLifeLimits()
+{
+        llinfos << "Using Second Life limits." << llendl;
+        mMaxAgentGroups = 25;
+        mMaxPrimScale = 10.0f;
+        mMaxHeight = 4096.0f;
+        mMinHoleSize = 0.05f;  
+        mMaxHollow = 0.95f;
+}
+
diff --git a/linden/indra/newview/hippoLimits.h b/linden/indra/newview/hippoLimits.h
new file mode 100644
index 0000000..900480b
--- /dev/null
+++ b/linden/indra/newview/hippoLimits.h
@@ -0,0 +1,33 @@
+#ifndef __HIPPO_LIMITS_H__
+#define __HIPPO_LIMITS_H__
+
+
+class HippoLimits
+{
+public:
+        HippoLimits();
+
+        int   getMaxAgentGroups() const { return mMaxAgentGroups; }
+        float getMaxHeight()      const { return mMaxHeight;      }
+        float getMinHoleSize()    const { return mMinHoleSize;    }
+        float getMaxHollow()      const { return mMaxHollow;      }
+        float getMaxPrimScale()   const { return mMaxPrimScale;   }
+
+        void setLimits();
+
+private:
+        int   mMaxAgentGroups;
+        float mMaxHeight;
+        float mMinHoleSize;
+        float mMaxHollow;
+        float mMaxPrimScale;
+
+        void setOpenSimLimits();
+        void setSecondLifeLimits();
+};
+
+
+extern HippoLimits *gHippoLimits;
+
+
+#endif
diff --git a/linden/indra/newview/hippoRestRequest.cpp b/linden/indra/newview/hippoRestRequest.cpp
new file mode 100644
index 0000000..20e6187
--- /dev/null
+++ b/linden/indra/newview/hippoRestRequest.cpp
@@ -0,0 +1,56 @@
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "hippoRestRequest.h"
+
+#ifndef CURL_STATICLIB
+#define CURL_STATICLIB 1
+#endif
+#include <curl/curl.h>
+
+#include <stdtypes.h>
+#include <llerror.h>
+
+
+static size_t curlWrite(void *ptr, size_t size, size_t nmemb, void *userData)
+{
+        std::string *result = (std::string*)userData;
+        size_t bytes = (size * nmemb);
+        result->append((char*)ptr, bytes);
+        return nmemb;
+}
+
+
+//static
+int HippoRestRequest::getBlocking(const std::string &url, std::string *result)
+{
+        llinfos << "Requesting: " << url << llendl;
+
+        char curlErrorBuffer[CURL_ERROR_SIZE];
+        CURL* curlp = curl_easy_init();
+
+        curl_easy_setopt(curlp, CURLOPT_NOSIGNAL, 1);   // don't use SIGALRM for timeouts
+        curl_easy_setopt(curlp, CURLOPT_TIMEOUT, 5);    // seconds
+
+        curl_easy_setopt(curlp, CURLOPT_WRITEFUNCTION, curlWrite);
+        curl_easy_setopt(curlp, CURLOPT_WRITEDATA, result);
+        curl_easy_setopt(curlp, CURLOPT_URL, url.c_str());
+        curl_easy_setopt(curlp, CURLOPT_ERRORBUFFER, curlErrorBuffer);
+        curl_easy_setopt(curlp, CURLOPT_FAILONERROR, 1);
+
+        *result = "";
+        S32 curlSuccess = curl_easy_perform(curlp);
+        S32 httpStatus = 499;
+        curl_easy_getinfo(curlp, CURLINFO_RESPONSE_CODE, &httpStatus);
+
+        if (curlSuccess != 0) {
+                llwarns << "CURL ERROR (HTTP Status " << httpStatus << "): " << curlErrorBuffer << llendl;
+        } else if (httpStatus != 200) {
+                llwarns << "HTTP Error " << httpStatus << ", but no Curl error." << llendl;
+        }
+        
+        curl_easy_cleanup(curlp);
+        return httpStatus;
+}
+
diff --git a/linden/indra/newview/hippoRestRequest.h b/linden/indra/newview/hippoRestRequest.h
new file mode 100644
index 0000000..1dcb4a0
--- /dev/null
+++ b/linden/indra/newview/hippoRestRequest.h
@@ -0,0 +1,16 @@
+#ifndef __HIPPO_REST_REQTUEST_H__
+#define __HIPPO_REST_REQTUEST_H__
+
+
+#include <string>
+
+
+class HippoRestRequest
+{
+  public:
+    static int getBlocking(const std::string &url, std::string *result);
+        
+};
+
+
+#endif
diff --git a/linden/indra/newview/hippoUpdate.cpp b/linden/indra/newview/hippoUpdate.cpp
new file mode 100644
index 0000000..872ca30
--- /dev/null
+++ b/linden/indra/newview/hippoUpdate.cpp
@@ -0,0 +1,92 @@
+
+#include "hippoUpdate.h"
+
+#include <cstdio>
+#include <list>
+#include <vector>
+
+#include <stdtypes.h>
+#include <llhttpclient.h>
+#include <llmemory.h>
+#include <llversionviewer.h>
+#include "llviewercontrol.h"
+#include "llviewernetwork.h"
+#include "llweb.h"
+#include <llwindow.h>
+
+
+std::string gHippoChannel;
+
+
+// static
+bool HippoUpdate::checkUpdate()
+{
+        llinfos << "Hippo Update Check..." << llendl;
+
+        // get channel name
+        gHippoChannel = gSavedSettings.getString("ChannelName");
+
+        // get mac address
+        char macAddress[18];
+        sprintf(macAddress, "%02x:%02x:%02x:%02x:%02x:%02x",
+                gMACAddress[0], gMACAddress[1], gMACAddress[2], gMACAddress[3], gMACAddress[4], gMACAddress[5]);
+
+        // build URL for update check
+        char url[1000];
+        snprintf(url, 1000, 
+/*              "http://update.mjm.game-host.org/os/viewer.php?"
+                "product=%s&channel=%s&"
+                "version_major=%d&version_minor=%d&version_patch=%d&version_base=%s&"
+                "platform=%s&mac=%s",
+                LL_PRODUCT, LL_CHANNEL_CSTR,
+                LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BASE,
+                LL_PLATFORM*/"", macAddress);
+
+        // query update server
+        std::string escaped_url = LLWeb::escapeURL(url);
+        LLSD response = LLHTTPClient::blockingGet(escaped_url.c_str());
+
+        // check response, return on error
+        S32 status = response["status"].asInteger();
+        if ((status != 200) || !response["body"].isMap()) {
+                llinfos << "Hippo Update failed (" << status << "): "
+                        << (response["body"].isString()? response["body"].asString(): "<unknown error>")
+                        << llendl;
+                return true;
+        }
+
+        // get data from response
+        LLSD data = response["body"];
+        std::string webpage = (data.has("webpage") && data["webpage"].isString())? data["webpage"].asString(): "";
+        std::string message = (data.has("message") && data["message"].isString())? data["message"].asString(): "";
+        std::string yourVersion = (data.has("yourVersion") && data["yourVersion"].isString())? data["yourVersion"].asString(): "";
+        std::string curVersion = (data.has("curVersion") && data["curVersion"].isString())? data["curVersion"].asString(): "";
+        bool update = (data.has("update") && data["update"].isBoolean())? data["update"].asBoolean(): false;
+        bool mandatory = (data.has("mandatory") && data["mandatory"].isBoolean())? data["mandatory"].asBoolean(): false;
+
+        // log and return, if no update available
+        llinfos << "Your version is " << yourVersion << ", current version is " << curVersion << '.' << llendl;
+        if (!update) return true;
+        llinfos << "Update is " << (mandatory? "mandatory.": "optional.") << llendl;
+
+        // show update dialog
+        char msg[1000];
+        snprintf(msg, 1000,
+                "There is a new viewer version available.\n"
+                "\n"
+                "Your version: %s\n"
+                "Current version: %s\n"
+                "%s\n"
+                "Do you want to visit the web site?",
+                yourVersion.c_str(), curVersion.c_str(),
+                mandatory? "\nThis is a mandatory update.\n": "");
+        S32 button = OSMessageBox(msg, "Hippo OpenSim Viewer Update", OSMB_YESNO);
+        if (button == OSBTN_YES) {
+                llinfos << "Taking user to " << webpage << llendl;
+                LLWeb::loadURLExternal(webpage);
+                // exit the viewer
+                return false;
+        }
+
+        return !mandatory;
+}
diff --git a/linden/indra/newview/hippoUpdate.h b/linden/indra/newview/hippoUpdate.h
new file mode 100644
index 0000000..559c8b3
--- /dev/null
+++ b/linden/indra/newview/hippoUpdate.h
@@ -0,0 +1,12 @@
+#ifndef __HIPPO_UPDATE_H__
+#define __HIPPO_UPDATE_H__
+
+
+class HippoUpdate
+{
+  public:
+        static bool checkUpdate();
+};
+
+
+#endif
diff --git a/linden/indra/newview/jcfloater_animation_list.cpp b/linden/indra/newview/jcfloater_animation_list.cpp
new file mode 100644
index 0000000..368e7d6
--- /dev/null
+++ b/linden/indra/newview/jcfloater_animation_list.cpp
@@ -0,0 +1,462 @@
+/* Copyright (c) 2009
+ *
+ * Modular Systems Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. Neither the name Modular Systems Ltd nor the names of its contributors
+ *      may be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS LTD AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "lluuid.h"
+#include "lluictrlfactory.h"
+#include "llvoavatar.h"
+
+#include "llagent.h"
+
+#include "llscrolllistctrl.h"
+
+#include "llviewerobjectlist.h"
+
+#include "jcfloater_animation_list.h"
+
+#include "llviewercontrol.h"
+
+#include "llinventorymodel.h"
+
+#include "llcategory.h"
+
+#include "llfloaterchat.h"
+
+#include "llfloateravatarinfo.h"
+
+
+
+
+
+//std::map<LLUUID, AObjectData> JCFloaterAnimList::mObjectOwners;
+
+JCFloaterAnimList::JCFloaterAnimList(const LLSD& seed) : 
+        LLFloater(std::string("animation list")),
+        mAnimList(0)
+{
+        BOOL no_open = FALSE;
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_animation_list.xml",&getFactoryMap(),no_open);
+}
+
+JCFloaterAnimList::~JCFloaterAnimList()
+{
+}
+
+//static 
+bool JCFloaterAnimList::visible(LLFloater* instance, const LLSD& key)
+{
+        return VisibilityPolicy<LLFloater>::visible(instance, key);
+}
+
+//static 
+void JCFloaterAnimList::show(LLFloater* instance, const LLSD& key)
+{
+        VisibilityPolicy<LLFloater>::show(instance, key);
+}
+
+//static 
+void JCFloaterAnimList::hide(LLFloater* instance, const LLSD& key)
+{
+        VisibilityPolicy<LLFloater>::hide(instance, key);
+}
+
+void JCFloaterAnimList::onVisibilityChange(BOOL new_visibility)
+{
+        if(!new_visibility) {
+                // *HACK: clean up memory on hiding
+                mObjectOwners.clear();
+        }
+}
+
+BOOL JCFloaterAnimList::postBuild()
+{
+        mAnimList = getChild<LLScrollListCtrl>("animation_list");
+        mAnimList->setCallbackUserData(this);
+        mAnimList->setDoubleClickCallback(onDoubleClick);
+        mAnimList->sortByColumn("animation_uuid", TRUE);
+
+        childSetAction("Stop Selected",StopSelected,this);
+        childSetAction("Revoke Selected",RevokeSelected,this);
+        childSetAction("Stop+Revoke Selected",StopRevokeSelected,this);
+        childSetAction("Open Owner Profile",OpenProfile,this);
+
+        return 1;
+}
+
+void JCFloaterAnimList::StopSelected(void *userdata )
+{
+        JCFloaterAnimList *self = (JCFloaterAnimList*)userdata;
+        LLDynamicArray<LLUUID> ids;
+        std::vector< LLScrollListItem * > items = self->mAnimList->getAllSelected();
+        for( std::vector< LLScrollListItem * >::iterator itr = items.begin(); itr != items.end(); itr++ )
+        {
+                LLScrollListItem *item = *itr;
+                const LLUUID &id = item->getColumn(LIST_ANIMATION_UUID)->getValue().asUUID();
+                if( ids.find(id) == LLDynamicArray<LLUUID>::FAIL )
+                {
+                        ids.put(id);
+                }
+        }
+        gAgent.sendAnimationRequests(ids,ANIM_REQUEST_STOP);
+}
+
+void JCFloaterAnimList::RevokeSelected(void *userdata )
+{
+        JCFloaterAnimList *self = (JCFloaterAnimList*)userdata;
+        LLDynamicArray<LLUUID> ids;
+        std::vector< LLScrollListItem * > items = self->mAnimList->getAllSelected();
+        for( std::vector< LLScrollListItem * >::iterator itr = items.begin(); itr != items.end(); itr++ )
+        {
+                LLScrollListItem *item = *itr;
+                const LLUUID &id = item->getColumn(LIST_OBJECT_UUID)->getValue().asUUID();
+                if( ids.find(id) == LLDynamicArray<LLUUID>::FAIL )
+                {
+                        ids.put(id);
+                }
+        }
+        if( !ids.empty() )
+        {
+                for(LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
+                {
+                        LLUUID id = *itr;
+                        LLMessageSystem* msg = gMessageSystem;
+                        msg->newMessageFast(_PREHASH_RevokePermissions);
+                        msg->nextBlockFast(_PREHASH_AgentData);
+                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                        msg->nextBlockFast(_PREHASH_Data);
+                        msg->addUUIDFast(_PREHASH_ObjectID, id);
+                        msg->addU32Fast(_PREHASH_ObjectPermissions, U32_MAX);
+                        gAgent.sendReliableMessage();
+                }
+        }
+}
+
+void JCFloaterAnimList::StopRevokeSelected(void *userdata )
+{
+        StopSelected(userdata);
+        RevokeSelected(userdata);
+}
+
+void JCFloaterAnimList::OpenProfile(void *userdata )
+{
+        JCFloaterAnimList *self = (JCFloaterAnimList*)userdata;
+        std::vector< LLScrollListItem * > items = self->mAnimList->getAllSelected();
+        if(!items.empty())
+        {
+                //LLVOAvatar* avatarp = gAgent.getAvatarObject();       
+                for(std::vector< LLScrollListItem * >::iterator itr = items.begin(); itr != items.end(); ++itr)
+                {
+                        LLScrollListItem *item = *itr;
+                        const LLUUID &object_id = item->getColumn(LIST_OBJECT_UUID)->getValue().asUUID();
+                        LLFloaterAvatarInfo::showFromDirectory(self->mObjectOwners[object_id].owner_id);
+                }
+        }
+}
+
+/*void JCFloaterAnimList::ReturnSelected(void *userdata )
+{
+        JCFloaterAnimList *self = (JCFloaterAnimList*)userdata;
+        LLDynamicArray<LLUUID> ids = self->mAnimList->getSelectedIDs();
+        if(ids.size() > 0)
+        {
+                LLVOAvatar* avatarp = gAgent.getAvatarObject(); 
+                for(LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
+                {
+                        LLUUID id = *itr;
+
+                }
+        }
+}*/
+
+void JCFloaterAnimList::draw()
+{
+        refresh();
+        LLFloater::draw();
+}
+//LLScrollListCtrl::getSelectedIDs();
+void JCFloaterAnimList::refresh()
+{
+        LLDynamicArray<LLUUID> selected = mAnimList->getSelectedIDs();
+        S32 scrollpos = mAnimList->getScrollPos();
+        mAnimList->deleteAllItems();
+        LLVOAvatar* avatarp = gAgent.getAvatarObject();         
+        if (avatarp)
+        {
+                LLVOAvatar::AnimSourceIterator ai;
+
+                for(ai = avatarp->mAnimationSources.begin(); ai != avatarp->mAnimationSources.end(); ++ai)
+                {
+                        LLSD element;
+                        const LLUUID &aifirst = ai->first;
+                        LLViewerInventoryItem* item = gInventory.getItem(findItemID(ai->second,0));
+
+                        // *NOTE: conceal id to prevent bugs, use
+                        // item->getColumn(LIST_ANIMATION_UUID)->getValue().asUUID()
+                        // instead
+                        element["id"] = LLUUID::null.combine(ai->second);
+                        element["columns"][LIST_ANIMATION_NAME]["column"] = "Anim Name";
+                        element["columns"][LIST_ANIMATION_NAME]["type"] = "text";
+                        element["columns"][LIST_ANIMATION_NAME]["color"] = gColors.getColor("ScrollUnselectedColor").getValue();
+                        if(item)
+                        {
+                                element["columns"][LIST_ANIMATION_NAME]["value"] = item->getName();//ai->second//"avatar_icon";
+                        }else
+                        {
+                                element["columns"][LIST_ANIMATION_NAME]["value"] = "Not in Inventory";
+                        }
+                        element["columns"][LIST_ANIMATION_UUID]["column"] = "Animation UUID";
+                        element["columns"][LIST_ANIMATION_UUID]["type"] = "text";
+                        element["columns"][LIST_ANIMATION_UUID]["color"] = gColors.getColor("ScrollUnselectedColor").getValue();
+                        element["columns"][LIST_ANIMATION_UUID]["value"] = ai->second;
+                        element["columns"][LIST_OBJECT_UUID]["column"] = "Source Object UUID";
+                        element["columns"][LIST_OBJECT_UUID]["type"] = "text";
+                        element["columns"][LIST_OBJECT_UUID]["color"] = gColors.getColor("ScrollUnselectedColor").getValue();
+                        element["columns"][LIST_OBJECT_UUID]["value"] = aifirst;
+                        element["columns"][LIST_OBJECT_OWNER]["column"] = "Source Owner";
+                        element["columns"][LIST_OBJECT_OWNER]["type"] = "text";
+                        element["columns"][LIST_OBJECT_OWNER]["color"] = gColors.getColor("ScrollUnselectedColor").getValue();
+                        std::string name("?");
+                        LLViewerObject *object = gObjectList.findObject(aifirst);
+                        bool is_first = ( mObjectOwners.count( aifirst ) == 0 );
+                        bool just_shown = false;
+                        LLUUID owner_id(LLUUID::null);
+
+                        if( !is_first )
+                        {
+                                name = mObjectOwners[aifirst].owner_name;
+                                owner_id = mObjectOwners[aifirst].owner_id;
+                        }
+
+                        if( object )
+                        {
+                                if( object->permYouOwner() )
+                                {
+                                        owner_id = gAgent.getID();
+                                        gAgent.getName(name);
+                                }
+                                else
+                                {
+                                        object = (LLViewerObject *) object->getRoot();
+                                        if( object->isAvatar() )
+                                        {
+                                                owner_id = object->getID();
+                                                name = ((LLVOAvatar *)object)->getFullname();
+                                        }
+                                }
+                        }
+
+                        {
+                                AObjectData &data = mObjectOwners[aifirst];
+                                if( object )
+                                {
+                                        if( !data.in_object_list )
+                                        {
+                                                just_shown = true;
+                                                data.in_object_list = true;
+                                        }
+                                        data.root_id = ( (LLViewerObject*)object->getRoot() )->getID();
+                                }
+                                data.owner_name = name;
+                                data.owner_id = owner_id;
+                        }
+
+                        if( is_first || just_shown ) {
+                                if( name == "?" && !aifirst.isNull()) {
+                                        LLMessageSystem* msg = gMessageSystem;
+                                        msg->newMessageFast(_PREHASH_RequestObjectPropertiesFamily);
+                                        msg->nextBlockFast(_PREHASH_AgentData);
+                                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                        msg->nextBlockFast(_PREHASH_ObjectData);
+                                        msg->addU32Fast(_PREHASH_RequestFlags, 0 );
+                                        if( object )
+                                        {
+                                                LL_INFOS("Avatar List") << "Sending RequestObjectPropertiesFamily packet for id( " << aifirst.asString() << " ) on object( " << object->getID().asString() << " )" << LL_ENDL;
+                                                msg->addUUIDFast(_PREHASH_ObjectID, object->getID());
+                                        }
+                                        else
+                                        {
+                                                LL_INFOS("Avatar List") << "Sending RequestObjectPropertiesFamily packet for id( " << aifirst.asString() << " )" << LL_ENDL;
+                                                msg->addUUIDFast(_PREHASH_ObjectID, aifirst);
+                                        }
+                                        gAgent.sendReliableMessage();
+                                }
+                        }
+                        element["columns"][LIST_OBJECT_OWNER]["value"] = name;
+                        mAnimList->addElement(element, ADD_BOTTOM);
+                        //LLViewerObject* objectp = gObjectList.findObject(ai->first);
+                        //if(objectp)
+                        //{
+                        //      //objectp->
+                        //}
+
+                        //object_ids.insert(ai->first);
+                        //animation_ids.insert(ai->second);
+                }
+        }
+
+        mAnimList->sortItems();
+        mAnimList->selectMultiple(selected);
+        mAnimList->setScrollPos(scrollpos);
+}
+
+void JCFloaterAnimList::callbackLoadOwnerName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
+{
+        LLUUID *oid = (LLUUID*)data;
+        JCFloaterAnimList *self = JCFloaterAnimList::getInstance(LLSD());
+        if(self->mObjectOwners.count( *oid ) > 0)
+        {
+                self->mObjectOwners[*oid].owner_name = first + " " + last;
+        }
+        delete oid;
+}
+
+void JCFloaterAnimList::processObjectPropertiesFamily(LLMessageSystem* msg, void** user_data)
+{
+        if(!JCFloaterAnimList::instanceVisible(LLSD())) return;
+        JCFloaterAnimList *self = JCFloaterAnimList::getInstance(LLSD());
+        LLUUID object_id;
+        U32 request_flags;
+        LLUUID creator_id;
+        LLUUID owner_id;
+        LLUUID group_id;
+        LLUUID extra_id;
+        U32 base_mask, owner_mask, group_mask, everyone_mask, next_owner_mask;
+        LLSaleInfo sale_info;
+        LLCategory category;
+        msg->getU32Fast(_PREHASH_ObjectData, _PREHASH_RequestFlags,     request_flags );
+        msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_ObjectID,                object_id );
+        msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_OwnerID,         owner_id );
+        msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_GroupID,         group_id );
+        msg->getU32Fast(_PREHASH_ObjectData, _PREHASH_BaseMask,         base_mask );
+        msg->getU32Fast(_PREHASH_ObjectData, _PREHASH_OwnerMask,                owner_mask );
+        msg->getU32Fast(_PREHASH_ObjectData,_PREHASH_GroupMask,         group_mask );
+        msg->getU32Fast(_PREHASH_ObjectData, _PREHASH_EveryoneMask,     everyone_mask );
+        msg->getU32Fast(_PREHASH_ObjectData, _PREHASH_NextOwnerMask, next_owner_mask);
+        sale_info.unpackMessage(msg, _PREHASH_ObjectData);
+        category.unpackMessage(msg, _PREHASH_ObjectData);
+        LLUUID last_owner_id;
+        msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_LastOwnerID, last_owner_id );
+        std::string name;
+        msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Name, name);
+        std::string desc;
+        msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Description, desc);
+
+        for( std::map<LLUUID, AObjectData>::iterator di = self->mObjectOwners.begin(); di != self->mObjectOwners.end(); di++ )
+        {
+                const LLUUID &id = di->first;
+                const AObjectData &data = di->second;
+                
+                if(data.root_id == object_id || data.owner_id == object_id)
+                {
+                        LLUUID* ref = new LLUUID(id);
+                        self->mObjectOwners[id].owner_id = owner_id;
+                        gCacheName->get(owner_id, FALSE, callbackLoadOwnerName, (void*)ref);
+                }
+        }
+}
+
+const LLUUID& JCFloaterAnimList::findItemID(const LLUUID& asset_id, BOOL copyable_only)
+{
+        LLViewerInventoryCategory::cat_array_t cats;
+        LLViewerInventoryItem::item_array_t items;
+        LLAssetIDMatches asset_id_matches(asset_id);
+        gInventory.collectDescendentsIf(LLUUID::null,
+                                                        cats,
+                                                        items,
+                                                        LLInventoryModel::INCLUDE_TRASH,
+                                                        asset_id_matches);
+
+        if (items.count())
+        {
+                // search for copyable version first
+                for (S32 i = 0; i < items.count(); i++)
+                {
+                        LLInventoryItem* itemp = items[i];
+                        LLPermissions item_permissions = itemp->getPermissions();
+                        if (item_permissions.allowCopyBy(gAgent.getID(), gAgent.getGroupID()))
+                        {
+                                return itemp->getUUID();
+                        }
+                }
+                // otherwise just return first instance, unless copyable requested
+                if (copyable_only)
+                {
+                        return LLUUID::null;
+                }
+                else
+                {
+                        return items[0]->getUUID();
+                }
+        }
+
+        return LLUUID::null;
+}
+
+/*void JCFloaterAnimList::onClickCopyAnimationUUID(void *userdata)
+{
+        LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+        LLScrollListItem *item = self->mAvatarList->getFirstSelected();
+
+        if ( NULL == item ) return;
+
+        LLUUID agent_id = item->getUUID();
+
+        char buffer[UUID_STR_LENGTH];           
+        agent_id.toString(buffer);
+
+        gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer));
+}*/
+
+void JCFloaterAnimList::onDoubleClick(void *userdata)
+{
+        //JCFloaterAnimList *self = (JCFloaterAnimList*)userdata;
+        //LLScrollListItem *item =   self->mAnimList->getFirstSelected();
+        //if(!item)return;
+        //LLUUID agent_id = item->getUUID();
+
+        //gAgent.setFocusObject(gObjectList.findObject(agent_id));
+        //gAgent.setFocusOnAvatar(FALSE, TRUE);
+}
+
+void JCFloaterAnimList::close(bool app)
+{
+        //sInstance->setVisible(0);
+//#ifdef RECONSTRUCT_ON_TOGGLE
+//      sInstance = NULL;
+        LLFloater::close(app);
+//#else
+//      sInstance->setVisible(!(sInstance->getVisible()));
+//#endif
+}
+
diff --git a/linden/indra/newview/jcfloater_animation_list.h b/linden/indra/newview/jcfloater_animation_list.h
new file mode 100644
index 0000000..61bf635
--- /dev/null
+++ b/linden/indra/newview/jcfloater_animation_list.h
@@ -0,0 +1,88 @@
+/* Copyright (c) 2009
+ *
+ * Modular Systems Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *   3. Neither the name Modular Systems Ltd nor the names of its contributors
+ *      may be used to endorse or promote products derived from this
+ *      software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY MODULAR SYSTEMS LTD AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MODULAR SYSTEMS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "llfloater.h"
+#include "lluuid.h"
+#include "llstring.h"
+
+struct AObjectData
+{
+        std::string owner_name;
+        LLUUID owner_id;
+        LLUUID root_id;
+        bool in_object_list;
+};
+
+class JCFloaterAnimList : public LLFloater, public LLUISingleton<JCFloaterAnimList, JCFloaterAnimList>
+{
+public:
+        JCFloaterAnimList(const LLSD& seed);
+        virtual ~JCFloaterAnimList();
+
+        /*virtual*/ BOOL postBuild();
+        /*virtual*/ void draw();
+        /*virtual*/ void onVisibilityChange(BOOL new_visibility);
+
+        /*virtual*/ void close(bool app = 0);
+         void refresh();
+
+        const LLUUID& findItemID(const LLUUID& asset_id, BOOL copyable_only);
+
+        static void callbackLoadOwnerName(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data);
+
+        static void processObjectPropertiesFamily(LLMessageSystem* msg, void** user_data);
+
+        static bool visible(LLFloater* instance, const LLSD& key);
+        static void show(LLFloater* instance, const LLSD& key);
+        static void hide(LLFloater* instance, const LLSD& key);
+
+private:
+
+        enum ANIMATION_COLUMN_ORDER
+        {
+                LIST_ANIMATION_NAME,
+                LIST_ANIMATION_UUID,
+                LIST_OBJECT_UUID,
+                LIST_OBJECT_OWNER
+        };
+
+        LLScrollListCtrl* mAnimList;
+
+        std::map<LLUUID, AObjectData> mObjectOwners;
+
+        static void StopSelected(void *userdata );
+        static void RevokeSelected(void *userdata );
+        static void StopRevokeSelected(void *userdata );
+        static void OpenProfile(void *userdata );
+        static void onDoubleClick(void *userdata);
+
+};
+
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 1193d22..b3321fc 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -192,6 +192,8 @@ const F32 OBJECT_MIN_ZOOM = 0.02f;
 const F32 APPEARANCE_MIN_ZOOM = 0.39f;
 const F32 APPEARANCE_MAX_ZOOM = 8.f;
 
+const F32 DIST_FUDGE = 16.f; // meters
+
 // fidget constants
 const F32 MIN_FIDGET_TIME = 8.f; // seconds
 const F32 MAX_FIDGET_TIME = 20.f; // seconds
@@ -216,6 +218,7 @@ LLAgent gAgent;
 //
 // Statics
 //
+BOOL LLAgent::sPhantom = FALSE;
 
 const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f;
 
@@ -452,6 +455,10 @@ void LLAgent::init()
 //-----------------------------------------------------------------------------
 void LLAgent::cleanup()
 {
+        mInitialized = FALSE;
+        mWearablesLoaded = FALSE;
+        mShowAvatar = TRUE;
+
         setSitCamera(LLUUID::null);
         mAvatarObject = NULL;
         if(mLookAt)
@@ -751,6 +758,9 @@ void LLAgent::movePitch(S32 direction)
 // Does this parcel allow you to fly?
 BOOL LLAgent::canFly()
 {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0c)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_FLY)) return FALSE;
+// [/RLVa:KB]
         if (isGodlike()) return TRUE;
 
         LLViewerRegion* regionp = getRegion();
@@ -790,6 +800,13 @@ void LLAgent::setFlying(BOOL fly)
 
         if (fly)
         {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0c)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_FLY))
+                {
+                        return;
+                }
+// [/RLVa:KB]
+
                 BOOL was_flying = getFlying();
                 if (!canFly() && !was_flying)
                 {
@@ -829,6 +846,35 @@ void LLAgent::toggleFlying()
 
 
 //-----------------------------------------------------------------------------
+// togglePhantom()
+//-----------------------------------------------------------------------------
+void LLAgent::togglePhantom()
+{
+        BOOL phan = !(sPhantom);
+
+        setPhantom( phan );
+}
+
+
+//-----------------------------------------------------------------------------
+// setPhantom()  lgg
+//-----------------------------------------------------------------------------
+void LLAgent::setPhantom(BOOL phantom)
+{
+        sPhantom = phantom;
+}
+
+
+//-----------------------------------------------------------------------------
+// getPhantom()  lgg
+//-----------------------------------------------------------------------------
+BOOL LLAgent::getPhantom()
+{
+        return sPhantom;
+}
+
+
+//-----------------------------------------------------------------------------
 // setRegion()
 //-----------------------------------------------------------------------------
 void LLAgent::setRegion(LLViewerRegion *regionp)
@@ -1670,6 +1716,10 @@ F32 LLAgent::getCameraZoomFraction()
                 // already [0,1]
                 return mHUDTargetZoom;
         }
+        else if (gSavedSettings.getBOOL("DisableCameraConstraints"))
+        {
+                return mCameraZoomFraction;
+        }
         else if (mFocusOnAvatar && cameraThirdPerson())
         {
                 return clamp_rescale(mCameraZoomFraction, MIN_ZOOM_FRACTION, MAX_ZOOM_FRACTION, 1.f, 0.f);
@@ -1682,7 +1732,6 @@ F32 LLAgent::getCameraZoomFraction()
         else
         {
                 F32 min_zoom;
-                const F32 DIST_FUDGE = 16.f; // meters
                 F32 max_zoom = llmin(mDrawDistance - DIST_FUDGE, 
                                                                 LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE,
                                                                 MAX_CAMERA_DISTANCE_FROM_AGENT);
@@ -1731,10 +1780,9 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
         else
         {
                 F32 min_zoom = LAND_MIN_ZOOM;
-                const F32 DIST_FUDGE = 16.f; // meters
                 F32 max_zoom = llmin(mDrawDistance - DIST_FUDGE, 
-                                                                LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE,
-                                                                MAX_CAMERA_DISTANCE_FROM_AGENT);
+                                                        LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE,
+                                                        MAX_CAMERA_DISTANCE_FROM_AGENT);
 
                 if (mFocusObject.notNull())
                 {
@@ -1753,7 +1801,14 @@ void LLAgent::setCameraZoomFraction(F32 fraction)
 
                 LLVector3d camera_offset_dir = mCameraFocusOffsetTarget;
                 camera_offset_dir.normalize();
-                mCameraFocusOffsetTarget = camera_offset_dir * rescale(fraction, 0.f, 1.f, max_zoom, min_zoom);
+                if (gSavedSettings.getBOOL("DisableCameraConstraints"))
+                {
+                        mCameraFocusOffsetTarget = camera_offset_dir * rescale(fraction, 0.f, 262140.f, 1.f, min_zoom);
+                }
+                else
+                {
+                        mCameraFocusOffsetTarget = camera_offset_dir * rescale(fraction, 0.f, 1.f, max_zoom, min_zoom);
+                }
         }
         startCameraAnimation();
 }
@@ -1852,29 +1907,32 @@ void LLAgent::cameraZoomIn(const F32 fraction)
                 }
         }
 
-        new_distance = llmax(new_distance, min_zoom); 
-
         // Don't zoom too far back
-        const F32 DIST_FUDGE = 16.f; // meters
-        F32 max_distance = llmin(mDrawDistance - DIST_FUDGE, 
-                                                         LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE );
-
-        if (new_distance > max_distance)
+        // Actually, let's when disable camera constraints is active -- McCabe
+        if (!gSavedSettings.getBOOL("DisableCameraConstraints"))
         {
-                new_distance = max_distance;
+                new_distance = llmax(new_distance, min_zoom);
 
-                /*
-                // Unless camera is unlocked
-                if (!LLViewerCamera::sDisableCameraConstraints)
+                F32 max_distance = llmin(mDrawDistance - DIST_FUDGE, 
+                                                                 LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE );
+
+                if (new_distance > max_distance)
                 {
-                        return;
+                        new_distance = max_distance;
+
+                        /*
+                        // Unless camera is unlocked
+                        if (!LLViewerCamera::sDisableCameraConstraints)
+                        {
+                                return;
+                        }
+                        */
                 }
-                */
-        }
 
-        if( cameraCustomizeAvatar() )
-        {
-                new_distance = llclamp( new_distance, APPEARANCE_MIN_ZOOM, APPEARANCE_MAX_ZOOM );
+                if( cameraCustomizeAvatar() )
+                {
+                        new_distance = llclamp( new_distance, APPEARANCE_MIN_ZOOM, APPEARANCE_MAX_ZOOM );
+                }
         }
 
         mCameraFocusOffsetTarget = new_distance * camera_offset_unit;
@@ -1905,40 +1963,41 @@ void LLAgent::cameraOrbitIn(const F32 meters)
                 LLVector3d      camera_offset_unit(mCameraFocusOffsetTarget);
                 F32 current_distance = (F32)camera_offset_unit.normalize();
                 F32 new_distance = current_distance - meters;
-                F32 min_zoom = LAND_MIN_ZOOM;
-                
-                // Don't move through focus point
-                if (mFocusObject.notNull())
+
+                // Don't zoom too far back
+                // Actually, let's when disable camera constraints is active -- McCabe
+                if (!gSavedSettings.getBOOL("DisableCameraConstraints"))
                 {
-                        if (mFocusObject->isAvatar())
-                        {
-                                min_zoom = AVATAR_MIN_ZOOM;
-                        }
-                        else
+                        F32 min_zoom = LAND_MIN_ZOOM;
+                        F32 max_distance;
+                        
+                        // Don't move through focus point
+                        if (mFocusObject.notNull())
                         {
-                                min_zoom = OBJECT_MIN_ZOOM;
+                                if (mFocusObject->isAvatar())
+                                {
+                                        min_zoom = AVATAR_MIN_ZOOM;
+                                }
+                                else
+                                {
+                                        min_zoom = OBJECT_MIN_ZOOM;
+                                }
                         }
-                }
 
-                new_distance = llmax(new_distance, min_zoom);
+                        new_distance = llmax(new_distance, min_zoom);
 
-                // Don't zoom too far back
-                const F32 DIST_FUDGE = 16.f; // meters
-                F32 max_distance = llmin(mDrawDistance - DIST_FUDGE, 
-                                                                 LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE );
+                        max_distance = llmin(mDrawDistance - DIST_FUDGE, 
+                                                                         LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE );
 
-                if (new_distance > max_distance)
-                {
-                        // Unless camera is unlocked
-                        if (!gSavedSettings.getBOOL("DisableCameraConstraints"))
+                        if (new_distance > max_distance)
                         {
                                 return;
                         }
-                }
 
-                if( CAMERA_MODE_CUSTOMIZE_AVATAR == getCameraMode() )
-                {
-                        new_distance = llclamp( new_distance, APPEARANCE_MIN_ZOOM, APPEARANCE_MAX_ZOOM );
+                        if( CAMERA_MODE_CUSTOMIZE_AVATAR == getCameraMode() )
+                        {
+                                new_distance = llclamp( new_distance, APPEARANCE_MIN_ZOOM, APPEARANCE_MAX_ZOOM );
+                        }
                 }
 
                 // Compute new camera offset
@@ -4214,6 +4273,13 @@ void LLAgent::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL camera_ani
                 return;
         }
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         setControlFlags(AGENT_CONTROL_STAND_UP); // force stand up
         gViewerWindow->getWindow()->resetBusyCount();
 
@@ -5142,6 +5208,14 @@ BOOL LLAgent::setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOO
 // utility to build a location string
 void LLAgent::buildLocationString(std::string& str)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                str = rlv_handler_t::cstrHidden;
+                return;
+        }
+// [/RLVa:KB]
+
         const LLVector3& agent_pos_region = getPositionAgent();
         S32 pos_x = S32(agent_pos_region.mV[VX]);
         S32 pos_y = S32(agent_pos_region.mV[VY]);
@@ -6035,6 +6109,15 @@ void LLAgent::teleportRequest(
 // Landmark ID = LLUUID::null means teleport home
 void LLAgent::teleportViaLandmark(const LLUUID& landmark_asset_id)
 {
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
+        if ( (rlv_handler_t::isEnabled()) &&
+                 ( (gRlvHandler.hasBehaviour(RLV_BHVR_TPLM)) || 
+                   ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting)) ))
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLViewerRegion *regionp = getRegion();
         if(regionp && teleportCore())
         {
@@ -6099,6 +6182,17 @@ void LLAgent::teleportCancel()
 
 void LLAgent::teleportViaLocation(const LLVector3d& pos_global)
 {
+// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-07 (RLVa-1.0.0d)
+        // If we're getting teleported due to @tpto we should disregard any @tploc=n or @unsit=n restrictions from the same object
+        if ( (rlv_handler_t::isEnabled()) &&
+                 ( (gRlvHandler.hasBehaviourExcept(RLV_BHVR_TPLOC, gRlvHandler.getCurrentObject())) ||
+                   ( (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) && 
+                         (gRlvHandler.hasBehaviourExcept(RLV_BHVR_UNSIT, gRlvHandler.getCurrentObject()))) ) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLViewerRegion* regionp = getRegion();
         LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromPosGlobal(pos_global);
         if(regionp && info)
@@ -6175,6 +6269,13 @@ void LLAgent::setTeleportState(ETeleportState state)
                 // We're outa here. Save "back" slurl.
                 mTeleportSourceSLURL = getSLURL();
         }
+
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.0b
+        if ( (rlv_handler_t::isEnabled()) && (TELEPORT_NONE == mTeleportState) )
+        {
+                gRlvHandler.setCanCancelTp(true);
+        }
+// [/RLVa:KB]
 }
 
 void LLAgent::stopCurrentAnimations()
@@ -6742,11 +6843,19 @@ BOOL LLAgent::isWearingItem( const LLUUID& item_id )
 // static
 void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void** user_data )
 {
+        if (gNoRender)
+        {
+                return;
+        }
+
         // We should only receive this message a single time.  Ignore subsequent AgentWearablesUpdates
         // that may result from AgentWearablesRequest having been sent more than once. 
+        // If we do this, then relogging won't work. - Gigs
+        /*
         static bool first = true;
         if (!first) return;
         first = false;
+        */
 
         LLUUID agent_id;
         gMessageSystem->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
@@ -6804,10 +6913,17 @@ void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void
                 }
 
                 // now that we have the asset ids...request the wearable assets
+// [RLVa:KB] - Checked: 2009-08-08 (RLVa-1.0.1g) | Added: RLVa-1.0.1g
+                LLInventoryFetchObserver::item_ref_t rlvItems;
+// [/RLVa:KB]
                 for( i = 0; i < WT_COUNT; i++ )
                 {
                         if( !gAgent.mWearableEntry[i].mItemID.isNull() )
                         {
+// [RLVa:KB] - Checked: 2009-08-08 (RLVa-1.0.1g) | Added: RLVa-1.0.1g
+                                if (rlv_handler_t::isEnabled())
+                                        rlvItems.push_back(gAgent.mWearableEntry[i].mItemID);
+// [/RLVa:KB]
                                 gWearableList.getAsset( 
                                         asset_id_array[i],
                                         LLStringUtil::null,
@@ -6815,6 +6931,15 @@ void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void
                                         LLAgent::onInitialWearableAssetArrived, (void*)(intptr_t)i );
                         }
                 }
+
+// [RLVa:KB] - Checked: 2009-08-08 (RLVa-1.0.1g) | Added: RLVa-1.0.1g
+                // TODO-RLVa: checking that we're in STATE_STARTED is probably not needed, but leave it until we can be absolutely sure
+                if ( (rlv_handler_t::isEnabled()) && (LLStartUp::getStartupState() == STATE_STARTED) )
+                {
+                        RlvCurrentlyWorn f;
+                        f.fetchItems(rlvItems);
+                }
+// [/RLVa:KB]
         }
 }
 
@@ -7314,6 +7439,13 @@ void LLAgent::removeWearable( EWearableType type )
                 return;
         }
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-07 (RLVa-1.0.0d)
+        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isRemovable(type)) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         if( old_wearable )
         {
                 if( old_wearable->isDirty() )
@@ -7440,15 +7572,17 @@ void LLAgent::setWearableOutfit(
         wearables_to_remove[WT_SKIN]            = FALSE;
         wearables_to_remove[WT_HAIR]            = FALSE;
         wearables_to_remove[WT_EYES]            = FALSE;
-        wearables_to_remove[WT_SHIRT]           = remove;
-        wearables_to_remove[WT_PANTS]           = remove;
-        wearables_to_remove[WT_SHOES]           = remove;
-        wearables_to_remove[WT_SOCKS]           = remove;
-        wearables_to_remove[WT_JACKET]          = remove;
-        wearables_to_remove[WT_GLOVES]          = remove;
-        wearables_to_remove[WT_UNDERSHIRT]      = (!gAgent.isTeen()) & remove;
-        wearables_to_remove[WT_UNDERPANTS]      = (!gAgent.isTeen()) & remove;
-        wearables_to_remove[WT_SKIRT]           = remove;
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.2a
+        wearables_to_remove[WT_SHIRT]           = remove && gRlvHandler.isRemovable(WT_SHIRT);
+        wearables_to_remove[WT_PANTS]           = remove && gRlvHandler.isRemovable(WT_PANTS);
+        wearables_to_remove[WT_SHOES]           = remove && gRlvHandler.isRemovable(WT_SHOES);
+        wearables_to_remove[WT_SOCKS]           = remove && gRlvHandler.isRemovable(WT_SOCKS);
+        wearables_to_remove[WT_JACKET]          = remove && gRlvHandler.isRemovable(WT_JACKET);
+        wearables_to_remove[WT_GLOVES]          = remove && gRlvHandler.isRemovable(WT_GLOVES);
+        wearables_to_remove[WT_UNDERSHIRT]      = (!gAgent.isTeen()) && remove && gRlvHandler.isRemovable(WT_UNDERSHIRT);
+        wearables_to_remove[WT_UNDERPANTS]      = (!gAgent.isTeen()) && remove && gRlvHandler.isRemovable(WT_UNDERPANTS);
+        wearables_to_remove[WT_SKIRT]           = remove && gRlvHandler.isRemovable(WT_SKIRT);
+// [/RLVa:KB]
 
         S32 count = wearables.count();
         llassert( items.count() == count );
@@ -7538,6 +7672,15 @@ void LLAgent::setWearable( LLInventoryItem* new_item, LLWearable* new_wearable )
         EWearableType type = new_wearable->getType();
 
         LLWearable* old_wearable = mWearableEntry[ type ].mWearable;
+
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
+        // Block if: we can't wear on that layer; or we're already wearing something there we can't take off
+        if ( (rlv_handler_t::isEnabled()) && ((!gRlvHandler.isWearable(type)) || ((old_wearable) && (!gRlvHandler.isRemovable(type)))) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         if( old_wearable )
         {
                 const LLUUID& old_item_id = mWearableEntry[ type ].mItemID;
@@ -7750,10 +7893,13 @@ void LLAgent::userRemoveAllAttachments( void* userdata )
                 return;
         }
 
-        gMessageSystem->newMessage("ObjectDetach");
-        gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-        gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-        gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.0c
+        // NOTE-RLVa: This function is called from inside RlvHandler as well, hence the rather heavy modifications
+        std::list<U32> rlvAttachments;
+        // TODO-RLVa: Once we have the improved "removeWearable" logic implemented we can just get rid of the whole "rlvCompFolders" hassle
+        #ifdef RLV_EXPERIMENTAL_COMPOSITES
+                std::list<LLUUID> rlvCompFolders;
+        #endif // RLV_EXPERIMENTAL_COMPOSITES
 
         for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); 
                  iter != avatarp->mAttachmentPoints.end(); )
@@ -7763,11 +7909,78 @@ void LLAgent::userRemoveAllAttachments( void* userdata )
                 LLViewerObject* objectp = attachment->getObject();
                 if (objectp)
                 {
+                        if (rlv_handler_t::isEnabled())
+                        {
+                                if (!gRlvHandler.isDetachable(curiter->first))
+                                        continue;
+
+                                // Check if we're being called in response to an RLV command (that would be @detach=force)
+                                if ( (gRlvHandler.getCurrentCommand()) && (attachment->getItemID().notNull()) )
+                                {
+                                        if (!gRlvHandler.isStrippable(attachment->getItemID())) // "nostrip" can be taken off by the user but not @detach
+                                                continue;
+
+                                        #ifdef RLV_EXPERIMENTAL_COMPOSITES
+                                                LLViewerInventoryCategory* pFolder;
+                                                if (gRlvHandler.getCompositeInfo(attachment->getItemID(), NULL, &pFolder))
+                                                {
+                                                        #ifdef RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+                                                                if (!gRlvHandler.canTakeOffComposite(pFolder))
+                                                                        continue;
+                                                        #endif // RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+
+                                                        // The attachment belongs to a composite folder so there may be additional things we need to take off
+                                                        if (std::find(rlvCompFolders.begin(), rlvCompFolders.end(), pFolder->getUUID()) != rlvCompFolders.end())
+                                                                rlvCompFolders.push_back(pFolder->getUUID());
+                                                }
+                                        #endif // RLV_EXPERIMENTAL_COMPOSITES
+                                }
+                        }
+                        rlvAttachments.push_back(objectp->getLocalID());
+                }
+        }
+
+        // Only send the message if we actually have something to detach
+        if (rlvAttachments.size() > 0)
+        {
+                gMessageSystem->newMessage("ObjectDetach");
+                gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+                gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+                gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+
+                for (std::list<U32>::const_iterator itAttach = rlvAttachments.begin(); itAttach != rlvAttachments.end(); ++itAttach)
+                {
                         gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-                        gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, objectp->getLocalID());
+                        gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, *itAttach);
                 }
+
+                gMessageSystem->sendReliable( gAgent.getRegionHost() );
         }
-        gMessageSystem->sendReliable( gAgent.getRegionHost() );
+
+        #ifdef RLV_EXPERIMENTAL_COMPOSITES
+                if (rlv_handler_t::isEnabled)
+                {
+                        // If we encountered any composite folders then we need to @detach all of them
+                        for (std::list<LLUUID>::const_iterator itFolder = rlvCompFolders.begin(); itFolder != rlvCompFolders.end(); ++itFolder)
+                        {
+                                std::string strFolder = gRlvHandler.getSharedPath(*itFolder);
+
+                                // It shouldn't happen but make absolutely sure that we don't issue @detach:=force and reenter this function
+                                if (!strFolder.empty())
+                                {
+                                        std::string strCmd = "detach:" + strFolder + "=force";
+                                        #ifdef RLV_DEBUG
+                                                RLV_INFOS << "\t- detaching composite folder: @" << strCmd << LL_ENDL;
+                                        #endif // RLV_DEBUG
+
+                                        // HACK-RLV: executing a command while another command is currently executing isn't the best thing to do, however
+                                        //           in this specific case it is safe (and still better than making processForceCommand public)
+                                        gRlvHandler.processCommand(gRlvHandler.getCurrentObject(), strCmd);
+                                }
+                        }
+                }
+        #endif // RLV_EXPERIMENTAL_COMPOSITES
+// [/RLVa:KB]
 }
 
 void LLAgent::observeFriends()
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 5e771e4..a6f1d74 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -69,6 +69,10 @@
 #include "llfollowcam.h"
 // end Ventrella
 
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const U8 AGENT_STATE_TYPING =   0x04;                   //  Typing indication
 const U8 AGENT_STATE_EDITING =  0x10;                   //  Set when agent has objects selected
 
@@ -396,6 +400,11 @@ public:
         // Does this parcel allow you to fly?
         BOOL canFly();
 
+        //lgg crap
+        static BOOL                     getPhantom();// const                           { return emeraldPhantom; }
+        static void                     setPhantom(BOOL phantom);
+        static void                     togglePhantom();
+
         // Animation functions
         void                    stopCurrentAnimations();
         void                    requestStopMotion( LLMotion* motion );
@@ -824,6 +833,8 @@ private:
         LLVector3d      mCameraSmoothingLastPositionGlobal;    
         LLVector3d      mCameraSmoothingLastPositionAgent;
         BOOL            mCameraSmoothingStop;
+        
+        static BOOL             sPhantom;
 
         LLVector3               mCameraUpVector;                                // camera's up direction in world coordinates (determines the 'roll' of the view)
 
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 58c1c2b..74fb563 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -127,6 +127,7 @@
 #include "llvectorperfoptions.h"
 #include "llurlsimstring.h"
 #include "llwatchdog.h"
+#include "llcallingcard.h"
 
 // Included so that constants/settings might be initialized
 // in save_settings_to_globals()
@@ -166,6 +167,10 @@
 
 #include "llcommandlineparser.h"
 
+#include "hippoGridManager.h"
+#include "hippoLimits.h"
+#include "hippoUpdate.h"
+
 // *FIX: These extern globals should be cleaned up.
 // The globals either represent state/config/resource-storage of either 
 // this app, or another 'component' of the viewer. App globals should be 
@@ -187,22 +192,35 @@
 
 //----------------------------------------------------------------------------
 // viewer.cpp - these are only used in viewer, should be easily moved.
+extern void disable_win_error_reporting();
 
 #if LL_DARWIN
+#include <Carbon/Carbon.h>
 extern void init_apple_menu(const char* product);
+extern OSErr AEGURLHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
+extern OSErr AEQuitHandler(const AppleEvent *messagein, AppleEvent *reply, long refIn);
+extern OSStatus simpleDialogHandler(EventHandlerCallRef handler, EventRef event, void *userdata);
+#include <boost/tokenizer.hpp>
 #endif // LL_DARWIN
 
+
 extern BOOL gRandomizeFramerate;
 extern BOOL gPeriodicSlowFrame;
 extern BOOL gDebugGL;
 
 ////////////////////////////////////////////////////////////
 // All from the last globals push...
+
+
 const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user flagged as Away From Keyboard
 
 F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
 F32 gSimFrames;
 
+std::string gDisabledMessage; // Set in LLAppViewer::initConfiguration used in idle_startup
+
+BOOL gHideLinks = FALSE; // Set in LLAppViewer::initConfiguration, used externally
+
 BOOL gAllowIdleAFK = TRUE;
 BOOL gAllowTapTapHoldRun = TRUE;
 BOOL gShowObjectUpdates = FALSE;
@@ -228,7 +246,7 @@ F32 gFPSClamped = 10.f;						// Pretend we start at target rate.
 F32 gFrameDTClamped = 0.f;                                      // Time between adjacent checks to network for packets
 U64     gStartTime = 0; // gStartTime is "private", used only to calculate gFrameTimeSeconds
 U32 gFrameStalls = 0;
-const F64 FRAME_STALL_THRESHOLD = 1.0;
+const F64 FRAME_STALL_THRESHOLD = 5.0;
 
 LLTimer gRenderStartTime;
 LLFrameTimer gForegroundTime;
@@ -297,7 +315,8 @@ std::string gLoginPage;
 std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
 
-LLAppViewer::LLUpdaterInfo *LLAppViewer::sUpdaterInfo = NULL ;
+//FIXME 
+//LLAppViewer::LLUpdaterInfo *LLAppViewer::sUpdaterInfo = NULL ;
 
 void idle_afk_check()
 {
@@ -448,7 +467,7 @@ static void settings_modify()
         gSavedSettings.setBOOL("VectorizeSkin", FALSE);
 #endif
 }
-
+/*
 void LLAppViewer::initGridChoice()
 {
         // Load up the initial grid     choice from:
@@ -465,7 +484,7 @@ void LLAppViewer::initGridChoice()
         if(grid_choice.empty())
         {
                 S32     server = gSavedSettings.getS32("ServerChoice");
-                server = llclamp(server, 0,     (S32)GRID_INFO_COUNT - 1);
+                //server = llclamp(server, 0,   (S32)GRID_INFO_COUNT - 1);
                 if(server == GRID_INFO_OTHER)
                 {
                         std::string custom_server = gSavedSettings.getString("CustomServer");
@@ -473,11 +492,12 @@ void LLAppViewer::initGridChoice()
                 }
                 else if(server != (S32)GRID_INFO_NONE)
                 {
-                        LLViewerLogin::getInstance()->setGridChoice((EGridInfo)server);
+                        llwarns << "setgridchoice = " << server << llendl;
+                        LLViewerLogin::getInstance()->setGridChoice(server);
                 }
         }
 }
-
+*/
 //virtual
 bool LLAppViewer::initSLURLHandler()
 {
@@ -516,6 +536,7 @@ LLAppViewer::LLAppViewer() :
         mSecondInstance(false),
         mSavedFinalSnapshot(false),
         mQuitRequested(false),
+        mLogoutRequested(false),
         mLogoutRequestSent(false),
         mYieldTime(-1),
         mMainloopTimeout(NULL),
@@ -639,7 +660,6 @@ bool LLAppViewer::init()
                                         ui_audio_callback,
                                         &LLUI::sGLScaleFactor);
         LLWeb::initClass();                       // do this after LLUI
-
         LLTextEditor::setURLCallbacks(&LLWeb::loadURL,
                                 &LLURLDispatcher::dispatchFromTextEditor,
                                 &LLURLDispatcher::dispatchFromTextEditor);
@@ -660,6 +680,7 @@ bool LLAppViewer::init()
         // load MIME type -> media impl mappings
         LLMIMETypes::parseMIMETypes( std::string("mime_types.xml") ); 
 
+
         // Copy settings to globals. *TODO: Remove or move to appropriage class initializers
         settings_to_globals();
         // Setup settings listeners
@@ -1112,12 +1133,21 @@ bool LLAppViewer::cleanup()
         // to ensure shutdown order
         LLMortician::setZealous(TRUE);
 
+        if (mQuitRequested)
         LLVoiceClient::terminate();
         
         disconnectViewer();
 
         llinfos << "Viewer disconnected" << llendflush;
 
+
+
+
+
+        //this deletes all your buddies
+        LLAvatarTracker::instance().reset();
+
+        if (mQuitRequested)
         display_cleanup(); 
 
         release_start_screen(); // just in case
@@ -1135,6 +1165,13 @@ bool LLAppViewer::cleanup()
 
         LLKeyframeDataCache::clear();
         
+        //clear all the chat off the screen     
+        gConsole->clear();
+
+        if (!mQuitRequested) //if we are doing a soft cleanup, bail here
+        {
+                return true;
+        }
         // End TransferManager before deleting systems it depends on (Audio, VFS, AssetStorage)
 #if 0 // this seems to get us stuck in an infinite loop...
         gTransferManager.cleanup();
@@ -1238,6 +1275,9 @@ bool LLAppViewer::cleanup()
         // viewer UI relies on keyboard so keep it aound until viewer UI isa gone
         delete gKeyboard;
         gKeyboard = NULL;
+        // Clean up selection managers after UI is destroyed, as UI
+        // may be observing them.
+        LLSelectMgr::cleanupGlobals();
 
         LLViewerObject::cleanupVOClasses();
 
@@ -1247,6 +1287,7 @@ bool LLAppViewer::cleanup()
 
         LLTracker::cleanupInstance();
         
+
         // *FIX: This is handled in LLAppViewerWin32::cleanup().
         // I'm keeping the comment to remember its order in cleanup,
         // in case of unforseen dependency.
@@ -1322,6 +1363,7 @@ bool LLAppViewer::cleanup()
         // save mute list. gMuteList used to also be deleted here too.
         LLMuteList::getInstance()->cache(gAgent.getID());
 
+
         if (mPurgeOnExit)
         {
                 llinfos << "Purging all cache files on exit" << llendflush;
@@ -1831,7 +1873,14 @@ bool LLAppViewer::initConfiguration()
         }
     }
 
-    initGridChoice();
+        //init Hippo grid manager
+        if (!gHippoGridManager) {
+                gHippoGridManager = new HippoGridManager();
+                gHippoGridManager->init();
+        }
+
+
+    //initGridChoice();
 
         // If we have specified crash on startup, set the global so we'll trigger the crash at the right time
         if(clp.hasOption("crashonstartup"))
@@ -1848,7 +1897,6 @@ bool LLAppViewer::initConfiguration()
     // achieve this. For now...
 
     // *NOTE:Mani The command line parser parses tokens and is 
-    // setup to bail after parsing the '--url' option or the 
     // first option specified without a '--option' flag (or
     // any other option that uses the 'last_option' setting - 
     // see LLControlGroupCLP::configure())
@@ -1906,6 +1954,22 @@ bool LLAppViewer::initConfiguration()
         //              llerrs << "Failed to parse skin definition." << llendl;
         //      }
 
+        //      LLXmlTreeNode* rootp = skin_def_tree.getRoot();
+        //      LLXmlTreeNode* disabled_message_node = rootp->getChildByName("disabled_message");       
+        //      if (disabled_message_node)
+        //      {
+        //              gDisabledMessage = disabled_message_node->getContents();
+        //      }
+
+        //      static LLStdStringHandle hide_links_string = LLXmlTree::addAttributeString("hide_links");
+        //      rootp->getFastAttributeBOOL(hide_links_string, gHideLinks);
+
+        //      // Legacy string.  This flag really meant we didn't want to expose references to "Second Life".
+        //      // Just set gHideLinks instead.
+        //      static LLStdStringHandle silent_string = LLXmlTree::addAttributeString("silent_update");
+        //      BOOL silent_update;
+        //      rootp->getFastAttributeBOOL(silent_string, silent_update);
+        //      gHideLinks = (gHideLinks || silent_update);
         //}
 
 #if LL_DARWIN
@@ -2365,7 +2429,7 @@ void LLAppViewer::handleViewerCrash()
         gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
         gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
         gDebugInfo["SessionLength"] = F32(LLFrameTimer::getElapsedSeconds());
-        gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
+//FIXME gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
         gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer) getCurrentRSS() >> 10;
         gDebugInfo["FirstLogin"] = (LLSD::Boolean) gAgent.isFirstLogin();
         gDebugInfo["FirstRunThisInstall"] = gSavedSettings.getBOOL("FirstRunThisInstall");
@@ -2594,29 +2658,56 @@ void LLAppViewer::removeMarkerFile(bool leave_logout_marker)
         }
 }
 
+
+//this gets called after we get a packet back from the
+//server saying we are logged out, or if the packet times
+//out
 void LLAppViewer::forceQuit()
 { 
+
+        LL_INFOS("forceQuit") << "Destroying the entire world" << LL_ENDL;
+        if (mQuitRequested)
         LLApp::setQuitting(); 
+        else
+        {
+                if (mLogoutRequested) //we just finished a logout request
+                {
+                        //LLStartUp::setStartupState( STATE_LOGIN_SHOW );
+                        LLStartUp::resetLogin();
+                        cleanup();
+                        mLogoutRequested=false;
+                        mLogoutRequestSent=false;
+                }
+        }
 }
 
-void LLAppViewer::requestQuit()
+void LLAppViewer::requestLogout(bool quit_after)
 {
-        llinfos << "requestQuit" << llendl;
+
+        mLogoutRequested=true;
+        if(quit_after)
+                mQuitRequested=true;
+        else
+                mQuitRequested=false;
+
+        llinfos << "requestLogout" << llendl;
 
         LLViewerRegion* region = gAgent.getRegion();
         
-        if( (LLStartUp::getStartupState() < STATE_STARTED) || !region )
+        if( (LLStartUp::getStartupState() >= STATE_STARTED) && region )
         {
-                // Quit immediately
-                forceQuit();
-                return;
-        }
-
         LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINT, TRUE);
         effectp->setPositionGlobal(gAgent.getPositionGlobal());
         effectp->setColor(LLColor4U(gAgent.getEffectColor()));
         LLHUDManager::getInstance()->sendEffects();
         effectp->markDead() ;//remove it.
+                send_stats();
+        }
+        else
+        {
+                mQuitRequested=true;
+                LLAppViewer::instance()->forceQuit();
+        }
 
         // Attempt to close all floaters that might be
         // editing things.
@@ -2626,10 +2717,7 @@ void LLAppViewer::requestQuit()
                 gFloaterView->closeAllChildren(true);
         }
 
-        send_stats();
-
         gLogoutTimer.reset();
-        mQuitRequested = true;
 }
 
 static bool finish_quit(const LLSD& notification, const LLSD& response)
@@ -2638,7 +2726,7 @@ static bool finish_quit(const LLSD& notification, const LLSD& response)
 
         if (option == 0)
         {
-                LLAppViewer::instance()->requestQuit();
+                LLAppViewer::instance()->requestLogout(true);
         }
         return false;
 }
@@ -2649,6 +2737,12 @@ void LLAppViewer::userQuit()
         LLNotifications::instance().add("ConfirmQuit");
 }
 
+//static
+void LLAppViewer::userLogout(void *userdata)
+{
+        LLAppViewer::instance()->requestLogout(false);
+}
+
 static bool finish_early_exit(const LLSD& notification, const LLSD& response)
 {
         LLAppViewer::instance()->forceQuit();
@@ -2674,6 +2768,7 @@ void LLAppViewer::abortQuit()
 {
     llinfos << "abortQuit()" << llendl;
         mQuitRequested = false;
+        mLogoutRequested = false;
 }
 
 void LLAppViewer::migrateCacheDirectory()
@@ -2994,7 +3089,7 @@ bool finish_forced_disconnect(const LLSD& notification, const LLSD& response)
 
 void LLAppViewer::forceDisconnect(const std::string& mesg)
 {
-        if (gDoDisconnect)
+        if (gDoDisconnect||mQuitRequested||mLogoutRequested)
     {
                 // Already popped up one of these dialogs, don't
                 // do this again.
@@ -3225,7 +3320,12 @@ void LLAppViewer::idle()
             {
                     // Send avatar and camera info
                     last_control_flags = gAgent.getControlFlags();
-                    send_agent_update(TRUE);
+
+                    if(!gAgent.getPhantom())
+                        {
+                                send_agent_update(TRUE);
+                        }
+
                     agent_update_timer.reset();
             }
         }
@@ -3298,9 +3398,12 @@ void LLAppViewer::idle()
                 // Check for away from keyboard, kick idle agents.
                 idle_afk_check();
 
+                if (!gDisconnected) //check again
+                {
                 //  Update statistics for this frame
                 update_statistics(gFrameCount);
         }
+        }
 
         ////////////////////////////////////////
         //
@@ -3501,7 +3604,7 @@ void LLAppViewer::idle()
         // Handle shutdown process, for example, 
         // wait for floaters to close, send quit message,
         // forcibly quit if it has taken too long
-        if (mQuitRequested)
+        if (mQuitRequested || mLogoutRequested)
         {
                 idleShutdown();
         }
@@ -3604,12 +3707,12 @@ void LLAppViewer::sendLogoutRequest()
                 if (mLogoutMarkerFile)
                 {
                         llinfos << "Created logout marker file " << mLogoutMarkerFileName << llendl;
-                apr_file_close(mLogoutMarkerFile);
                 }
                 else
                 {
                         llwarns << "Cannot create logout marker file " << mLogoutMarkerFileName << llendl;
-                }               
+                }
+                apr_file_close(mLogoutMarkerFile);
         }
 }
 
@@ -3626,6 +3729,9 @@ static F32 CheckMessagesMaxTime = CHECK_MESSAGES_DEFAULT_MAX_TIME;
 
 void LLAppViewer::idleNetwork()
 {
+        if (gDisconnected)
+                return;
+
         pingMainloopTimeout("idleNetwork");
         LLError::LLCallStacks::clear() ;
         llpushcallstacks ;
@@ -3714,7 +3820,11 @@ void LLAppViewer::idleNetwork()
         llpushcallstacks ;
         gObjectList.mNumNewObjectsStat.addValue(gObjectList.mNumNewObjects);
 
+        if (gDisconnected)
+                return;
+
         // Retransmit unacknowledged packets.
+        if (gXferManager)
         gXferManager->retransmitUnackedPackets();
         gAssetStorage->checkForTimeouts();
         llpushcallstacks ;
@@ -3724,7 +3834,7 @@ void LLAppViewer::idleNetwork()
         // Check that the circuit between the viewer and the agent's current
         // region is still alive
         LLViewerRegion *agent_region = gAgent.getRegion();
-        if (agent_region)
+        if ((agent_region)&&(LLStartUp::getStartupState() == STATE_STARTED))
         {
                 LLUUID this_region_id = agent_region->getRegionID();
                 bool this_region_alive = agent_region->isAlive();
@@ -3745,6 +3855,9 @@ void LLAppViewer::disconnectViewer()
         {
                 return;
         }
+        
+        //set this true now, to prevent things from trying to access the network we are destroying
+        gDisconnected = TRUE;
         //
         // Cleanup after quitting.
         //      
@@ -3828,6 +3941,8 @@ void LLAppViewer::disconnectViewer()
 
         cleanup_xfer_manager();
         gDisconnected = TRUE;
+        if (mQuitRequested)
+                cleanup_xfer_manager();
 }
 
 void LLAppViewer::forceErrorLLError()
@@ -3940,31 +4055,31 @@ void LLAppViewer::handleLoginComplete()
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
         gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD;
-
-        LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-        if ( parcel && parcel->getMusicURL()[0])
-        {
-                gDebugInfo["ParcelMusicURL"] = parcel->getMusicURL();
-        }       
-        if ( parcel && parcel->getMediaURL()[0])
-        {
-                gDebugInfo["ParcelMediaURL"] = parcel->getMediaURL();
-        }
-        
         gDebugInfo["SettingsFilename"] = gSavedSettings.getString("ClientSettingsFile");
         gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();
         gDebugInfo["ViewerExePath"] = gDirUtilp->getExecutablePathAndName();
         gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
 
-        if(gAgent.getRegion())
-        {
-                gDebugInfo["CurrentSimHost"] = gAgent.getRegionHost().getHostName();
-                gDebugInfo["CurrentRegion"] = gAgent.getRegion()->getName();
-        }
-
         if(LLAppViewer::instance()->mMainloopTimeout)
         {
                 gDebugInfo["MainloopTimeoutState"] = LLAppViewer::instance()->mMainloopTimeout->getState();
         }
         writeDebugInfo();
+
+// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
+        // TODO-RLVa: find some way to initialize the lookup table when we need them *and* support toggling RLVa at runtime
+        gRlvHandler.initLookupTables();
+
+        if (rlv_handler_t::isEnabled())
+        {
+                RlvCurrentlyWorn::fetchWorn();
+                rlv_handler_t::fetchSharedInventory();
+
+                #ifdef RLV_EXTENSION_STARTLOCATION
+                        RlvSettings::updateLoginLastLocation();
+                #endif // RLV_EXTENSION_STARTLOCATION
+
+                gRlvHandler.processRetainedCommands();
+        }
+// [/RLVa:KB]
 }
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 797f5dd..ada5557 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -62,14 +62,16 @@ public:
 
         // Application control
         void forceQuit(); // Puts the viewer into 'shutting down without error' mode.
-        void requestQuit(); // Request a quit. A kinder, gentler quit.
+        void requestLogout(bool quit_after); // Request a logout, optionally quitting after
         void userQuit(); // The users asks to quit. Confirm, then requestQuit()
     void earlyExit(const std::string& name, 
                                    const LLSD& substitutions = LLSD()); // Display an error dialog and forcibly quit.
+        static void userLogout(void *userdata); //graceful logout without quit
     void forceExit(S32 arg); // exit() immediately (after some cleanup).
     void abortQuit();  // Called to abort a quit request.
 
     bool quitRequested() { return mQuitRequested; }
+    bool logoutRequested() { return mLogoutRequested; }
     bool logoutRequestSent() { return mLogoutRequestSent; }
 
         void writeDebugInfo();
@@ -164,11 +166,12 @@ protected:
 
         virtual std::string generateSerialNumber() = 0; // Platforms specific classes generate this.
 
+
 private:
 
         bool initThreads(); // Initialize viewer threads, return false on failure.
         bool initConfiguration(); // Initialize settings from the command line/config file.
-        void initGridChoice();
+        //void initGridChoice();
 
         bool initCache(); // Initialize local client cache.
         void purgeCache(); // Clear the local cache. 
@@ -222,6 +225,7 @@ private:
         bool mSavedFinalSnapshot;
 
     bool mQuitRequested;                                // User wants to quit, may have modified documents open.
+    bool mLogoutRequested;                              // User wants to log out, but not quit
     bool mLogoutRequestSent;                    // Disconnect message sent to simulator, no longer safe to send messages to the sim.
     S32 mYieldTime;
         LLSD mSettingsLocationList;
@@ -232,14 +236,14 @@ private:
         bool mAgentRegionLastAlive;
         LLUUID mAgentRegionLastID;
 
-public:
-        //some information for updater
-        typedef struct
-        {
-                std::string mUpdateExePath;
-                std::ostringstream mParams;
-        }LLUpdaterInfo ;
-        static LLUpdaterInfo *sUpdaterInfo ;
+//public:
+//      //some information for updater
+//      typedef struct
+//      {
+//              std::string mUpdateExePath;
+//              std::ostringstream mParams;
+//      }LLUpdaterInfo ;
+//      static LLUpdaterInfo *sUpdaterInfo ;
 };
 
 // consts from viewer.h
@@ -250,6 +254,9 @@ const S32 AGENT_UPDATES_PER_SECOND  = 10;
 //
 // "// llstartup" indicates that llstartup is the only client for this global.
 
+
+extern std::string gDisabledMessage; // llstartup
+extern BOOL gHideLinks; // used by llpanellogin, lllfloaterbuycurrency, llstartup
 extern LLSD gDebugInfo;
 
 extern BOOL     gAllowIdleAFK;
diff --git a/linden/indra/newview/llappviewerlinux.h b/linden/indra/newview/llappviewerlinux.h
index 365fcfe..d757639 100644
--- a/linden/indra/newview/llappviewerlinux.h
+++ b/linden/indra/newview/llappviewerlinux.h
@@ -62,9 +62,10 @@ public:
 
 protected:
         virtual bool beingDebugged();
-        
+
         virtual bool restoreErrorTrap();
         virtual void handleCrashReporting(bool reportFreeze);
+        
         virtual void handleSyncCrashTrace();
 
         virtual bool initLogging();
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp
index 7a8d486..e1c9471 100644
--- a/linden/indra/newview/llappviewerwin32.cpp
+++ b/linden/indra/newview/llappviewerwin32.cpp
@@ -263,13 +263,13 @@ int APIENTRY WINMAIN(HINSTANCE hInstance,
         viewer_app_ptr = NULL;
 
         //start updater
-        if(LLAppViewer::sUpdaterInfo)
+        /*if(LLAppViewer::sUpdaterInfo)
         {
                 _spawnl(_P_NOWAIT, LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str(), LLAppViewer::sUpdaterInfo->mParams.str().c_str(), NULL);
 
                 delete LLAppViewer::sUpdaterInfo ;
                 LLAppViewer::sUpdaterInfo = NULL ;
-        }
+        }*/
 
         return 0;
 }
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index 4fca9b1..dfd7403 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -524,7 +524,6 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
         {
                 case LLAssetType::AT_NOTECARD:
                         {
-
                                 // Update the UI with the new asset.
                                 LLPreviewNotecard* nc;
                                 nc = (LLPreviewNotecard*)LLPreview::find(item_id);
@@ -543,6 +542,7 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
                                                         LLAssetType::AT_NOTECARD);
                                         }
 
+                                        nc->setAssetId(content["new_asset"].asUUID());
                                         nc->refreshFromInventory();
                                 }
                         }
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index db28c7a..d5211d7 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -137,8 +137,20 @@ LLAvatarTracker::~LLAvatarTracker()
         deleteTrackingData();
         std::for_each(mObservers.begin(), mObservers.end(), DeletePointer());
         std::for_each(mBuddyInfo.begin(), mBuddyInfo.end(), DeletePairedPointer());
+        mObservers.erase(mObservers.begin(), mObservers.end());
+        mBuddyInfo.erase(mBuddyInfo.begin(), mBuddyInfo.end());
 }
 
+
+void LLAvatarTracker::reset()
+{
+    std::for_each(mBuddyInfo.begin(), mBuddyInfo.end(), DeletePairedPointer());
+        mBuddyInfo.erase(mBuddyInfo.begin(), mBuddyInfo.end());
+        mModifyMask |= LLFriendObserver::REMOVE;
+        notifyObservers();
+}
+
+
 void LLAvatarTracker::track(const LLUUID& avatar_id, const std::string& name)
 {
         deleteTrackingData();
diff --git a/linden/indra/newview/llcallingcard.h b/linden/indra/newview/llcallingcard.h
index 85a1ab6..aad7cec 100644
--- a/linden/indra/newview/llcallingcard.h
+++ b/linden/indra/newview/llcallingcard.h
@@ -86,7 +86,7 @@ class LLAvatarTracker
 {
 public:
         static LLAvatarTracker& instance() { return sInstance; }
-        
+        void reset();
         void track(const LLUUID& avatar_id, const std::string& name);
         void untrack(const LLUUID& avatar_id);
         bool isTrackedAgentValid() { return mTrackedAgentValid; }
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 41d2e08..44d1ad1 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -54,6 +54,7 @@
 #include "llkeyboard.h"
 #include "lllineeditor.h"
 #include "llstatusbar.h"
+#include "llspinctrl.h"
 #include "lltextbox.h"
 #include "lluiconstants.h"
 #include "llviewergesture.h"                    // for triggering gestures
@@ -79,7 +80,10 @@ LLChatBar *gChatBar = NULL;
 
 // legacy calllback glue
 void toggleChatHistory(void* user_data);
-void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel);
+//void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel);
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-0.2.2a
+void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channel);
+// [/RLVa:KB]
 
 
 class LLChatBarGestureObserver : public LLGestureManagerObserver
@@ -99,6 +103,7 @@ private:
 
 LLChatBar::LLChatBar() 
 :       LLPanel(LLStringUtil::null, LLRect(), BORDER_NO),
+        mChanCtrlEnabled(FALSE),
         mInputEditor(NULL),
         mGestureLabelTimer(),
         mLastSpecialChatChannel(0),
@@ -153,6 +158,10 @@ BOOL LLChatBar::postBuild()
                 mInputEditor->setEnableLineHistory(TRUE);
         }
 
+        mChannelControl = getChild<LLSpinCtrl>("channel_control");
+
+        toggleChannelControl();
+
         mIsBuilt = TRUE;
 
         return TRUE;
@@ -212,6 +221,7 @@ void LLChatBar::refresh()
 
         childSetValue("History", LLFloaterChat::instanceVisible(LLSD()));
 
+        //childSetValue("channel_control",( 1.f * ((S32)(mChannelControl->get()))) );
         childSetEnabled("Say", mInputEditor->getText().size() > 0);
         childSetEnabled("Shout", mInputEditor->getText().size() > 0);
 
@@ -372,8 +382,11 @@ LLWString LLChatBar::stripChannelNumber(const LLWString &mesg, S32* channel)
         }
         else
         {
-                // This is normal chat.
-                *channel = 0;
+                if (!mChanCtrlEnabled)
+                {
+                        // This is normal chat.
+                        *channel = 0;
+                }
                 return mesg;
         }
 }
@@ -389,7 +402,8 @@ void LLChatBar::sendChat( EChatType type )
                         // store sent line in history, duplicates will get filtered
                         if (mInputEditor) mInputEditor->updateHistory();
                         // Check if this is destined for another channel
-                        S32 channel = 0;
+                        S32 channel = mChanCtrlEnabled ? (S32)(mChannelControl->get()) : 0;
+
                         stripChannelNumber(text, &channel);
                         
                         std::string utf8text = wstring_to_utf8str(text);
@@ -427,6 +441,31 @@ void LLChatBar::sendChat( EChatType type )
         }
 }
 
+void LLChatBar::toggleChannelControl()
+{
+        LLRect input_rect = mInputEditor->getRect();
+        S32 chan_width = mChannelControl->getRect().getWidth();
+        BOOL visible = gSavedSettings.getBOOL("ChatChannelSelect");
+        BOOL control = mChannelControl->getVisible();
+
+        if (visible && !control)
+        {
+                input_rect.setLeftTopAndSize(input_rect.mLeft+chan_width, input_rect.mTop, 
+                                                                         input_rect.getWidth()-chan_width, input_rect.getHeight());
+        }
+        else if (!visible && control)
+        {
+                input_rect.setLeftTopAndSize(input_rect.mLeft-chan_width, input_rect.mTop, 
+                                                                         input_rect.getWidth()+chan_width, input_rect.getHeight());
+                
+        }
+        mInputEditor->setRect(input_rect);
+
+        childSetVisible("channel_control", visible);
+        childSetEnabled("channel_control", visible);
+        mChanCtrlEnabled = visible;
+}
+
 
 //-----------------------------------------------------------------------
 // Static functions
@@ -484,7 +523,10 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
 
         S32 length = raw_text.length();
 
-        if( (length > 0) && (raw_text[0] != '/') )  // forward slash is used for escape (eg. emote) sequences
+        //if( (length > 0) && (raw_text[0] != '/') )  // forward slash is used for escape (eg. emote) sequences
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
+        if ( (length > 0) && (raw_text[0] != '/') && (!gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT)) )
+// [/RLVa:KB]
         {
                 gAgent.startTyping();
         }
@@ -578,7 +620,8 @@ void LLChatBar::sendChatFromViewer(const std::string &utf8text, EChatType type,
 void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate)
 {
         // Look for "/20 foo" channel chats.
-        S32 channel = 0;
+        S32 channel = mChanCtrlEnabled ? (S32)(mChannelControl->get()) : 0;
+
         LLWString out_text = stripChannelNumber(wtext, &channel);
         std::string utf8_out_text = wstring_to_utf8str(out_text);
         std::string utf8_text = wstring_to_utf8str(wtext);
@@ -589,6 +632,21 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
                 utf8_text = utf8str_truncate(utf8_text, MAX_STRING - 1);
         }
 
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-0.2.0b
+        if ( (0 == channel) && (rlv_handler_t::isEnabled()) )
+        {
+                // Adjust the (public) chat "volume" on chat and gestures (also takes care of playing the proper animation)
+                if ( ((CHAT_TYPE_SHOUT == type) || (CHAT_TYPE_NORMAL == type)) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATNORMAL)) )
+                        type = CHAT_TYPE_WHISPER;
+                else if ( (CHAT_TYPE_SHOUT == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATSHOUT)) )
+                        type = CHAT_TYPE_NORMAL;
+                else if ( (CHAT_TYPE_WHISPER == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATWHISPER)) )
+                        type = CHAT_TYPE_NORMAL;
+
+                animate &= !gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT);
+        }
+// [/RLVa:KB]
+
         // Don't animate for chats people can't hear (chat to scripts)
         if (animate && (channel == 0))
         {
@@ -624,8 +682,57 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
         send_chat_from_viewer(utf8_out_text, type, channel);
 }
 
-void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel)
+// void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel)
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-0.2.2a
+void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channel)
+// [/RLVa:KB]
 {
+// [RLVa:KB] - Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
+        // Only process chat messages (ie not CHAT_TYPE_START, CHAT_TYPE_STOP, etc)
+        if ( (rlv_handler_t::isEnabled()) && ( (CHAT_TYPE_WHISPER == type) || (CHAT_TYPE_NORMAL == type) || (CHAT_TYPE_SHOUT == type) ) )
+        {
+                if (0 == channel)
+                {
+                        // (We already did this before, but LLChatHandler::handle() calls this directly)
+                        if ( ((CHAT_TYPE_SHOUT == type) || (CHAT_TYPE_NORMAL == type)) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATNORMAL)) )
+                                type = CHAT_TYPE_WHISPER;
+                        else if ( (CHAT_TYPE_SHOUT == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATSHOUT)) )
+                                type = CHAT_TYPE_NORMAL;
+                        else if ( (CHAT_TYPE_WHISPER == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATWHISPER)) )
+                                type = CHAT_TYPE_NORMAL;
+
+                        // Redirect chat if needed
+                        if ( ( (gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT) || (gRlvHandler.hasBehaviour(RLV_BHVR_REDIREMOTE)) ) && 
+                                 (gRlvHandler.redirectChatOrEmote(utf8_out_text)) ) )
+                        {
+                                return;
+                        }
+
+                        // Filter public chat if sendchat restricted (and filter anything that redirchat didn't redirect)
+                        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHAT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT)) )
+                                gRlvHandler.filterChat(utf8_out_text, true);
+                }
+                else
+                {
+                        // Don't allow chat on a non-public channel if sendchannel restricted (unless the channel is an exception)
+                        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHANNEL)) && (!gRlvHandler.isException(RLV_BHVR_SENDCHANNEL, channel)) )
+                                return;
+
+                        // Don't allow chat on debug channel if @sendchat, @redirchat or @rediremote restricted (shows as public chat on viewers)
+                        if (channel >= CHAT_CHANNEL_DEBUG)
+                        {
+                                bool fIsEmote = rlvIsEmote(utf8_out_text);
+                                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHAT)) || 
+                                         ((!fIsEmote) && (gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT))) || 
+                                         ((fIsEmote) && (gRlvHandler.hasBehaviour(RLV_BHVR_REDIREMOTE))) )
+                                {
+                                        return;
+                                }
+                        }
+                }
+        }
+// [/RLVa:KB]
+
         LLMessageSystem* msg = gMessageSystem;
         msg->newMessageFast(_PREHASH_ChatFromViewer);
         msg->nextBlockFast(_PREHASH_AgentData);
diff --git a/linden/indra/newview/llchatbar.h b/linden/indra/newview/llchatbar.h
index 56a98a7..13332c7 100644
--- a/linden/indra/newview/llchatbar.h
+++ b/linden/indra/newview/llchatbar.h
@@ -44,6 +44,7 @@ class LLUUID;
 class LLFrameTimer;
 class LLChatBarGestureObserver;
 class LLComboBox;
+class LLSpinCtrl;
 
 class LLChatBar
 :       public LLPanel
@@ -94,6 +95,8 @@ public:
         static void startChat(const char* line);
         static void stopChat();
 
+        void toggleChannelControl();
+
 protected:
         void sendChat(EChatType type);
         void updateChat();
@@ -110,6 +113,10 @@ protected:
         LLComboBox*             mGestureCombo;
 
         LLChatBarGestureObserver* mObserver;
+
+private:
+        BOOL                            mChanCtrlEnabled;
+        LLSpinCtrl*                     mChannelControl;
 };
 
 extern LLChatBar *gChatBar;
diff --git a/linden/indra/newview/lldrawable.h b/linden/indra/newview/lldrawable.h
index 6e0b6e8..21cc0c5 100644
--- a/linden/indra/newview/lldrawable.h
+++ b/linden/indra/newview/lldrawable.h
@@ -50,6 +50,7 @@
 #include "llviewerobject.h"
 #include "llrect.h"
 #include "llappviewer.h" // for gFrameTimeSeconds
+#include "llimagej2c.h"
 
 class LLCamera;
 class LLDrawPool;
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 8f58826..60fa608 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -329,6 +329,18 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
                         L"Targa, Bitmap Images (*.tga; *.bmp)\0*.tga;*.bmp\0" \
                         L"\0";
                 break;
+        case FFSAVE_TEXT:
+                if (filename.empty())
+                {
+                        wcsncpy( mFilesW,L"untitled.txt", FILENAME_BUFFER_SIZE);        /*Flawfinder: ignore*/
+                }
+                mOFN.lpstrDefExt = L"txt";
+                mOFN.lpstrFilter = 
+                        L"Text files (*.txt)\0*.txt\0"
+                        L"RTF Files (*.rtf)\0*.rtf\0"
+                        L"LSL Files (*.lsl)\0*.lsl\0"
+                        L"\0";
+                break;
         case FFSAVE_WAV:
                 if (filename.empty())
                 {
@@ -996,6 +1008,12 @@ GtkWindow* LLFilePicker::buildFilePicker(bool is_save, bool is_folder, std::stri
                                 (GTK_FILE_CHOOSER(win),
                                  this_path->second.c_str());
                 }
+                else if (getenv("HOME"))
+                {
+                        gtk_file_chooser_set_current_folder
+                                (GTK_FILE_CHOOSER(win),
+                                 getenv("HOME"));
+                }
 
 #  if LL_X11
                 // Make GTK tell the window manager to associate this
diff --git a/linden/indra/newview/llfilepicker.h b/linden/indra/newview/llfilepicker.h
index 104e0df..63699b2 100644
--- a/linden/indra/newview/llfilepicker.h
+++ b/linden/indra/newview/llfilepicker.h
@@ -91,6 +91,7 @@ public:
                 FFLOAD_XML = 6,
                 FFLOAD_SLOBJECT = 7,
                 FFLOAD_RAW = 8,
+                FFLOAD_TEXT = 9,
         };
 
         enum ESaveFilter
@@ -110,6 +111,8 @@ public:
                 FFSAVE_J2C = 12,
                 FFSAVE_PNG = 13,
                 FFSAVE_JPEG = 14,
+                FFSAVE_HPA = 15,
+                FFSAVE_TEXT = 16,
         };
 
         // open the dialog. This is a modal operation
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index 9ee24d6..513cba3 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -45,6 +45,10 @@
 #include "llappviewer.h"
 #include "lltracker.h"
 
+// [RLVa:KB] - Version: 1.22.11
+#include "llviewerwindow.h"
+// [/RLVa:KB]
+
 // static
 std::set<std::string> LLFirstUse::sConfigVariables;
 
@@ -132,6 +136,17 @@ void LLFirstUse::useMap()
 }
 
 // static
+void LLFirstUse::useMiniMap()
+{
+        if (gSavedSettings.getWarning("FirstMiniMap"))
+        {
+                gSavedSettings.setWarning("FirstMiniMap", FALSE);
+
+                LLNotifyBox::showXml("FirstMiniMap");
+        }
+}
+
+// static
 void LLFirstUse::useGoTo()
 {
         // nothing for now JC
@@ -277,3 +292,36 @@ void LLFirstUse::useMedia()
                 LLNotifications::instance().add("FirstMedia");
         }
 }
+
+// [RLVa:KB] - Version: 1.22.11 | Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a
+
+// SL-1.22.11 doesn't seem to have a way to check which notifications are currently open :(
+bool rlvHasVisibleFirstUseNotification()
+{
+        return false;
+}
+
+void LLFirstUse::showRlvFirstUseNotification(const std::string& strName)
+{
+        if ( (gSavedSettings.getWarning(strName)) && (!rlvHasVisibleFirstUseNotification()) )
+        {
+                gSavedSettings.setWarning(strName, FALSE);
+                LLNotifyBox::showXml(strName);
+        }
+}
+
+void LLFirstUse::warnRlvGiveToRLV()
+{
+        if ( (gSavedSettings.getWarning(RLV_SETTING_FIRSTUSE_GIVETORLV)) && (RlvSettings::getForbidGiveToRLV()) )
+                gViewerWindow->alertXml(RLV_SETTING_FIRSTUSE_GIVETORLV, LLStringUtil::format_map_t(), &LLFirstUse::onRlvGiveToRLVConfirmation, NULL);
+}
+
+void LLFirstUse::onRlvGiveToRLVConfirmation(S32 idxOption, void* /*pUserParam*/)
+{
+        gSavedSettings.setWarning(RLV_SETTING_FIRSTUSE_GIVETORLV, FALSE);
+
+        if ( (0 == idxOption) || (1 == idxOption) )
+                gSavedSettings.setBOOL(RLV_SETTING_FORBIDGIVETORLV, (idxOption == 1));
+}
+
+// [/RLVa:KB]
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index bb64cdd..3305ffe 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -36,6 +36,10 @@
 #include <vector>
 #include "llstring.h"
 
+// [RLVa:KB]
+#include "rlvdefines.h"
+// [/RLVa:KB]
+
 /*
 1.  On first use of 'sit here', explain how to get up and rotate view. 
 
@@ -93,6 +97,7 @@ public:
         static void useBalanceDecrease(S32 delta);
         static void useSit();
         static void useMap();
+        static void useMiniMap();
         static void useGoTo();
         static void useBuild();
         static void useLeftClickNoHit();
@@ -109,6 +114,19 @@ public:
         
 protected:
         static std::set<std::string> sConfigVariables;
+
+// [RLVa:KB] - Checked: RLVa-1.0.3a (2009-09-10) | Added: RLVa-1.0.3a
+public:
+        static void showRlvFirstUseNotification(const std::string& strName);
+
+        static void useRlvDetach()              { showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_DETACH); }
+        static void useRlvEnableWear()  { showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_ENABLEWEAR); }
+        static void useRlvFartouch()    { showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_FARTOUCH); }
+
+        static void warnRlvGiveToRLV();
+protected:
+        static void onRlvGiveToRLVConfirmation(S32 idxOption, void* pUserParam);
+// [/RLVa:KB]
 };
 
 #endif
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 32b2c18..686353b 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -139,7 +139,15 @@ LLFloaterAbout::LLFloaterAbout()
 
         // Position
         LLViewerRegion* region = gAgent.getRegion();
-        if (region)
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-04 (RLVa-1.0.0a)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                support.append(rlv_handler_t::cstrHidden);
+                support.append("\n\n");
+        }
+        else if (region)
+// [/RLVa:KB]
+//      if (region)
         {
                 LLStyleSP server_link_style(new LLStyle);
                 server_link_style->setVisible(true);
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index c19c0c4..51e7b89 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -100,6 +100,11 @@ void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const std::string& first, c
         if (speaker_ptr)
         {
                 speaker_ptr->mDisplayName = first + " " + last;
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g
+                // TODO-RLVa: this seems to get called per frame which is very likely an LL bug that will eventuall get fixed
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                        speaker_ptr->mDisplayName = gRlvHandler.getAnonym(speaker_ptr->mDisplayName);
+// [/RLVa:KB]
         }
 }
 
@@ -712,6 +717,13 @@ void LLPanelActiveSpeakers::onVolumeChange(LLUICtrl* source, void* user_data)
 //static 
 void LLPanelActiveSpeakers::onClickProfile(void* user_data)
 {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLPanelActiveSpeakers* panelp = (LLPanelActiveSpeakers*)user_data;
         LLUUID speaker_id = panelp->mSpeakerList->getValue().asUUID();
 
@@ -721,6 +733,13 @@ void LLPanelActiveSpeakers::onClickProfile(void* user_data)
 //static
 void LLPanelActiveSpeakers::onDoubleClickSpeaker(void* user_data)
 {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLPanelActiveSpeakers* panelp = (LLPanelActiveSpeakers*)user_data;
         LLUUID speaker_id = panelp->mSpeakerList->getValue().asUUID();
 
diff --git a/linden/indra/newview/llfloaterassetbrowser.cpp b/linden/indra/newview/llfloaterassetbrowser.cpp
new file mode 100644
index 0000000..615d21a
--- /dev/null
+++ b/linden/indra/newview/llfloaterassetbrowser.cpp
@@ -0,0 +1,466 @@
+/** 
+ * @file llfloaterassetbrowser.cpp
+ * @brief LLFloaterAssetBrowser class implementation
+ * Phox wuz hurr
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llfloaterassetbrowser.h"
+#include "llinventoryview.h"
+#include "llinventorymodel.h"
+#include "llviewerimagelist.h"
+#include "llbutton.h"
+#include "lltextbox.h"
+#include "llpreview.h"
+#include "llinventorybridge.h"
+#include "llagent.h"
+#include "lltooldraganddrop.h"
+#include "llfocusmgr.h"
+#include "llview.h"
+
+// Externs
+extern LLInventoryModel gInventory;
+
+// Statics
+LLFloaterAssetBrowser* LLFloaterAssetBrowser::sInstance = NULL;
+
+LLFloaterAssetBrowser::LLFloaterAssetBrowser()
+:   LLFloater("floater_asset_browser")
+{
+    LLUICtrlFactory::getInstance()->buildFloater(this, "floater_asset_browser.xml");
+
+        mInventoryPanel = getChild<LLInventoryPanel>("inventory panel");
+
+        //Open all folders and close them in order to make item list up-to-date
+        //if(gInventory.getItemCount()==0)
+                mInventoryPanel->openAllFolders();
+
+        //gInventory.startBackgroundFetch(gInventory.findCategoryUUIDForType(LLAssetType::AT_TEXTURE));
+        
+        
+        childSetAction("button next", onClickNext, this);
+        childSetAction("button previous", onClickPrevious, this);
+        childSetAction("button refresh", onClickRefresh, this);
+        
+        initialize();
+        createThumbnails();
+        mInventoryPanel->closeAllFolders();
+}
+
+// static
+void LLFloaterAssetBrowser::show(void*)
+{
+    if (!sInstance)
+        sInstance = new LLFloaterAssetBrowser();
+
+        sInstance->open();
+}
+
+// virtual
+LLFloaterAssetBrowser::~LLFloaterAssetBrowser()
+{
+        clearAssetInfoTexts();
+        mTextureAssets.clear();
+        mMaxIndex = 0;
+        mFirstIndex = 0;
+        mMouseOverIndex = 0;
+        mMouseOverUUID = LLUUID::null;
+        mMouseOverAssetUUID = LLUUID::null;
+        mFloaterTitle = "";
+        clearNoAssetsText();
+        sInstance=NULL;
+}
+
+void LLFloaterAssetBrowser::initialize()
+{
+        mMaxIndex = ITEMS_PER_PAGE;
+        mFirstIndex = 0;
+        mAssetInfoLabelList.clear();
+        mAssetInfoIndex = 0;
+        mFloaterHeight = getRect().getHeight();
+        mFloaterWidth = getRect().getWidth();
+        mMouseOverIndex = 0;
+        mMouseOverUUID = LLUUID::null;
+        mMouseOverAssetUUID = LLUUID::null;
+        mFloaterTitle = "";
+
+        S32 image_top = getRect().getHeight();
+        S32 image_bottom = BTN_HEIGHT_SMALL;
+        S32 image_middle = (image_top + image_bottom) / 2;
+        S32 line_height = llround(LLFontGL::sSansSerifSmall->getLineHeight());
+        
+        mNoAssetsLabel = new LLTextBox("mNoAssetsLabel.", 
+                                                                                LLRect(getRect().getWidth()/2,
+                                                                                                image_middle + line_height / 2,
+                                                                                                getRect().getWidth(),
+                                                                                                image_middle - line_height / 2 ),
+                                                                                "No assets found.",
+                                                                                LLFontGL::sSansSerifSmall );
+        mNoAssetsLabel->setFollowsAll();
+        addChild(mNoAssetsLabel);
+        mNoAssetsLabel->setVisible(FALSE);
+}
+
+void LLFloaterAssetBrowser::createThumbnails()
+{
+        LLViewerInventoryCategory::cat_array_t cats;
+        LLViewerInventoryItem::item_array_t items;
+        LLIsType isType(LLAssetType::AT_TEXTURE);
+
+        gInventory.collectDescendentsIf(LLUUID::null,
+                                                        cats,
+                                                        items,
+                                                        LLInventoryModel::INCLUDE_TRASH,
+                                                        isType);
+        
+        //Get UUID, asset UUID and name
+        for(S32 i = 0; i < items.count(); i++)
+        {
+                LLInventoryItem* itemp = items[i];
+                LLAssetSelection temp;
+                temp.mAssetUUID = itemp->getAssetUUID();
+                temp.mUUID = itemp->getUUID();
+                temp.mName = itemp->getName();
+                temp.mTexturep = NULL;
+                temp.mAssetRect = LLRect::null;
+                mTextureAssets.push_back(temp);
+        }
+        
+        //Get Texturep
+        for(S32 i = 0; i < items.count(); i++)
+        {
+                        mTextureAssets[i].mTexturep = gImageList.getImage(mTextureAssets[i].mAssetUUID, MIPMAP_YES, IMMEDIATE_NO);
+                        mTextureAssets[i].mTexturep->setBoostLevel(LLViewerImage::BOOST_PREVIEW);
+                        //mTextureAssets[i].mTexturep->processTextureStats();
+        }
+
+        //Generate the asset info text
+        /*for(S32 i = 0; i < items.count(); i++)
+        {
+                LLString asset_info;
+                LLString dimensions;
+                
+                asset_info.append(mTextureAssets[i].mName);
+                
+                //if(mTextureAssets[i].mTexturep->mFullWidth == 0
+                        //|| mTextureAssets[i].mTexturep->mFullHeight == 0)
+
+                dimensions = llformat("\n%d x %d",
+                                                mTextureAssets[i].mTexturep->mFullWidth,
+                                                mTextureAssets[i].mTexturep->mFullHeight);
+                asset_info.append(dimensions);
+                
+                mTextureAssets[i].mAssetInfo = asset_info;
+        }*/
+        
+        mFloaterTitle = llformat("Asset Browser (%d assets fetched)", mTextureAssets.size());
+        setTitle(mFloaterTitle);
+}
+
+// virtual
+BOOL LLFloaterAssetBrowser::handleHover(S32 x, S32 y, MASK mask)
+{
+        if(mTextureAssets.size() > 0)
+        {
+                for(U32 i = mFirstIndex; i <  mMaxIndex; i++)
+                {
+                        if(i < mTextureAssets.size())
+                        {
+                        if(mTextureAssets[i].mAssetRect.pointInRect(x,y))
+                            {
+                                        mMouseOverUUID = mTextureAssets[i].mUUID;
+                                    mMouseOverIndex = i;
+
+                                    if(hasMouseCapture())
+                                    {
+                                        S32 screen_x;
+                                            S32 screen_y;
+                                            LLUUID mObjectUUID= LLUUID::null;
+                                                const LLViewerInventoryItem *item = gInventory.getItem(mMouseOverUUID);
+    
+                                            localPointToScreen(x, y, &screen_x, &screen_y );
+    
+                                            if(item && item->getPermissions().allowCopyBy(gAgent.getID(), gAgent.getGroupID())
+                                                && LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y))
+                                            {
+                                                EDragAndDropType type;
+                                                    type = LLAssetType::lookupDragAndDropType(item->getType());
+                                                    LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_LIBRARY;
+                                                
+                                                    if(!mObjectUUID.isNull())
+                                                    {
+                                                        src = LLToolDragAndDrop::SOURCE_WORLD;
+                                                    }
+                                                    else if(item->getPermissions().getOwner() == gAgent.getID())
+                                                    {
+                                                        src = LLToolDragAndDrop::SOURCE_AGENT;
+                                                    }
+                                                    LLToolDragAndDrop::getInstance()->beginDrag(type,
+                                                                                                            item->getUUID(),
+                                                                                                            src,
+                                                                                                            mObjectUUID);
+                                                    return LLToolDragAndDrop::getInstance()->handleHover(x, y, mask);
+                                            }
+                                            return TRUE;
+                                    }
+                                    return LLFloater::handleHover(x, y, mask);
+                            }
+                    }
+                }
+                return LLFloater::handleHover(x, y, mask);
+        }
+        else
+        {
+                mMouseOverUUID = LLUUID::null;
+                return LLFloater::handleHover(x, y, mask);
+        }
+}
+
+// virtual
+BOOL LLFloaterAssetBrowser::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+        if(mTextureAssets.size() > 0)
+        {
+                if(mTextureAssets[mMouseOverIndex].mAssetRect.pointInRect(x,y))
+                {
+                        if(mMouseOverUUID.notNull())
+                        {
+                                gFocusMgr.setMouseCapture(this);
+                                S32 screen_x;
+                                S32 screen_y;
+                                localPointToScreen(x, y, &screen_x, &screen_y);
+                                LLToolDragAndDrop::getInstance()->setDragStart(screen_x, screen_y);
+                                return TRUE;
+                        }
+                }
+        }
+        return LLFloater::handleMouseDown(x, y, mask);
+}
+
+// virtual
+BOOL LLFloaterAssetBrowser::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+        if(hasMouseCapture())
+        {
+                gFocusMgr.setMouseCapture(NULL);
+                return TRUE;
+        }
+        return LLFloater::handleMouseUp(x, y, mask);
+}
+
+// virtual
+BOOL LLFloaterAssetBrowser::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+        if(mTextureAssets.size() > 0)
+        {
+                if(mTextureAssets[mMouseOverIndex].mAssetRect.pointInRect(x,y))
+                {       
+                        if(mMouseOverUUID.notNull())
+                        {
+                                open_texture(mMouseOverUUID, mTextureAssets[mMouseOverIndex].mName, FALSE);
+                                return TRUE;
+                        }
+                }
+        }
+        return LLFloater::handleDoubleClick(x, y, mask);
+}
+
+// virtual
+void LLFloaterAssetBrowser::draw()
+{               
+        LLFloater::draw();
+        
+        if(mTextureAssets.size() > 0)
+        {
+                S32 hor_pos = 0;
+                S32 ver_pos = 0;
+                U32 items_per_row = 0;
+                S32 height = getRect().getHeight()/8;
+                S32 width = height;
+
+                for(U32 i = mFirstIndex; i < mMaxIndex; i++)
+                {
+                        if(i < mTextureAssets.size())
+                        {
+                                mTexturep = NULL;
+                                mImageAssetID = mTextureAssets[i].mAssetUUID;
+                                
+                                if(mImageAssetID.notNull())
+                                {
+                                        mTexturep = gImageList.getImage(mImageAssetID, MIPMAP_YES, IMMEDIATE_NO);
+                                        //mTexturep->setBoostLevel(LLViewerImage::BOOST_PREVIEW);
+                                        mTexturep->processTextureStats();
+                                        mTextureAssets[i].mWidth = mTexturep->mFullWidth;
+                                        mTextureAssets[i].mHeight = mTexturep->mFullHeight;
+                                }
+
+                                if(isMinimized())
+                                {
+                                        return;
+                                }
+
+                                //Border
+                                LLRect border;
+                                border.mLeft = START_POS + ver_pos;
+                                border.mTop = getRect().getHeight() - LLFLOATER_HEADER_SIZE - BORDER_PAD - hor_pos;
+                                border.mRight = border.mLeft + width;
+                                border.mBottom = border.mTop - height;
+                                
+                                //Save the rect for each thumbnail
+                                mTextureAssets[i].mAssetRect = border;
+                                
+                                //Asset info rect
+                                LLRect info_rect;
+                                info_rect.mLeft = border.mLeft;
+                                info_rect.mTop = border.mBottom - 3;
+                                info_rect.mRight = border.mLeft + 130;
+                                info_rect.mBottom = border.mBottom - 2*llround(LLFontGL::sSansSerifSmall->getLineHeight());
+
+                                gl_rect_2d(border, LLColor4::black, FALSE);
+                                
+                                // Interior
+                                LLRect interior = border;
+                                interior.stretch(1); 
+                                
+                                //Draw the image
+                                if(mTexturep)
+                                {
+                                        if(mTexturep->getComponents() == 4)
+                                        {
+                                                gl_rect_2d_checkerboard(interior);
+                                        }
+                                        
+                                        gl_draw_scaled_image(interior.mLeft, interior.mBottom, interior.getWidth(), interior.getHeight(), mTexturep);
+                                        // Pump the priority
+                                        mTexturep->addTextureStats((F32)(interior.getWidth() * interior.getHeight()));
+                                        
+                                        //Generate the asset info text
+                                        std::string asset_info;
+                                        asset_info.append(mTextureAssets[i].mName);
+                                        std::string dimensions = llformat("\n%d x %d",
+                                                                                                        mTexturep->mFullWidth /*mTextureAssets[i].mWidth*/,
+                                                                                                        mTexturep->mFullHeight /* mTextureAssets[i].mHeight*/);
+                                        asset_info.append(dimensions);
+                                        
+                                        // Draw material info below the asset
+                                        // LLTextBox object has to be drawn only once, not non-stop like image
+                                        if(mAssetInfoIndex < ITEMS_PER_PAGE && 
+                                                mAssetInfoIndex < mTextureAssets.size() - mFirstIndex)
+                                        {
+                                                mAssetInfoLabel = new LLTextBox("Asset Info"/*mTextureAssets[i].mAssetInfo*/,
+                                                                                                                info_rect,
+                                                                                                                asset_info,
+                                                                                                                LLFontGL::sSansSerifSmall);
+                                                mAssetInfoLabel->setFollowsAll();
+                                                mAssetInfoLabelList.push_back(mAssetInfoLabel);
+                                                addChild(mAssetInfoLabelList[mAssetInfoIndex]);
+                                                mAssetInfoLabelList[mAssetInfoIndex]->setVisible(TRUE);
+                                                mAssetInfoIndex++;
+                                        }
+                                        
+                                }
+                                else
+                                {
+                                        // Draw X
+                                        gl_rect_2d(interior, LLColor4::grey, TRUE);
+                                        gl_draw_x(interior, LLColor4::black);
+                                }
+                                //Move to the right
+                                ver_pos += getRect().getWidth()/6;
+                                items_per_row++;
+
+                                //Change the row
+                                if(items_per_row % 4 == 0)
+                                {
+                                        ver_pos = 0;
+                                        hor_pos += getRect().getHeight()/4;
+                                }
+                        }
+                }//for
+
+                //If the size of the floater has changed, clear the asset info texts
+                //in order to draw them again into the new position
+                if(getRect().getWidth() != mFloaterWidth || getRect().getHeight() != mFloaterHeight)
+                {
+                        clearAssetInfoTexts();
+                        //Save the size of the current floater
+                        mFloaterWidth = getRect().getWidth();
+                        mFloaterHeight = getRect().getHeight();
+                }
+                if(mMaxIndex >= mTextureAssets.size())
+                {
+                        childDisable("button next");
+                        childEnable("button previous");
+                }
+                else if(mFirstIndex <= 0)
+                {
+                        childEnable("button next");
+                        childDisable("button previous");
+                }
+                else
+                {
+                        childEnable("button next");
+                        childEnable("button previous");
+                }
+        }
+        else
+        {
+                //No assets found
+                mNoAssetsLabel->setVisible(TRUE);
+                childDisable("button next");
+                childDisable("button previous");
+        }
+}
+
+void LLFloaterAssetBrowser::clearAssetInfoTexts()
+{
+        for(U32 i = 0; i < mAssetInfoLabelList.size(); i++)
+        {
+                delete mAssetInfoLabelList[i];
+                mAssetInfoLabelList[i] = NULL;
+        }
+        mAssetInfoLabelList.clear();
+        mAssetInfoIndex = 0;
+}
+
+void LLFloaterAssetBrowser::clearNoAssetsText()
+{
+        if(mTextureAssets.size() > 0)
+        {
+                delete mNoAssetsLabel;
+                mNoAssetsLabel = NULL;
+        }
+}
+
+// static
+void LLFloaterAssetBrowser::onClickNext(void *userdata)
+{
+        LLFloaterAssetBrowser* self = (LLFloaterAssetBrowser*)userdata;
+        self->mFirstIndex = self->mMaxIndex;
+        self->mMaxIndex = self->mFirstIndex + ITEMS_PER_PAGE;
+        self->clearAssetInfoTexts();
+}
+
+// static
+void LLFloaterAssetBrowser::onClickPrevious(void *userdata)
+{
+        LLFloaterAssetBrowser* self = (LLFloaterAssetBrowser*)userdata;
+        self->mFirstIndex = self->mMaxIndex - (2 * ITEMS_PER_PAGE);
+        self->mMaxIndex = self->mMaxIndex - ITEMS_PER_PAGE;
+        self->clearAssetInfoTexts();
+}
+
+// static
+void LLFloaterAssetBrowser::onClickRefresh(void *userdata)
+{
+        LLFloaterAssetBrowser* self = (LLFloaterAssetBrowser*)userdata; 
+        for(U32 i = 0; i < self->mTextureAssets.size(); i++)
+        {
+                self->mTextureAssets[i].mTexturep = NULL;
+        }
+        
+        self->mTextureAssets.clear();
+        self->createThumbnails();
+        self->clearNoAssetsText();
+        self->clearAssetInfoTexts();
+}
diff --git a/linden/indra/newview/llfloaterassetbrowser.h b/linden/indra/newview/llfloaterassetbrowser.h
new file mode 100644
index 0000000..76eb3ba
--- /dev/null
+++ b/linden/indra/newview/llfloaterassetbrowser.h
@@ -0,0 +1,84 @@
+/** 
+ * @file llfloaterassetbrowser.h
+ * @brief LLFloaterAssetBrowser class implementation
+ * Phox wuz hurr
+ */
+
+#ifndef LL_LLFLOATERASSETBROWSERVIEW_H
+#define LL_LLFLOATERASSETBROWSERVIEW_H
+
+#include "llfloater.h"
+#include "llinventorymodel.h"
+#include "llview.h"
+#include "llviewerimage.h"
+
+class LLInventoryPanel;
+
+struct LLAssetSelection
+{
+        LLUUID                                          mUUID;
+        LLUUID                                          mAssetUUID; 
+        std::string                                     mName;
+        std::string                                     mAssetInfo;
+        S32                                                     mWidth;
+        S32                                                     mHeight;
+        LLTextBox*                                      mAssetInfoTextBox;
+        LLPointer<LLViewerImage>        mTexturep;
+        LLRect                                          mAssetRect;
+};
+
+class LLFloaterAssetBrowser : public LLFloater
+{
+public:
+    LLFloaterAssetBrowser();
+
+    virtual ~LLFloaterAssetBrowser();
+
+    static void show(void*);
+        
+        virtual BOOL handleHover(S32 x, S32 y, MASK mask);
+        virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+        virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+        virtual void draw();
+
+        static LLFloaterAssetBrowser* getInstance(){ return sInstance; }
+
+private:
+        void initialize();
+        void createThumbnails();
+        void clearAssetInfoTexts();
+        void clearNoAssetsText();
+
+        static void onClickNext(void *userdata);
+        static void onClickPrevious(void *userdata);
+        static void onClickRefresh(void *userdata);
+
+        static LLFloaterAssetBrowser* sInstance;
+
+protected:
+        LLInventoryPanel*                               mInventoryPanel;
+        LLUUID                                                  mImageAssetID; 
+        LLUUID                                                  mMouseOverUUID;
+        LLUUID                                                  mMouseOverAssetUUID;
+        LLPointer<LLViewerImage>                mTexturep;
+        std::vector<LLAssetSelection>   mTextureAssets;
+        std::vector<LLTextBox*>                 mAssetInfoLabelList;
+        U32                                                             mLastIndex;
+        U32                                                             mMaxIndex;
+        U32                                                             mFirstIndex;
+        U32                                                             mAssetInfoIndex;
+        S32                                                             mFloaterHeight;
+        S32                                                             mFloaterWidth;
+        S32                                                             mMouseOverIndex;
+        LLTextBox*                                              mNoAssetsLabel;
+        LLTextBox*                                              mAssetInfoLabel;
+        std::string mFloaterTitle;
+};
+
+static const S32 HPAD = 4;
+static const S32 BORDER_PAD = HPAD;
+static const U32 ITEMS_PER_PAGE = 16;
+static const S32 START_POS = 250;
+
+#endif
diff --git a/linden/indra/newview/llfloaterbeacons.cpp b/linden/indra/newview/llfloaterbeacons.cpp
index 55e4862..5a5de77 100644
--- a/linden/indra/newview/llfloaterbeacons.cpp
+++ b/linden/indra/newview/llfloaterbeacons.cpp
@@ -38,6 +38,9 @@
 #include "llcheckboxctrl.h"
 #include "pipeline.h"
 
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
+#include "llagent.h"
+// [/RLVa:KB]
 
 LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
 {
@@ -73,6 +76,13 @@ BOOL LLFloaterBeacons::postBuild()
 // Too bad we can't just add control_name="BeaconsEnabled" to the XML.
 void LLFloaterBeacons::open()
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT))
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLFloater::open();
         gSavedSettings.setBOOL( "BeaconsEnabled", TRUE);
 }
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 703811b..3681a6f 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -57,10 +57,11 @@
 #include "llfloaterchatterbox.h"
 #include "llfloatermute.h"
 #include "llkeyboard.h"
-//#include "lllineeditor.h"
+#include "lllineeditor.h"
 #include "llmutelist.h"
 //#include "llresizehandle.h"
 #include "llchatbar.h"
+#include "llspinctrl.h"
 #include "llstatusbar.h"
 #include "llviewertexteditor.h"
 #include "llviewergesture.h"                    // for triggering gestures
@@ -110,6 +111,8 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
         childSetVisible("Chat History Editor with mute",FALSE);
         childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
         setDefaultBtn("Chat");
+
+        //toggleHistoryChannelControl(); temporarily disable until working
 }
 
 LLFloaterChat::~LLFloaterChat()
@@ -204,17 +207,32 @@ void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4&
         // If the msg is from an agent (not yourself though),
         // extract out the sender name and replace it with the hotlinked name.
         if (chat.mSourceType == CHAT_SOURCE_AGENT &&
-                chat.mFromID != LLUUID::null)
+                chat.mFromID != LLUUID::null &&
+// [RLVa] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
+                (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
+// [/RLVa]
         {
                 chat.mURL = llformat("secondlife:///app/agent/%s/about",chat.mFromID.asString().c_str());
         }
 
         // If the chat line has an associated url, link it up to the name.
-        if (!chat.mURL.empty()
-                && (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0))
+        if ((!chat.mURL.empty() && line.length() > chat.mFromName.length()) && 
+                (line.find(chat.mFromName,0) == 0 || (line.find(chat.mFromName,0) == 4 &&
+                color == gSavedSettings.getColor4("ObjectIMColor")))) // hack to make sure IMs in chat history don't hightlight
         {
-                std::string start_line = line.substr(0, chat.mFromName.length() + 1);
-                line = line.substr(chat.mFromName.length() + 1);
+                std::string start_line;
+                if (line.find(chat.mFromName,0) == 4) // IMs are prefaced with "IM: "
+                {
+                        start_line = line.substr(4, chat.mFromName.length() + 1);
+                        std::string source = line.substr(0, 4);
+                        edit->appendColoredText(source, false, prepend_newline, color);
+                        line = line.substr(chat.mFromName.length() + 5);
+                }
+                else
+                {
+                        start_line = line.substr(0, chat.mFromName.length() + 1);
+                        line = line.substr(chat.mFromName.length() + 1);
+                }
                 const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID,chat.mURL);
                 edit->appendStyledText(start_line, false, prepend_newline, sourceStyle);
                 prepend_newline = false;
@@ -232,9 +250,61 @@ void log_chat_text(const LLChat& chat)
 
                 LLLogChat::saveHistory(std::string("chat"),histstr);
 }
+
+// static
+void LLFloaterChat::toggleHistoryChannelControl()
+{
+        LLFloaterChat* chat_floater = LLFloaterChat::getInstance(LLSD());
+        BOOL visible = gSavedSettings.getBOOL("ChatChannelSelect");
+        BOOL control = chat_floater->getChild<LLSpinCtrl>("channel_control")->getVisible();
+
+        LLLineEditor* input = chat_floater->getChild<LLLineEditor>("Chat Editor");
+        LLRect input_rect = input->getRect();
+        S32 chan_width = chat_floater->getChild<LLSpinCtrl>("channel_control")->getRect().getWidth();
+
+        if (visible && !control)
+        {
+                input_rect.setLeftTopAndSize(input_rect.mLeft+chan_width+4, input_rect.mTop, 
+                                                                         input_rect.getWidth()-chan_width, input_rect.getHeight());
+        }
+        else if (!visible && control)
+        {
+                input_rect.setLeftTopAndSize(input_rect.mLeft-chan_width-4, input_rect.mTop, 
+                                                                         input_rect.getWidth()+chan_width, input_rect.getHeight());
+        }
+        input->setRect(input_rect);
+
+        chat_floater->childSetVisible("channel_control", visible);
+        chat_floater->childSetEnabled("channel_control", visible);
+}
+
 // static
 void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
 {       
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+        if (rlv_handler_t::isEnabled())
+        {
+                // TODO-RLVa: we might cast too broad a net by filtering here, needs testing
+                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) && (!chat.mRlvLocFiltered) && (CHAT_SOURCE_AGENT != chat.mSourceType) )
+                {
+                        LLChat& rlvChat = const_cast<LLChat&>(chat);
+                        gRlvHandler.filterLocation(rlvChat.mText);
+                        rlvChat.mRlvLocFiltered = TRUE;
+                }
+                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (!chat.mRlvNamesFiltered) )
+                {
+                        // NOTE: this will also filter inventory accepted/declined text in the chat history
+                        LLChat& rlvChat = const_cast<LLChat&>(chat);
+                        if (CHAT_SOURCE_AGENT != chat.mSourceType)
+                        {
+                                // Filter object and system chat (names are filtered elsewhere to save ourselves an gObjectList lookup)
+                                gRlvHandler.filterNames(rlvChat.mText);
+                        }
+                        rlvChat.mRlvNamesFiltered = TRUE;
+                }
+        }
+// [/RLVa:KB]
+
         if ( gSavedPerAccountSettings.getBOOL("LogChat") && log_to_file) 
         {
                 log_chat_text(chat);
@@ -368,6 +438,30 @@ void LLFloaterChat::addChat(const LLChat& chat,
                         chat.mChatType == CHAT_TYPE_DEBUG_MSG
                         && !gSavedSettings.getBOOL("ScriptErrorsAsChat");
 
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+        if (rlv_handler_t::isEnabled())
+        {
+                // TODO-RLVa: we might cast too broad a net by filtering here, needs testing
+                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) && (!chat.mRlvLocFiltered) && (CHAT_SOURCE_AGENT != chat.mSourceType) )
+                {
+                        LLChat& rlvChat = const_cast<LLChat&>(chat);
+                        if (!from_instant_message)
+                                gRlvHandler.filterLocation(rlvChat.mText);
+                        rlvChat.mRlvLocFiltered = TRUE;
+                }
+                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (!chat.mRlvNamesFiltered) )
+                {
+                        LLChat& rlvChat = const_cast<LLChat&>(chat);
+                        if ( (!from_instant_message) && (CHAT_SOURCE_AGENT != chat.mSourceType) )
+                        {
+                                // Filter object and system chat (names are filtered elsewhere to save ourselves an gObjectList lookup)
+                                gRlvHandler.filterNames(rlvChat.mText);
+                        }
+                        rlvChat.mRlvNamesFiltered = TRUE;
+                }
+        }
+// [/RLVa:KB]
+
 #if LL_LCD_COMPILE
         // add into LCD displays
         if (!invisible_script_debug_chat)
@@ -463,6 +557,9 @@ LLColor4 get_text_color(const LLChat& chat)
                                 text_color = gSavedSettings.getColor4("ObjectChatColor");
                         }
                         break;
+                case CHAT_SOURCE_OBJECT_IM:
+                        text_color = gSavedSettings.getColor4("ObjectIMColor");
+                        break;
                 default:
                         text_color.setToWhite();
                 }
@@ -528,7 +625,11 @@ void LLFloaterChat::onClickToggleActiveSpeakers(void* userdata)
 {
         LLFloaterChat* self = (LLFloaterChat*)userdata;
 
-        self->childSetVisible("active_speakers_panel", !self->childIsVisible("active_speakers_panel"));
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+        self->childSetVisible("active_speakers_panel", 
+                (!self->childIsVisible("active_speakers_panel")) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) );
+// [/RLVa:KB]
+        //self->childSetVisible("active_speakers_panel", !self->childIsVisible("active_speakers_panel"));
 }
 
 //static 
diff --git a/linden/indra/newview/llfloaterchat.h b/linden/indra/newview/llfloaterchat.h
index b539386..e2bb54c 100644
--- a/linden/indra/newview/llfloaterchat.h
+++ b/linden/indra/newview/llfloaterchat.h
@@ -83,6 +83,8 @@ public:
         static void* createSpeakersPanel(void* data);
         static void* createChatPanel(void* data);
 
+        static void toggleHistoryChannelControl();
+
         // visibility policy for LLUISingleton
         static bool visible(LLFloater* instance, const LLSD& key);
         static void show(LLFloater* instance, const LLSD& key);
diff --git a/linden/indra/newview/llfloaterchatterbox.cpp b/linden/indra/newview/llfloaterchatterbox.cpp
index fc39bce..1ef75d1 100644
--- a/linden/indra/newview/llfloaterchatterbox.cpp
+++ b/linden/indra/newview/llfloaterchatterbox.cpp
@@ -98,7 +98,16 @@ LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) :
 {
         mAutoResize = FALSE;
 
-        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox.xml", NULL, FALSE);
+        // check if vertical tabs is selected
+        if (gSavedSettings.getBOOL("VerticalIMTabs"))
+        {
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox_vertical.xml", NULL, FALSE);
+        }
+        else
+        {
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox.xml", NULL, FALSE);
+        }
+        
         if (gSavedSettings.getBOOL("ContactsTornOff"))
         {
                 LLFloaterMyFriends* floater_contacts = LLFloaterMyFriends::getInstance(0);
diff --git a/linden/indra/newview/llfloaterchatterbox.h b/linden/indra/newview/llfloaterchatterbox.h
index ff2f243..552ef81 100644
--- a/linden/indra/newview/llfloaterchatterbox.h
+++ b/linden/indra/newview/llfloaterchatterbox.h
@@ -150,7 +150,14 @@ public:
         {
                 if (visible(instance, key))
                 {
-                        LLFloaterChatterBox::hideInstance();
+                        if(instance->getHost())
+                        {
+                                LLFloaterChatterBox::hideInstance();
+                        }
+                        else
+                        {
+                                VisibilityPolicy<LLFloater>::hide(instance, key);
+                        }
                 }
         }
 
diff --git a/linden/indra/newview/llfloatercustomize.cpp b/linden/indra/newview/llfloatercustomize.cpp
index b5dd018..bfca034 100644
--- a/linden/indra/newview/llfloatercustomize.cpp
+++ b/linden/indra/newview/llfloatercustomize.cpp
@@ -220,6 +220,8 @@ public:
 
                 childSetAction("Save", onSave, this ); 
                 childSetAction("Cancel", onCancel, this ); 
+                childSetAction("Check All", onCheckAll, this );
+                childSetAction("Uncheck All", onUncheckAll, this );
         }
 
         BOOL getRenameClothing()
@@ -300,6 +302,26 @@ public:
                 LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata;
                 self->close(); // destroys this object
         }
+
+        static void onCheckAll( void* userdata )
+        {
+                LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata;
+                for( S32 i = 0; i < (S32)(self->mCheckBoxList.size()); i++)
+                {
+                        std::string name = self->mCheckBoxList[i].first;
+                        if(self->childIsEnabled(name))self->childSetValue(name,TRUE);
+                }
+        }
+
+        static void onUncheckAll( void* userdata )
+        {
+                LLMakeOutfitDialog* self = (LLMakeOutfitDialog*) userdata;
+                for( S32 i = 0; i < (S32)(self->mCheckBoxList.size()); i++)
+                {
+                        std::string name = self->mCheckBoxList[i].first;
+                        if(self->childIsEnabled(name))self->childSetValue(name,FALSE);
+                }
+        }
 };
 
 /////////////////////////////////////////////////////////////////////
@@ -492,10 +514,26 @@ void LLPanelEditWearable::setSubpart( ESubpart subpart )
                 item = (LLViewerInventoryItem*)gAgent.getWearableInventoryItem(mType);
                 U32 perm_mask = 0x0;
                 BOOL is_complete = FALSE;
+                bool can_export = false;
+                bool can_import = false;
                 if(item)
                 {
                         perm_mask = item->getPermissions().getMaskOwner();
                         is_complete = item->isComplete();
+                        
+                        if (subpart <= 18) // body parts only
+                        {
+                                can_import = true;
+
+                                if (is_complete && 
+                                        gAgent.getID() == item->getPermissions().getOwner() &&
+                                        gAgent.getID() == item->getPermissions().getCreator() &&
+                                        (PERM_ITEM_UNRESTRICTED &
+                                        perm_mask) == PERM_ITEM_UNRESTRICTED)
+                                {
+                                        can_export = true;
+                                }
+                        }
                 }
                 setUIPermissions(perm_mask, is_complete);
                 BOOL editable = ((perm_mask & PERM_MODIFY) && is_complete) ? TRUE : FALSE;
@@ -519,7 +557,8 @@ void LLPanelEditWearable::setSubpart( ESubpart subpart )
                 }
                 gFloaterCustomize->generateVisualParamHints(NULL, sorted_params);
                 gFloaterCustomize->updateScrollingPanelUI();
-
+                gFloaterCustomize->childSetEnabled("Export", can_export);
+                gFloaterCustomize->childSetEnabled("Import", can_import);
 
                 // Update the camera
                 gMorphView->setCameraTargetJoint( gAgent.getAvatarObject()->getJoint( part->mTargetJoint ) );
@@ -1188,6 +1227,17 @@ void LLScrollingPanelParam::onSliderMoved(LLUICtrl* ctrl, void* userdata)
         F32 new_weight = self->percentToWeight( (F32)slider->getValue().asReal() );
         if (current_weight != new_weight )
         {
+                LLFloaterCustomize* floater_customize = gFloaterCustomize;
+                if (!floater_customize) return;
+
+                //avatar height stuff -Patrick Sapinski (Wednesday, August 19, 2009)
+                LLVOAvatar* avatar = gAgent.getAvatarObject();
+                F32 avatar_size = (avatar->mBodySize.mV[VZ]) + (F32)0.17; //mBodySize is actually quite a bit off.
+                
+                floater_customize->getChild<LLTextBox>("HeightText")->setValue(llformat("%.2f", avatar_size) + "m");
+                floater_customize->getChild<LLTextBox>("HeightText2")->setValue(llformat("%.2f",llround(avatar_size / 0.3048)) + "'"
+                                                                                                                                          + llformat("%.2f",llround(avatar_size * 39.37) % 12) + "\"");
+
                 gAgent.getAvatarObject()->setVisualParamWeight( param, new_weight, FALSE);
                 gAgent.getAvatarObject()->updateVisualParams();
         }
@@ -1429,6 +1479,10 @@ BOOL LLFloaterCustomize::postBuild()
         childSetAction("Ok", LLFloaterCustomize::onBtnOk, (void*)this);
         childSetAction("Cancel", LLFloater::onClickClose, (void*)this);
 
+    // reX
+        childSetAction("Import", LLFloaterCustomize::onBtnImport, (void*)this);
+        childSetAction("Export", LLFloaterCustomize::onBtnExport, (void*)this);
+
         // Wearable panels
         initWearablePanels();
 
@@ -1494,6 +1548,157 @@ void LLFloaterCustomize::setCurrentWearableType( EWearableType type )
         }
 }
 
+
+// reX: new function
+void LLFloaterCustomize::onBtnImport( void* userdata )
+{
+        LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getOpenFile( LLFilePicker::FFLOAD_XML ) )
+                {
+                        // User canceled import.
+                        return;
+                }
+
+        const std::string filename = file_picker.getFirstFile();
+
+        FILE* fp = LLFile::fopen(filename, "rb");
+
+        //char text_buffer[2048];               /* Flawfinder: ignore */
+        S32 c;
+        S32 typ;
+        S32 count;
+        S32 param_id=0;
+        F32 param_weight=0;
+        S32 fields_read;
+
+        for( S32 i=0; i < WT_COUNT; i++ )
+        {
+                fields_read = fscanf( fp, "type %d\n", &typ);
+                if( fields_read != 1 )
+                {
+                        llwarns << "Bad asset type: early end of file" << llendl;
+                        return;
+                }
+
+                fields_read = fscanf( fp, "parameters %d\n", &count);
+                if( fields_read != 1 )
+                {
+                        llwarns << "Bad parameters : early end of file" << llendl;
+                        return;
+                }
+                for(c=0;c<count;c++)
+                {
+                        fields_read = fscanf( fp, "%d %f\n", &param_id, &param_weight );
+                        if( fields_read != 2 )
+                        {
+                                llwarns << "Bad parameters list: early end of file" << llendl;
+                                return;
+                        }
+                        gAgent.getAvatarObject()->setVisualParamWeight( param_id, param_weight, TRUE);
+                        gAgent.getAvatarObject()->updateVisualParams();
+                }
+        }
+
+
+
+        //for( S32 i=0; i < WT_COUNT; i++ )
+        //{
+        //      fields_read = fscanf( fp, "type %d\n", &typ);
+        //      if( fields_read != 1 )
+        //      {
+        //              llwarns << "Bad asset type: early end of file" << llendl;
+        //              return;
+        //      }
+        //      fields_read = fscanf( fp, "textures %d\n", &count);
+        //      if( fields_read != 1 )
+        //      {
+        //                      llwarns << "Bad textures: early end of file" << llendl;
+        //                      return;
+        //      }
+    //
+        //      for(c=0;c<count;c++)
+        //      {
+        //              fields_read = fscanf( fp, "%d %2047s\n",text_buffer);
+        //              if( fields_read != 2 )
+        //              {
+        //                      llwarns << "Bad textures list: early end of file" << llendl;
+        //                      return;
+        //              }
+        //      }
+
+
+        fclose(fp);
+        return;
+}
+
+// reX: new function
+void LLFloaterCustomize::onBtnExport( void* userdata )
+{
+        LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_XML ) )
+                {
+                        // User canceled export.
+                        return;
+                }
+
+        LLViewerInventoryItem* item;
+        BOOL is_modifiable;
+
+        const std::string filename = file_picker.getFirstFile();
+
+        FILE* fp = LLFile::fopen(filename, "wb");
+
+        for( S32 i=0; i < WT_COUNT; i++ )
+        {
+                is_modifiable = FALSE;
+                LLWearable* old_wearable = gAgent.getWearable((EWearableType)i);
+                if( old_wearable )
+                {
+                        item = (LLViewerInventoryItem*)gAgent.getWearableInventoryItem((EWearableType)i);
+                        if(item)
+                        {
+                                const LLPermissions& perm = item->getPermissions();
+                                is_modifiable = perm.allowModifyBy(gAgent.getID(), gAgent.getGroupID());
+                        }
+                }
+                if (is_modifiable)
+                {
+                        old_wearable->FileExportParams(fp);
+                }
+                if (!is_modifiable)
+                {
+                        fprintf( fp, "type %d\n",i);
+                        fprintf( fp, "parameters 0\n");
+                }
+        }       
+
+        for( S32 i=0; i < WT_COUNT; i++ )
+        {
+                is_modifiable = FALSE;
+                LLWearable* old_wearable = gAgent.getWearable((EWearableType)i);
+                if( old_wearable )
+                {
+                        item = (LLViewerInventoryItem*)gAgent.getWearableInventoryItem((EWearableType)i);
+                        if(item)
+                        {
+                                const LLPermissions& perm = item->getPermissions();
+                                is_modifiable = perm.allowModifyBy(gAgent.getID(), gAgent.getGroupID());
+                        }
+                }
+                if (is_modifiable)
+                {
+                        old_wearable->FileExportTextures(fp);
+                }
+                if (!is_modifiable)
+                {
+                        fprintf( fp, "type %d\n",i);
+                        fprintf( fp, "textures 0\n");
+                }
+        }       
+
+        fclose(fp);
+}
+
 // static
 void LLFloaterCustomize::onBtnOk( void* userdata )
 {
@@ -1957,6 +2162,21 @@ void LLFloaterCustomize::draw()
         // arrives. Figure out some way to avoid this if possible.
         updateInventoryUI();
 
+        LLFloaterCustomize* floater_customize = gFloaterCustomize;
+        if (!floater_customize) return;
+
+        //KOWs avatar height stuff
+        LLVOAvatar* avatar = gAgent.getAvatarObject();
+        F32 avatar_size = (avatar->mBodySize.mV[VZ]) + (F32)0.17; //mBodySize is actually quite a bit off.
+                
+        floater_customize->getChild<LLTextBox>("HeightText")->setValue(llformat("%.2f", avatar_size) + "m");
+        //inches = avatar_size * 39.37
+        //round(inches) + inches % 12
+        std::string temp = llformat("%.0f",(F32)llfloor(avatar_size / 0.3048));
+        std::string temp2 = llformat("%.0f",(F32)(llround(avatar_size * 39.37) % 12));
+        floater_customize->getChild<LLTextBox>("HeightText2")->setValue(temp + "'"
+                                                                                                                                  + temp2 + "\"");
+
         LLScrollingPanelParam::sUpdateDelayFrames = 0;
         
         LLFloater::draw();
diff --git a/linden/indra/newview/llfloatercustomize.h b/linden/indra/newview/llfloatercustomize.h
index 28a525e..d0e558f 100644
--- a/linden/indra/newview/llfloatercustomize.h
+++ b/linden/indra/newview/llfloatercustomize.h
@@ -107,6 +107,10 @@ public:
 
         // Callbacks
         static void             onBtnOk( void* userdata );
+        // reX: new function (thx dudes)
+        static void             onBtnImport( void* userdata );
+        // reX: new function    
+        static void             onBtnExport( void* userdata );
         static void             onBtnMakeOutfit( void* userdata );
         static void             onMakeOutfitCommit( LLMakeOutfitDialog* dialog, void* userdata );
 
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index 478d39e..874249b 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -62,7 +62,7 @@
 std::map<const LLUUID, LLFloaterGroupPicker*> LLFloaterGroupPicker::sInstances;
 
 // helper functions
-void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 powers_mask = GP_ALL_POWERS);
+void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, const std::string& none_text, U64 powers_mask = GP_ALL_POWERS);
 
 ///----------------------------------------------------------------------------
 /// Class LLFloaterGroupPicker
@@ -117,7 +117,8 @@ void LLFloaterGroupPicker::setPowersMask(U64 powers_mask)
 
 BOOL LLFloaterGroupPicker::postBuild()
 {
-        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), mPowersMask);
+        const std::string none_text = getString("none");
+        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text, mPowersMask);
 
         childSetAction("OK", onBtnOK, this);
 
@@ -201,7 +202,8 @@ void LLPanelGroups::reset()
         childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
         childSetTextArg("groupcount", "[MAX]", llformat("%d",MAX_AGENT_GROUPS));
 
-        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID());
+        const std::string none_text = getString("none");
+        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text);
         enableButtons();
 }
 
@@ -212,7 +214,8 @@ BOOL LLPanelGroups::postBuild()
         childSetTextArg("groupcount", "[COUNT]", llformat("%d",gAgent.mGroups.count()));
         childSetTextArg("groupcount", "[MAX]", llformat("%d",MAX_AGENT_GROUPS));
 
-        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID());
+        const std::string none_text = getString("none");
+        init_group_list(getChild<LLScrollListCtrl>("group list"), gAgent.getGroupID(), none_text);
 
         childSetAction("Activate", onBtnActivate, this);
 
@@ -460,7 +463,7 @@ void LLPanelGroups::onGroupList(LLUICtrl* ctrl, void* userdata)
         if(self) self->enableButtons();
 }
 
-void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 powers_mask)
+void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, const std::string& none_text, U64 powers_mask)
 {
         S32 count = gAgent.mGroups.count();
         LLUUID id;
@@ -502,7 +505,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
                 LLSD element;
                 element["id"] = LLUUID::null;
                 element["columns"][0]["column"] = "name";
-                element["columns"][0]["value"] = "none"; // *TODO: Translate
+                element["columns"][0]["value"] = none_text;
                 element["columns"][0]["font"] = "SANSSERIF";
                 element["columns"][0]["font-style"] = style;
 
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index 145ad80..4822bb0 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -43,6 +43,10 @@
 #include "llviewerobject.h"
 #include "lluictrlfactory.h"
 
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 LLFloaterInspect* LLFloaterInspect::sInstance = NULL;
 
 LLFloaterInspect::LLFloaterInspect(void) :
@@ -146,7 +150,13 @@ void LLFloaterInspect::onClickOwnerProfile(void* ctrl)
                 if(node)
                 {
                         const LLUUID& owner_id = node->mPermissions->getOwner();
-                        LLFloaterAvatarInfo::showFromDirectory(owner_id);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                        if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                        {
+                                LLFloaterAvatarInfo::showFromDirectory(owner_id);
+                        }
+// [/RLVa:KB]
+//                      LLFloaterAvatarInfo::showFromDirectory(owner_id);
                 }
         }
 }
@@ -164,7 +174,10 @@ void LLFloaterInspect::onSelectObject(LLUICtrl* ctrl, void* user_data)
 {
         if(LLFloaterInspect::getSelectedUUID() != LLUUID::null)
         {
-                sInstance->childSetEnabled("button owner", true);
+                //sInstance->childSetEnabled("button owner", true);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-1.0.0e
+                sInstance->childSetEnabled("button owner", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+// [/RLVa:KB]
                 sInstance->childSetEnabled("button creator", true);
         }
 }
@@ -224,6 +237,13 @@ void LLFloaterInspect::refresh()
                 LLStringUtil::copy(time, ctime(&timestamp), MAX_STRING);
                 time[24] = '\0';
                 gCacheName->getFullName(obj->mPermissions->getOwner(), owner_name);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                {
+                        // TODO-RLVa: shouldn't filter if this is a group-owned prim (will show "(nobody)")
+                        owner_name = gRlvHandler.getAnonym(owner_name);
+                }
+// [/RLVa:KB]
                 gCacheName->getFullName(obj->mPermissions->getCreator(), creator_name);
                 row["id"] = obj->getObject()->getID();
                 row["columns"][0]["column"] = "object_name";
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 94a8345..08c04ab 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -820,6 +820,12 @@ void LLPanelLandGeneral::setGroup(const LLUUID& group_id)
 // static
 void LLPanelLandGeneral::onClickBuyLand(void* data)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+        {
+                return;
+        }
+// [/RLVa:KB]
         BOOL* for_group = (BOOL*)data;
         LLViewerParcelMgr::getInstance()->startBuyLand(*for_group);
 }
@@ -2878,3 +2884,41 @@ void LLPanelLandCovenant::updateEstateOwnerName(const std::string& name)
                 if (editor) editor->setText(name);
         }
 }
+
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+void LLFloaterLand::open()
+{
+        // We'll allow "About Land" as long as you have the ability to return prims (through ownership or through group powers)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                LLParcelSelection* pParcelSel = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection();
+                if ( (!pParcelSel) || (pParcelSel->hasOthersSelected()) )
+                        return;
+                LLParcel* pParcel = pParcelSel->getParcel();
+                if (!pParcel)
+                        return;
+
+                // Ideally we could just use LLViewerParcelMgr::isParcelOwnedByAgent(), but that has that sneaky exemption
+                // for fake god like (aka View Admin Options)
+                const LLUUID& idOwner = pParcel->getOwnerID();
+                if ( (idOwner != gAgent.getID()) )
+                {
+                        // *sighs* LLAgent::hasPowerInGroup() has it too so copy/paste from there
+                        S32 count = gAgent.mGroups.count(); bool fShow = false;
+                        for (S32 i = 0; i < count; ++i)
+                        {
+                                if (gAgent.mGroups.get(i).mID == idOwner)
+                                {
+                                        fShow |= ((gAgent.mGroups.get(i).mPowers & GP_LAND_RETURN) > 0);
+                                        break;
+                                }
+                        }
+
+                        if (!fShow)
+                                return;
+                }
+        }
+
+        LLFloater::open();
+}
+// [/RLVa:KB]
diff --git a/linden/indra/newview/llfloaterland.h b/linden/indra/newview/llfloaterland.h
index 4c3de65..113b679 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -85,6 +85,10 @@ public:
         virtual void onOpen();
         virtual BOOL postBuild();
 
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        virtual void open();
+// [/RLVa:KB]
+
 protected:
 
         // Does its own instance management, so clients not allowed
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 3b1e4c7..85057ee 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -43,14 +43,45 @@
 #include "llresizebar.h"
 #include "lluictrlfactory.h"
 
+// radar
+#include "llchat.h"
+#include "llfirstuse.h"
+#include "llfloateravatarinfo.h"
+#include "llfloaterchat.h"
+#include "llfloaterfriends.h"
+#include "llfloatergroupinvite.h"
+#include "llfloatergroups.h"
+#include "llfloaterreporter.h"
+#include "llimview.h"
+#include "llmutelist.h"
+#include "llparcel.h"
+#include "llregionposition.h"
+#include "roles_constants.h"
+#include "llscrolllistctrl.h"
+#include "lltracker.h"
+#include "llviewerobjectlist.h"
+#include "llviewermenu.h"
+#include "llviewermessage.h"
+#include "llviewerparcelmgr.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
+#include "llvoavatar.h"
+#include "llworld.h"
+
 LLFloaterMap::LLFloaterMap(const LLSD& key)
         :
         LLFloater(std::string("minimap")),
-        mPanelMap(NULL)
+        mPanelMap(NULL),
+        mUpdate(TRUE),
+        mSelectedAvatar(LLUUID::null)
+
 {
         LLCallbackMap::map_t factory_map;
         factory_map["mini_mapview"] = LLCallbackMap(createPanelMiniMap, this);
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_mini_map.xml", &factory_map, FALSE);
+
+        mChatAvatars.clear();
+        mTypingAvatars.clear();
 }
 
 
@@ -66,8 +97,33 @@ BOOL LLFloaterMap::postBuild()
 {
         // Send the drag handle to the back, but make sure close stays on top
         sendChildToBack(getDragHandle());
+        sendChildToFront(getChild<LLButton>("llfloater_minimize_btn"));
         sendChildToFront(getChild<LLButton>("llfloater_close_btn"));
         setIsChrome(TRUE);
+        
+        mRadarList = getChild<LLScrollListCtrl>("RadarList");
+        childSetCommitCallback("RadarList", onList, this);
+        mRadarList->setDoubleClickCallback(onClickIM);
+
+        childSetFocusChangedCallback("near_me_range", onRangeChange, this);
+
+        childSetAction("im_btn", onClickIM, this);
+        childSetAction("profile_btn", onClickProfile, this);
+        childSetAction("offer_teleport_btn", onClickOfferTeleport, this);
+        childSetAction("track_btn", onClickTrack, this);
+        childSetAction("invite_btn", onClickInvite, this);
+        childSetAction("add_btn", onClickAddFriend, this);
+        childSetAction("freeze_btn", onClickFreeze, this);
+        childSetAction("eject_btn", onClickEject, this);
+        childSetAction("mute_btn", onClickMute, this);
+        childSetAction("unmute_btn", onClickUnmute, this);
+        childSetAction("ar_btn", onClickAR, this);
+        childSetAction("estate_eject_btn", onClickEjectFromEstate, this);
+
+        setDefaultBtn("im_btn");
+
+        populateRadar();
+
         return TRUE;
 }
 
@@ -123,3 +179,839 @@ void LLFloaterMap::draw()
         }
 }
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-05 (RLVa-1.0.0c)
+void LLFloaterMap::open()
+{
+        if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWMINIMAP))
+        {
+                LLFloater::open();
+                LLFirstUse::useMiniMap();
+        }
+}
+// [/RLVa:KB]
+
+// TODO: make this detachable
+// TODO: make this expand/collapse
+
+/*
+* Imprudence Radar
+* @brief inworld radar integrated with the minimap
+* by McCabe Maxsted
+* Estate tab portion by Dale Glass
+*/
+
+//static
+bool LLFloaterMap::isImpDev(LLUUID agent_id)
+{
+        // We use strings here as avatar keys change across grids. 
+        // Feel free to add/remove yourself.
+        std::string agent_name = getSelectedName(agent_id);
+        if (agent_name == "McCabe Maxsted" || 
+                agent_name == "Jacek Antonelli" ||
+                agent_name == "Armin Weatherwax")
+        {
+                return true;
+        }
+        return false;
+}
+
+//static
+void LLFloaterMap::updateRadar()
+{
+        LLFloaterMap::getInstance()->populateRadar();
+}
+
+void LLFloaterMap::populateRadar()
+{
+        if (!mUpdate || !LLFloaterMap::getInstance()->getVisible())
+        {
+                return;
+        }
+
+        if (visibleItemsSelected())
+        {
+                mSelectedAvatar = mRadarList->getFirstSelected()->getUUID();
+        }
+        else
+        {
+                mSelectedAvatar.setNull();
+        }
+
+        S32 scroll_pos = mRadarList->getScrollPos();
+
+        // clear count
+        std::stringstream avatar_count; 
+        avatar_count.str("");
+
+        // find what avatars you can see
+        F32 range = gSavedSettings.getF32("NearMeRange");
+        LLVector3d current_pos = gAgent.getPositionGlobal();
+        std::vector<LLUUID> avatar_ids;
+        std::vector<LLVector3d> positions;
+        LLWorld::getInstance()->getAvatars(&avatar_ids, &positions);
+
+        LLSD element;
+
+        mRadarList->deleteAllItems();
+
+        if (!avatar_ids.empty())
+        {
+                for (U32 i=0; i<avatar_ids.size(); i++)
+                {
+                        if (avatar_ids[i] == gAgent.getID() ||
+                                avatar_ids[i].isNull())
+                        {
+                                continue;
+                        }
+
+                        // Add to list only if we get their name
+                        std::string fullname = getSelectedName(avatar_ids[i]);
+                        if (!fullname.empty())
+                        {
+                                bool notify_chat = gSavedSettings.getBOOL("MiniMapNotifyChatRange");
+                                bool notify_sim = gSavedSettings.getBOOL("MiniMapNotifySimRange");
+        // [RLVa:KB] - Alternate: Imprudence-1.2.0
+                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                                {
+                                        fullname = gRlvHandler.getAnonym(fullname);
+                                        notify_chat = false;
+                                        notify_sim = false;
+                                }
+        // [/RLVa:KB]
+
+                                // check if they're in certain ranges and notify user if we've enabled that
+                                LLVector3d temp = positions[i] - current_pos;
+                                F32 distance = llround((F32)temp.magVec(), 0.1f);
+                                /*char dist[32];
+                                sprintf(dist, "%.1f", distance);
+                                std::string dist_string = dist;*/
+                                std::string dist_string = llformat("%.1f", distance);
+
+                                if (notify_chat)
+                                {
+                                        if (distance < 20.0f)
+                                        {
+                                                if (!isInChatList(avatar_ids[i]))
+                                                {
+                                                        addToChatList(avatar_ids[i], dist_string);
+                                                }
+                                        }
+                                        else
+                                        {
+                                                if (isInChatList(avatar_ids[i]))
+                                                {
+                                                        removeFromChatList(avatar_ids[i]);
+                                                }
+                                        }
+                                        updateChatList(avatar_ids);
+                                }
+                                else if (!mChatAvatars.empty())
+                                {
+                                        mChatAvatars.clear();
+                                }
+
+                                if (notify_sim)
+                                {
+                                        if (!isInChatList(avatar_ids[i]) && !getInSimAvList(avatar_ids[i]))
+                                        {
+                                                LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]);
+                                                if (av_obj != NULL && av_obj->isAvatar())
+                                                {
+                                                        LLVOAvatar* avatarp = (LLVOAvatar*)av_obj;
+                                                        if (avatarp != NULL)
+                                                        {
+                                                                if (avatarp->getRegion() == gAgent.getRegion())
+                                                                {
+                                                                        addToSimAvList(avatar_ids[i], dist_string);
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                        updateSimAvList(avatar_ids);
+                                }
+                                else if (!mSimAvatars.empty())
+                                {
+                                        mSimAvatars.clear();
+                                }
+
+                                // only display avatars in range
+                                if (distance <= range)
+                                {
+                                        // append typing string
+                                        std::string typing = "";
+                                        if (isTyping(avatar_ids[i]))
+                                        {
+                                                typing = getString("is_typing")+ " ";
+                                        }
+
+                                        std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("is_muted") : "";
+                                        element["id"] = avatar_ids[i];
+                                        element["columns"][0]["column"] = "avatar_name";
+                                        element["columns"][0]["type"] = "text";
+                                        element["columns"][0]["value"] = typing + fullname + " " + mute_text;
+                                        element["columns"][1]["column"] = "avatar_distance";
+                                        element["columns"][1]["type"] = "text";
+                                        element["columns"][1]["value"] = dist_string+"m";
+
+                                        mRadarList->addElement(element, ADD_BOTTOM);
+                                }
+                        }
+                }
+
+                mRadarList->sortItems();
+                mRadarList->setScrollPos(scroll_pos);
+                if (mSelectedAvatar.notNull())
+                {
+                        mRadarList->selectByID(mSelectedAvatar);
+                }
+                avatar_count << (int)avatar_ids.size();
+        }
+        else
+        {
+                mTypingAvatars.clear();
+                mRadarList->addCommentText(getString("no_one_near"), ADD_TOP);
+                avatar_count << "0";
+        }
+
+        childSetText("lblAvatarCount", avatar_count.str());
+
+        toggleButtons();
+
+        //llinfos << "mSelectedAvatar: " << mSelectedAvatar.asString() << llendl;
+}
+
+void LLFloaterMap::updateChatList(std::vector<LLUUID> agent_ids)
+{
+        std::set<LLUUID>::iterator it;
+        std::vector<LLUUID>::iterator result;
+        for (it = mChatAvatars.begin(); it != mChatAvatars.end(); )
+        {
+                result = find(agent_ids.begin(), agent_ids.end(), *it);
+                if (result == agent_ids.end())
+                {
+                        mChatAvatars.erase(it++);
+                }
+                else
+                {
+                        it++;
+                }
+        }
+}
+
+bool LLFloaterMap::isInChatList(LLUUID agent_id)
+{
+        if (mChatAvatars.count(agent_id) > 0)
+        {
+                return true;
+        }
+        return false;
+}
+
+void LLFloaterMap::addToChatList(LLUUID agent_id, std::string distance)
+{
+        mChatAvatars.insert(agent_id);
+        LLChat chat;
+
+        LLUIString notify = getString("entering_chat_range");
+        notify.setArg("[NAME]", getSelectedName(agent_id));
+        notify.setArg("[DISTANCE]", distance);
+
+        chat.mText = notify;
+        chat.mSourceType = CHAT_SOURCE_SYSTEM;
+        LLFloaterChat::addChat(chat, FALSE, FALSE);     
+}
+
+void LLFloaterMap::removeFromChatList(LLUUID agent_id)
+{
+        // Do we want to add a notice?
+        mChatAvatars.erase(agent_id);
+}
+
+bool LLFloaterMap::isTyping(LLUUID agent_id)
+{
+        if (mTypingAvatars.count(agent_id) > 0)
+        {
+                return true;
+        }
+        return false;
+}
+
+void LLFloaterMap::updateTypingList(LLUUID agent_id, bool remove)
+{
+        if (remove)
+        {
+                if (isTyping(agent_id))
+                {
+                        mTypingAvatars.erase(agent_id); 
+                }
+        }
+        else
+        {
+                mTypingAvatars.insert(agent_id);
+        }
+}
+
+void LLFloaterMap::updateSimAvList(std::vector<LLUUID> agent_ids)
+{
+        std::set<LLUUID>::iterator it;
+        std::vector<LLUUID>::iterator result;
+        for (it = mSimAvatars.begin(); it != mSimAvatars.end(); )
+        {
+                result = find(agent_ids.begin(), agent_ids.end(), *it);
+                if (result == agent_ids.end())
+                {
+                        mSimAvatars.erase(it++);
+                }
+                else
+                {
+                        it++;
+                }
+        }
+}
+
+void LLFloaterMap::addToSimAvList(LLUUID agent_id, std::string distance)
+{
+        mSimAvatars.insert(agent_id);
+        LLChat chat;
+
+        LLUIString notify = getString("entering_sim_range");
+        notify.setArg("[NAME]", getSelectedName(agent_id));
+        notify.setArg("[DISTANCE]", distance);
+
+        chat.mText = notify;
+        chat.mSourceType = CHAT_SOURCE_SYSTEM;
+        LLFloaterChat::addChat(chat, FALSE, FALSE);     
+}
+
+bool LLFloaterMap::getInSimAvList(LLUUID agent_id)
+{
+        if (mSimAvatars.count(agent_id) > 0)
+        {
+                return true;
+        }
+        return false;
+}
+
+void LLFloaterMap::toggleButtons()
+{
+        BOOL enable = FALSE;
+        BOOL enable_unmute = FALSE;
+        BOOL enable_track = FALSE;
+        BOOL enable_estate = FALSE;
+        BOOL enable_friend = FALSE;
+        if (childHasFocus("RadarPanel"))
+        {
+                enable = mSelectedAvatar.notNull() ? visibleItemsSelected() : FALSE;
+                enable_unmute = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE;
+                enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
+                enable_estate = isKickable(mSelectedAvatar);
+                enable_friend = !is_agent_friend(mSelectedAvatar);
+        }
+        else
+        {
+                mRadarList->deselect();
+        }
+
+        childSetEnabled("im_btn", enable);
+        childSetEnabled("profile_btn", enable);
+        childSetEnabled("offer_teleport_btn", enable);
+        childSetEnabled("track_btn", enable_track);
+        childSetEnabled("invite_btn", enable);
+        childSetEnabled("add_btn", enable);
+        childSetEnabled("freeze_btn", enable_estate);
+        childSetEnabled("eject_btn", enable_estate);
+        childSetEnabled("mute_btn", enable);
+        childSetEnabled("ar_btn", enable);
+        childSetEnabled("estate_eject_btn", enable_estate);
+
+        if (enable_unmute)
+        {
+                childSetVisible("mute_btn", false);
+                childSetEnabled("unmute_btn", true);
+                childSetVisible("unmute_btn", true);
+        }
+        else
+        {
+                childSetVisible("mute_btn", true);
+                childSetVisible("unmute_btn", false);
+        }
+
+// [RLVa:KB] - Imprudence-1.2.0
+        // Bit clumsy, but this way the RLV stuff is in its own separate block and keeps the code above clean - Kitty
+        if ( (rlv_handler_t::isEnabled()) && (mSelectedAvatar.notNull()) )
+        {
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                {
+                        childSetEnabled("im_btn", FALSE);
+                        childSetEnabled("profile_btn", FALSE);
+                        childSetEnabled("invite_btn", FALSE);
+                        childSetEnabled("add_btn", FALSE);
+                        childSetEnabled("mute_btn", FALSE);
+                        childSetEnabled("unmute_btn", FALSE);
+                }
+
+                // Even though the avie is in the same sim (so they already know where we are) the tp would just get blocked by different code
+                // so it's actually less confusing to the user if we just disable the teleport button here so they'll at least have a visual cue
+                BOOL rlv_enable_tp = (!gRlvHandler.hasBehaviour(RLV_BHVR_TPLURE)) || (gRlvHandler.isException(RLV_BHVR_TPLURE, mSelectedAvatar));
+                if ( (rlv_enable_tp) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+                {
+                        const LLRelationship* pBuddyInfo = LLAvatarTracker::instance().getBuddyInfo(mSelectedAvatar);
+                        if ( ((!pBuddyInfo) || (!pBuddyInfo->isOnline()) || (!pBuddyInfo->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION))) )
+                                rlv_enable_tp = FALSE;
+                }
+                childSetEnabled("offer_teleport_btn", rlv_enable_tp);
+        }
+// [/RLVa:KB]
+}
+
+BOOL LLFloaterMap::isKickable(const LLUUID &agent_id)
+{
+        if (agent_id.notNull())
+        {
+                LLViewerObject* av_obj = gObjectList.findObject(agent_id);
+                if (av_obj != NULL && av_obj->isAvatar())
+                {
+                        LLVOAvatar* avatar = (LLVOAvatar*)av_obj;
+                        LLViewerRegion* region = avatar->getRegion();
+                        if (region)
+                        {
+                                const LLVector3& pos = avatar->getPositionRegion();
+                                const LLVector3d& pos_global = avatar->getPositionGlobal();
+                                if (LLWorld::getInstance()->positionRegionValidGlobal(pos_global))
+                                {
+                                        LLParcel* parcel = LLViewerParcelMgr::getInstance()->selectParcelAt(pos_global)->getParcel();
+                                        LLViewerParcelMgr::getInstance()->deselectLand();
+                                        
+                                        BOOL new_value = (region != NULL);
+                                                                
+                                        if (new_value)
+                                        {
+                                                new_value = region->isOwnedSelf(pos);
+                                                if (!new_value || region->isOwnedGroup(pos))
+                                                {
+                                                        new_value = LLViewerParcelMgr::getInstance()->isParcelOwnedByAgent(parcel,GP_LAND_ADMIN);
+                                                }
+                                        }
+                                        return new_value;
+                                }
+                        }
+                }
+        }
+        return FALSE;   
+}
+
+// static
+void LLFloaterMap::onList(LLUICtrl* ctrl, void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*)user_data;
+        if (self)
+        {
+                self->toggleButtons();
+        }
+}
+
+BOOL LLFloaterMap::visibleItemsSelected() const
+{
+        if (mRadarList->getFirstSelectedIndex() >= 0)
+        {
+                return TRUE;
+        }
+        return FALSE;
+}
+
+// static
+void LLFloaterMap::onRangeChange(LLFocusableElement* focus, void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*)user_data;
+        if (self)
+        {
+                self->mUpdate = !(self->childHasFocus("near_me_range"));
+        }
+}
+
+// static
+LLUUID LLFloaterMap::getSelected()
+{
+        return LLFloaterMap::getInstance()->mSelectedAvatar;
+}
+
+//
+// Avatar tab
+//
+
+// static
+void LLFloaterMap::onClickIM(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                gIMMgr->setFloaterOpen(TRUE);
+                gIMMgr->addSession(getSelectedName(agent_id), IM_NOTHING_SPECIAL, agent_id);
+        }
+}
+
+// static
+void LLFloaterMap::onClickProfile(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLFloaterAvatarInfo::show(agent_id);
+        }
+}
+
+// static
+void LLFloaterMap::onClickOfferTeleport(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                handle_lure(agent_id);
+        }
+}
+
+// static
+void LLFloaterMap::onClickTrack(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus();
+        
+        if (LLTracker::TRACKING_AVATAR == tracking_status)
+        {
+                LLTracker::stopTracking(NULL);
+        }
+        else
+        {
+                LLScrollListItem *item = self->mRadarList->getFirstSelected();
+                if (item != NULL)
+                {
+                        LLUUID agent_id = item->getUUID();
+                        LLTracker::trackAvatar(agent_id, getSelectedName(agent_id));
+                }
+        }
+}
+
+// static
+void LLFloaterMap::onClickInvite(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLFloaterGroupPicker* widget;
+                widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
+                if (widget)
+                {
+                        widget->center();
+                        widget->setPowersMask(GP_MEMBER_INVITE);
+                        widget->setSelectCallback(callback_invite_to_group, (void *)&agent_id);
+                }
+        }
+}
+
+// static
+void LLFloaterMap::callback_invite_to_group(LLUUID group_id, void *user_data)
+{
+        std::vector<LLUUID> agent_ids;
+        agent_ids.push_back(*(LLUUID *)user_data);
+        
+        LLFloaterGroupInvite::showForGroup(group_id, &agent_ids);
+}
+
+// static
+void LLFloaterMap::onClickAddFriend(void* user_data)
+{
+        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLPanelFriends::requestFriendshipDialog(agent_id, getSelectedName(agent_id));
+        }
+}
+
+//
+// Estate tab
+//
+
+//static 
+std::string LLFloaterMap::getSelectedName(const LLUUID &agent_id)
+{
+        std::string agent_name;
+        if(gCacheName->getFullName(agent_id, agent_name) && agent_name != " ")
+        {
+                return agent_name;
+        }
+        return LLStringUtil::null;
+}
+
+//static 
+void LLFloaterMap::callbackFreeze(S32 option, void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+
+        if ( option == 0 )
+        {
+                sendFreeze(self->mSelectedAvatar, true);
+        }
+        else if ( option == 1 )
+        {
+                sendFreeze(self->mSelectedAvatar, false);
+        }
+}
+
+//static 
+void LLFloaterMap::callbackEject(S32 option, void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+ 
+        if ( option == 0 )
+        {
+                sendEject(self->mSelectedAvatar, false);
+        }
+        else if ( option == 1 )
+        {
+                sendEject(self->mSelectedAvatar, true);
+        }
+}
+
+//static 
+void LLFloaterMap::callbackEjectFromEstate(S32 option, void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+
+        if ( option == 0 )
+        {
+                cmdEstateEject(self->mSelectedAvatar);
+        } 
+        else if ( option == 1 )
+        {
+                cmdEstateBan(self->mSelectedAvatar);
+        }
+}
+
+void LLFloaterMap::onClickFreeze(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["[AVATAR_NAME]"] = getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("FreezeAvatarFullname", args, callbackFreeze, user_data);
+}
+
+//static
+void LLFloaterMap::onClickEject(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["AVATAR_NAME"] = getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("EjectAvatarFullName", args, callbackEject, user_data);
+}
+
+//static
+void LLFloaterMap::onClickMute(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                std::string agent_name = getSelectedName(agent_id);
+                if (LLMuteList::getInstance()->isMuted(agent_id))
+                {
+                        //LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        //LLMuteList::getInstance()->remove(mute);      
+                        //LLFloaterMute::getInstance()->selectMute(agent_id);
+                }
+                else
+                {
+                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        LLMuteList::getInstance()->add(mute);
+                }
+        }
+}
+
+//static
+void LLFloaterMap::onClickUnmute(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                std::string agent_name = getSelectedName(agent_id);
+                if (LLMuteList::getInstance()->isMuted(agent_id))
+                {
+                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        LLMuteList::getInstance()->remove(mute);        
+                        //LLFloaterMute::getInstance()->selectMute(agent_id);
+                }
+                else
+                {
+                        //LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        //LLMuteList::getInstance()->add(mute);
+                }
+        }
+}
+
+//static
+void LLFloaterMap::onClickEjectFromEstate(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["EVIL_USER"] = getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("EstateKickUser", args, callbackEjectFromEstate, user_data);
+}
+
+//static
+void LLFloaterMap::onClickAR(void *user_data)
+{
+        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLUUID agent_id = self->mSelectedAvatar;
+                
+        if (agent_id.notNull())
+        {
+                        LLFloaterReporter::showFromObject(agent_id);
+        }
+}
+
+// static 
+void LLFloaterMap::cmdEstateEject(const LLUUID &avatar)
+{ 
+        sendEstateMessage("teleporthomeuser", avatar); 
+}
+
+// static 
+void LLFloaterMap::cmdEstateBan(const LLUUID &avatar)
+{
+        sendEstateMessage("teleporthomeuser", avatar); // Kick first, just to be sure
+        sendEstateBan(avatar);
+}
+
+// static 
+void LLFloaterMap::sendFreeze(const LLUUID& avatar_id, bool freeze)
+{
+        U32 flags = 0x0;
+        if (!freeze)
+        {
+                // unfreeze
+                flags |= 0x1;
+        }
+
+        LLMessageSystem* msg = gMessageSystem;
+        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
+
+        if (avatar)
+        {
+                msg->newMessage("FreezeUser");
+                msg->nextBlock("AgentData");
+                msg->addUUID("AgentID", gAgent.getID());
+                msg->addUUID("SessionID", gAgent.getSessionID());
+                msg->nextBlock("Data");
+                msg->addUUID("TargetID", avatar_id );
+                msg->addU32("Flags", flags );
+                msg->sendReliable( avatar->getRegion()->getHost() );
+        }
+}
+
+// static 
+void LLFloaterMap::sendEject(const LLUUID& avatar_id, bool ban)
+{       
+        LLMessageSystem* msg = gMessageSystem;
+        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
+
+        if (avatar)
+        {
+                U32 flags = 0x0;
+                if ( ban )
+                {
+                        // eject and add to ban list
+                        flags |= 0x1;
+                }
+
+                msg->newMessage("EjectUser");
+                msg->nextBlock("AgentData");
+                msg->addUUID("AgentID", gAgent.getID() );
+                msg->addUUID("SessionID", gAgent.getSessionID() );
+                msg->nextBlock("Data");
+                msg->addUUID("TargetID", avatar_id );
+                msg->addU32("Flags", flags );
+                msg->sendReliable( avatar->getRegion()->getHost() );
+        }
+}
+
+// static 
+void LLFloaterMap::sendEstateMessage(const char* request, const LLUUID &target)
+{
+
+        LLMessageSystem* msg = gMessageSystem;
+        LLUUID invoice;
+
+        // This seems to provide an ID so that the sim can say which request it's
+        // replying to. I think this can be ignored for now.
+        invoice.generate();
+
+        llinfos << "Sending estate request '" << request << "'" << llendl;
+        msg->newMessage("EstateOwnerMessage");
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+        msg->nextBlock("MethodData");
+        msg->addString("Method", request);
+        msg->addUUID("Invoice", invoice);
+
+        // Agent id
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", gAgent.getID().asString().c_str());
+
+        // Target
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", target.asString().c_str());
+
+        msg->sendReliable(gAgent.getRegion()->getHost());
+}
+
+// static 
+void LLFloaterMap::sendEstateBan(const LLUUID& agent)
+{
+        LLUUID invoice;
+        U32 flags = ESTATE_ACCESS_BANNED_AGENT_ADD;
+
+        invoice.generate();
+
+        LLMessageSystem* msg = gMessageSystem;
+        msg->newMessage("EstateOwnerMessage");
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+
+        msg->nextBlock("MethodData");
+        msg->addString("Method", "estateaccessdelta");
+        msg->addUUID("Invoice", invoice);
+
+        char buf[MAX_STRING];           /* Flawfinder: ignore*/
+        gAgent.getID().toString(buf);
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+
+        snprintf(buf, MAX_STRING, "%u", flags);                 /* Flawfinder: ignore */
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+
+        agent.toString(buf);
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+
+        gAgent.sendReliableMessage();
+}
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index ec2db27..c457b9f 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -34,6 +34,7 @@
 #define LL_LLFLOATERMAP_H
 
 #include "llfloater.h"
+#include "llscrolllistctrl.h"
 
 class LLNetMap;
 
@@ -47,16 +48,84 @@ public:
 
         static void* createPanelMiniMap(void* data);
 
+        static void updateRadar();
+        static LLUUID getSelected();
+        // returns true if agent_id belongs to a developer listed in llfloatermap.cpp
+        static bool isImpDev(LLUUID agent_id);
+
+        bool isTyping(LLUUID agent_id);
+        void updateTypingList(LLUUID agent_id, bool remove);
+
         BOOL postBuild();
 
         /*virtual*/ void        draw();
         /*virtual*/ void        onOpen();
         /*virtual*/ void        onClose(bool app_quitting);
         /*virtual*/ BOOL        canClose();
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-05 (RLVa-1.0.0c)
+        /*virtual*/ void    open();
+// [/RLVa:KB]
+
 
 private:
+
         LLFloaterMap(const LLSD& key = LLSD());
-        LLNetMap*               mPanelMap;
+
+        LLNetMap*                               mPanelMap;
+        LLScrollListCtrl*               mRadarList;
+        LLUUID                                  mSelectedAvatar;
+
+        // TODO: move all this info into its own object. It's stupid 
+        // and bug-prone to keep it all in separate containers, but 
+        // I want to get this out for 1.2 -- McCabe
+        std::set<LLUUID>                mChatAvatars;
+        std::set<LLUUID>                mTypingAvatars;
+        std::set<LLUUID>                mSimAvatars;
+        bool                                    mUpdate;
+        
+        static void onList(LLUICtrl* ctrl, void* user_data);
+        static void onRangeChange(LLFocusableElement* focus, void* user_data);
+        BOOL visibleItemsSelected() const;
+        BOOL isKickable(const LLUUID &agent_id);
+        void toggleButtons();
+        void populateRadar();
+
+        void updateChatList(std::vector<LLUUID> agent_ids);
+        bool isInChatList(LLUUID agent_id);
+        void addToChatList(LLUUID agent_id, std::string distance);
+        void removeFromChatList(LLUUID agent_id);
+
+        bool getInSimAvList(LLUUID agent_id);
+        void addToSimAvList(LLUUID agent_id, std::string distance);
+        void updateSimAvList(std::vector<LLUUID> agent_ids);
+
+        static void onClickProfile(void* user_data);
+        static void onClickIM(void* user_data);
+        static void onClickAddFriend(void* user_data);
+        static void onClickOfferTeleport(void* user_data);
+        static void onClickTrack(void* user_data);
+        static void onClickInvite(void* user_data);
+        static void callback_invite_to_group(LLUUID group_id, void *user_data);
+
+        static std::string getSelectedName(const LLUUID &agent_id);
+        static void onClickFreeze(void *user_data);
+        static void onClickEject(void *user_data);
+        static void onClickMute(void *user_data);
+        static void onClickUnmute(void *user_data);
+        static void onClickAR(void *user_data);
+        static void onClickEjectFromEstate(void *user_data);
+
+        static void callbackFreeze(S32 option, void *user_data);
+        static void callbackEject(S32 option, void *user_data);
+        static void callbackAR(void *user_data);
+        static void callbackEjectFromEstate(S32 option, void *user_data);
+
+        static void sendFreeze(const LLUUID &avatar, bool);
+        static void sendEject(const LLUUID &avatar, bool);
+        static void cmdEstateEject(const LLUUID &avatar);
+        static void cmdEstateBan(const LLUUID &avatar);
+        static void sendEstateBan(const LLUUID& agent);
+        static void sendEstateMessage(const char* request, const LLUUID &target);
 };
 
 #endif  // LL_LLFLOATERMAP_H
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index fc483dd..d7fdece 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -208,7 +208,18 @@ void LLFloaterOpenObject::onClickMoveToInventory(void* data)
 void LLFloaterOpenObject::onClickMoveAndWear(void* data)
 {
         LLFloaterOpenObject* self = (LLFloaterOpenObject*)data;
-        self->moveToInventory(true);
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Deprecated: RLVa-0.2.2a
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+        {
+                // TODO-RLVa: once we have "Add to Outfit" and "Replace Outfit" working we don't need this anymore
+                self->moveToInventory(false);
+        }
+        else
+        {
+                self->moveToInventory(true);
+        }
+// [/RLVa:KB]
+//      self->moveToInventory(true);
         self->close();
 }
 
diff --git a/linden/indra/newview/llfloaterproperties.cpp b/linden/indra/newview/llfloaterproperties.cpp
index 406d940..3059843 100644
--- a/linden/indra/newview/llfloaterproperties.cpp
+++ b/linden/indra/newview/llfloaterproperties.cpp
@@ -355,8 +355,17 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
                 else
                 {
                         gCacheName->getFullName(perm.getOwner(), name);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                        {
+                                name = gRlvHandler.getAnonym(name);
+                        }
+// [/RLVa:KB]
                 }
-                childSetEnabled("BtnOwner",TRUE);
+                //childSetEnabled("BtnOwner",TRUE);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-1.0.0e
+                childSetEnabled("BtnOwner", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+// [/RLVa:KB]
                 childSetEnabled("LabelOwnerTitle",TRUE);
                 childSetEnabled("LabelOwnerName",TRUE);
                 childSetText("LabelOwnerName",name);
@@ -603,7 +612,10 @@ void LLFloaterProperties::onClickOwner(void* data)
         }
         else
         {
-                if(!item->getPermissions().getOwner().isNull())
+//              if(!item->getPermissions().getOwner().isNull())
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                if ( (!item->getPermissions().getOwner().isNull()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
+// [/RLVa:KB]
                 {
                         LLFloaterAvatarInfo::showFromObject(item->getPermissions().getOwner());
                 }
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index d7b7c9c..08d845b 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -3273,3 +3273,22 @@ bool LLDispatchSetEstateAccess::operator()(
 
         return true;
 }
+
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+void LLFloaterRegionInfo::open()
+{
+        // We'll allow access to the estate tools for estate managers (and for the sim owner)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                LLViewerRegion* pRegion = gAgent.getRegion();
+                if (!pRegion)
+                        return;
+
+                // Should be able to call LLRegion::canManageEstate() but then we can fake god like
+                if ( (!pRegion->isEstateManager()) && (pRegion->getOwner() != gAgent.getID()) )
+                        return;
+        }
+
+        LLFloater::open();
+}
+// [/RLVa:KB]
diff --git a/linden/indra/newview/llfloaterregioninfo.h b/linden/indra/newview/llfloaterregioninfo.h
index 806d1f5..fd0d9ce 100644
--- a/linden/indra/newview/llfloaterregioninfo.h
+++ b/linden/indra/newview/llfloaterregioninfo.h
@@ -67,6 +67,9 @@ public:
 
         /*virtual*/ void onOpen();
         /*virtual*/ BOOL postBuild();
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        /*virtual*/ void open();
+// [/RLVa:KB]
 
         static void processEstateOwnerRequest(LLMessageSystem* msg, void**);
 
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index 412494e..31d658b 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -133,6 +133,23 @@ LLFloaterReporter::LLFloaterReporter(
 
         childSetText("abuse_location_edit", gAgent.getSLURL() );
 
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-1.0.0a
+        if (rlv_handler_t::isEnabled())
+        {
+                // Can't filter these since they get sent as part of the report so just hide them instead
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                {
+                        childSetVisible("abuse_location_edit", false);
+                        childSetVisible("pos_field", false);
+                }
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                {
+                        childSetVisible("owner_name", false);
+                        childSetVisible("abuser_name_edit", false);
+                }
+        }
+// [/RLVa:KB]
+
         LLButton* pick_btn = getChild<LLButton>("pick_btn");
         if (pick_btn)
         {
@@ -300,6 +317,12 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id)
                         if (regionp)
                         {
                                 childSetText("sim_field", regionp->getName());
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+                                {
+                                        childSetText("sim_field", rlv_handler_t::cstrHiddenRegion);
+                                }
+// [/RLVa:KB]
                                 LLVector3d global_pos;
                                 global_pos.setVec(objectp->getPositionRegion());
                                 setPosBox(global_pos);
@@ -323,6 +346,12 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id)
                                         object_owner.append("Unknown");
                                 }
                                 childSetText("object_name", object_owner);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RVLa-1.0.0e
+                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                                {
+                                        childSetVisible("object_name", false);  // Hide the object name if the picked object represents an avataz
+                                }
+// [/RLVa:KB]
                                 childSetText("owner_name", object_owner);
                                 childSetText("abuser_name_edit", object_owner);
                                 mAbuserID = object_id;
@@ -595,6 +624,12 @@ LLFloaterReporter* LLFloaterReporter::createNewBugReporter()
 void LLFloaterReporter::setPickedObjectProperties(const std::string& object_name, const std::string& owner_name, const LLUUID owner_id)
 {
         childSetText("object_name", object_name);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RVLa-1.0.0e
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+        {
+                childSetVisible("object_name", true);   // Show the object name if the picked object is actually an object
+        }
+// [/RLVa:KB]
         childSetText("owner_name", owner_name);
         childSetText("abuser_name_edit", owner_name);
         mAbuserID = owner_id;
diff --git a/linden/indra/newview/llfloatersettingsdebug.cpp b/linden/indra/newview/llfloatersettingsdebug.cpp
index 2677467..2e414cb 100644
--- a/linden/indra/newview/llfloatersettingsdebug.cpp
+++ b/linden/indra/newview/llfloatersettingsdebug.cpp
@@ -40,6 +40,11 @@
 #include "llcolorswatch.h"
 #include "llviewercontrol.h"
 
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0g)
+#include "rlvhandler.h"
+#include "rlvextensions.h"
+// [/RLVa:KB]
+
 LLFloaterSettingsDebug* LLFloaterSettingsDebug::sInstance = NULL;
 
 LLFloaterSettingsDebug::LLFloaterSettingsDebug() : LLFloater(std::string("Configuration Editor"))
@@ -243,6 +248,32 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
 
         if (controlp)
         {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.1d
+                if (rlv_handler_t::isEnabled())
+                {
+                        // Don't allow changing DBG_WRITE debug settings under @setdebug=n
+                        bool fEnable = !( (gRlvHandler.hasBehaviour(RLV_BHVR_SETDEBUG)) && 
+                                (RlvExtGetSet::getDebugSettingFlags(controlp->getName()) & RlvExtGetSet::DBG_WRITE) );
+                        // Don't allow toggling "Basic Shaders" and/or "Atmopsheric Shaders" through the debug settings under @setenv=n
+                        fEnable &= !((gRlvHandler.hasBehaviour(RLV_BHVR_SETENV)) && 
+                                (("VertexShaderEnable" == controlp->getName()) || ("WindLightUseAtmosShaders" == controlp->getName())));
+                        #ifdef RLV_EXTENSION_STARTLOCATION
+                                // Don't allow toggling RestrainedLifeLoginLastLocation
+                                fEnable &= !(RLV_SETTING_LOGINLASTLOCATION == controlp->getName());
+                        #endif // RLV_EXTENSION_STARTLOCATION
+
+                        // NOTE: this runs per-frame so there's no need to explictly handle onCommitSettings() or onClickDefault()
+                        spinner1->setEnabled(fEnable);
+                        spinner2->setEnabled(fEnable);
+                        spinner3->setEnabled(fEnable);
+                        spinner4->setEnabled(fEnable);
+                        color_swatch->setEnabled(fEnable);
+                        childSetEnabled("val_text", fEnable);
+                        childSetEnabled("boolean_combo", fEnable);
+                        childSetEnabled("default_btn", fEnable);
+                }
+// [/RLVa:KB]
+
                 eControlType type = controlp->type();
 
                 //hide combo box only for non booleans, otherwise this will result in the combo box closing every frame
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index 7ec5da2..6597f9d 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -80,8 +80,8 @@
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
-S32 LLFloaterSnapshot::sUIWinHeightLong = 526 ;
-S32 LLFloaterSnapshot::sUIWinHeightShort = LLFloaterSnapshot::sUIWinHeightLong - 230 ;
+S32 LLFloaterSnapshot::sUIWinHeightLong = 546 ;
+S32 LLFloaterSnapshot::sUIWinHeightShort = LLFloaterSnapshot::sUIWinHeightLong - 250 ;
 S32 LLFloaterSnapshot::sUIWinWidth = 215 ;
 
 LLSnapshotFloaterView* gSnapshotFloaterView = NULL;
@@ -1272,9 +1272,6 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
 
         BOOL is_advance = gSavedSettings.getBOOL("AdvanceSnapshot");
         BOOL is_local = shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL;
-        BOOL show_slider = 
-                shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD
-                || (is_local && shot_format == LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG);
 
         floater->childSetVisible("more_btn", !is_advance); // the only item hidden in advanced mode
         floater->childSetVisible("less_btn",                            is_advance);
@@ -1287,17 +1284,22 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
         floater->childSetVisible("snapshot_height",                     is_advance);
         floater->childSetVisible("keep_aspect_check",           is_advance);
         floater->childSetVisible("ui_check",                            is_advance);
-        floater->childSetVisible("high_res_check",                      is_advance && is_local);
+        floater->childSetVisible("high_res_check",                      is_advance);
         floater->childSetVisible("hud_check",                           is_advance);
         floater->childSetVisible("keep_open_check",                     is_advance);
         floater->childSetVisible("freeze_frame_check",          is_advance);
         floater->childSetVisible("auto_snapshot_check",         is_advance);
-        floater->childSetVisible("image_quality_slider",        is_advance && show_slider);
+        floater->childSetVisible("image_quality_slider",        is_advance);
 
         LLSnapshotLivePreview* previewp = getPreviewView(floater);
         BOOL got_bytes = previewp && previewp->getDataSize() > 0;
         BOOL got_snap = previewp->getSnapshotUpToDate();
 
+        BOOL show_slider = 
+                shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD
+                || (is_local && shot_format == LLFloaterSnapshot::SNAPSHOT_FORMAT_JPEG);
+        floater->childSetEnabled("image_quality_slider", show_slider);
+
         floater->childSetEnabled("send_btn",   shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD && got_snap && previewp->getDataSize() <= MAX_POSTCARD_DATASIZE);
         floater->childSetEnabled("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE  && got_snap);
         floater->childSetEnabled("save_btn",   shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL    && got_snap);
@@ -2131,6 +2133,7 @@ void LLFloaterSnapshot::draw()
                                 childSetTextArg("file_size_label", "[SIZE]", getString("unknown"));
                                 childSetColor("file_size_label", gColors.getColor( "LabelTextColor" ));
                         }
+
                         childSetEnabled("upload_btn", previewp->getSnapshotUpToDate());
                         childSetEnabled("save_btn", previewp->getSnapshotUpToDate());
 
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 443f684..a37663e 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -663,6 +663,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
         if (mBtnLink) mBtnLink->setVisible( edit_visible );
         if (mBtnUnlink) mBtnUnlink->setVisible( edit_visible );
 
+        //TODO: Move these into llselectmgr
         // Check to see if we can link things
         bool can_link = false;
         if (!gSavedSettings.getBOOL("EditLinkedParts"))
@@ -685,14 +686,44 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
 
         // Check to see if we can unlink things
         bool can_unlink = false;
-        if (LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
-                LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
-                !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
+        if (tool != LLToolFace::getInstance())
         {
-                if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
-                        LLSelectMgr::getInstance()->getSelection()->getObjectCount())
+                if (LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
+                        LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
+                        !LLSelectMgr::getInstance()->getSelection()->isAttachment())
                 {
-                        can_unlink = true;
+                        // LL's viewer unlinks the last linkset selected, 
+                        // regardless of how many linksets or prims are selected total. 
+                        // Preserve that behavior when enabling the unlink option.  
+                        if (gSavedSettings.getBOOL("EditLinkedParts"))
+                        {
+                                struct f : public LLSelectedNodeFunctor
+                                {
+                                        virtual bool apply(LLSelectNode* pNode)
+                                        {
+                                                // Return the first selection node that is
+                                                //    1) not a root prim
+                                                //    2) or a root prim that has child prims
+                                                // or in other words: any prim that is part of a linkset
+                                                return (pNode->getObject() != pNode->getObject()->getRootEdit()) || 
+                                                                (pNode->getObject()->numChildren() != 0);
+                                        }
+                                } func;
+
+                                if (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(&func, TRUE))
+                                {
+                                        // the selection contains at least one prim (child or root) that is part of a linkset
+                                        can_unlink = true;
+                                }
+                        }
+                        else
+                        {
+                                if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
+                                        LLSelectMgr::getInstance()->getSelection()->getObjectCount())
+                                {
+                                        can_unlink = true;
+                                }
+                        }
                 }
         }
         mBtnUnlink->setEnabled(can_unlink);
@@ -1035,15 +1066,15 @@ void LLFloaterTools::onFocusReceived()
 
 void LLFloaterTools::updateTreeGrassCombo(bool visible)
 {
+        LLTextBox* tree_grass_label = getChild<LLTextBox>("tree_grass_label");
         if (visible) 
         {
                 LLPCode pcode = LLToolPlacer::getObjectType();
                 std::map<std::string, S32>::iterator it, end;
                 std::string selected;
-                LLTextBox* tree_grass_label = getChild<LLTextBox>("tree_grass_label");
                 if (pcode == LLToolPlacerPanel::sTree) 
                 {
-                        tree_grass_label->setVisible(true);
+                        tree_grass_label->setVisible(visible);
                         LLButton* button = getChild<LLButton>("ToolTree");
                         tree_grass_label->setText(button->getToolTip());
 
@@ -1053,7 +1084,7 @@ void LLFloaterTools::updateTreeGrassCombo(bool visible)
                 } 
                 else if (pcode == LLToolPlacerPanel::sGrass) 
                 {
-                        tree_grass_label->setVisible(true);
+                        tree_grass_label->setVisible(visible);
                         LLButton* button = getChild<LLButton>("ToolGrass");
                         tree_grass_label->setText(button->getToolTip());
 
@@ -1089,6 +1120,7 @@ void LLFloaterTools::updateTreeGrassCombo(bool visible)
         }
         
         mComboTreesGrass->setVisible(visible);
+        tree_grass_label->setVisible(visible);
 }
 
 // static
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index 1d78cb2..2bb3fb7 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -102,7 +102,6 @@ public:
         virtual void onFocusReceived();
         static void setEditTool(void* data);
         void saveLastTool();
-
 private:
         static void setObjectType( void* data );
         
diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index 730c139..32c2b75 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -169,7 +169,11 @@ void LLFloaterWater::initCallbacks(void) {
 
         LLTextureCtrl* textCtrl = getChild<LLTextureCtrl>("WaterNormalMap");
         textCtrl->setDefaultImageAssetID(DEFAULT_WATER_NORMAL);
-        childSetCommitCallback("WaterNormalMap", onNormalMapPicked, NULL);      
+        childSetCommitCallback("WaterNormalMap", onNormalMapPicked, NULL);
+
+        // next/prev buttons
+        childSetAction("next", onClickNext, this);
+        childSetAction("prev", onClickPrev, this);
 }
 
 void LLFloaterWater::onClickHelp(void* data)
@@ -234,6 +238,12 @@ void LLFloaterWater::syncMenu()
 
         LLWaterParamSet & current_params = param_mgr->mCurParams;
 
+        LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo");
+        if (comboBox->getSelectedItemLabel() != current_params.mName)
+        {
+                comboBox->setSimple(current_params.mName);
+        }
+
         // blue horizon
         param_mgr->mFogColor = current_params.getVector4(param_mgr->mFogColor.mName, err);
 
@@ -303,14 +313,26 @@ LLFloaterWater* LLFloaterWater::instance()
 }
 void LLFloaterWater::show()
 {
-        LLFloaterWater* water = instance();
-        water->syncMenu();
-
-        // comment in if you want the menu to rebuild each time
-        //LLUICtrlFactory::getInstance()->buildFloater(water, "floater_water.xml");
-        //water->initCallbacks();
+        if (!sWaterMenu)
+        {
+                LLFloaterWater* water = instance();
+                water->syncMenu();
 
-        water->open();
+                // comment in if you want the menu to rebuild each time
+                //LLUICtrlFactory::getInstance()->buildFloater(water, "floater_water.xml");
+                //water->initCallbacks();
+        }
+        else
+        {
+                if (sWaterMenu->getVisible())
+                {
+                        sWaterMenu->close();
+                }
+                else
+                {
+                        sWaterMenu->open();
+                }
+        }
 }
 
 bool LLFloaterWater::isOpen()
@@ -726,3 +748,50 @@ void LLFloaterWater::onChangePresetName(LLUICtrl* ctrl, void * userData)
         sWaterMenu->syncMenu();
 }
 
+void LLFloaterWater::onClickNext(void* user_data)
+{
+        LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
+        LLWaterParamSet& currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWaterParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the end, loop
+        std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+        if(mIt == last) 
+        {
+                mIt = param_mgr->mParamList.begin();
+        }
+        else
+        {
+                mIt++;
+        }
+        /*param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;*/
+        param_mgr->loadPreset(mIt->first, true);
+}
+
+void LLFloaterWater::onClickPrev(void* user_data)
+{
+        LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
+        LLWaterParamSet & currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWaterParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the beginning, loop
+        if(mIt == param_mgr->mParamList.begin()) 
+        {
+                std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+                mIt = last;
+        }
+        else
+        {
+                mIt--;
+        }
+        /*param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;*/
+        param_mgr->loadPreset(mIt->first, true);
+}
diff --git a/linden/indra/newview/llfloaterwater.h b/linden/indra/newview/llfloaterwater.h
index 774d5c5..f0944e1 100644
--- a/linden/indra/newview/llfloaterwater.h
+++ b/linden/indra/newview/llfloaterwater.h
@@ -128,6 +128,9 @@ private:
         static LLFloaterWater* sWaterMenu;
 
         static std::set<std::string> sDefaultPresets;
+
+        static void onClickNext(void* user_data);
+        static void onClickPrev(void* user_data);
 };
 
 
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 98b3157..5468ca4 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -47,6 +47,7 @@
 #include "llcombobox.h"
 #include "lllineeditor.h"
 #include "llfloaterdaycycle.h"
+#include "lltabcontainer.h"
 #include "llboost.h"
 
 #include "v4math.h"
@@ -61,6 +62,7 @@
 
 #undef max
 
+
 LLFloaterWindLight* LLFloaterWindLight::sWindLight = NULL;
 
 std::set<std::string> LLFloaterWindLight::sDefaultPresets;
@@ -228,6 +230,10 @@ void LLFloaterWindLight::initCallbacks(void) {
         // Dome
         childSetCommitCallback("WLGamma", onFloatControlMoved, &param_mgr->mWLGamma);
         childSetCommitCallback("WLStarAlpha", onStarAlphaMoved, NULL);
+
+        // next/prev buttons
+        childSetAction("next", onClickNext, this);
+        childSetAction("prev", onClickPrev, this);
 }
 
 void LLFloaterWindLight::onClickHelp(void* data)
@@ -314,6 +320,15 @@ void LLFloaterWindLight::syncMenu()
         LLWLParamSet& currentParams = param_mgr->mCurParams;
         //std::map<std::string, LLVector4> & currentParams = param_mgr->mCurParams.mParamValues;
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        // Fixes LL "bug" (preset name isn't kept synchronized)
+        LLComboBox* comboBox = getChild<LLComboBox>("WLPresetsCombo");
+        if (comboBox->getSelectedItemLabel() != currentParams.mName)
+        {
+                comboBox->setSimple(currentParams.mName);
+        }
+// [/RLVa:KB]
+
         // blue horizon
         param_mgr->mBlueHorizon = currentParams.getVector(param_mgr->mBlueHorizon.mName, err);
         childSetValue("WLBlueHorizonR", param_mgr->mBlueHorizon.r / 2.0);
@@ -451,14 +466,26 @@ LLFloaterWindLight* LLFloaterWindLight::instance()
 }
 void LLFloaterWindLight::show()
 {
-        LLFloaterWindLight* windLight = instance();
-        windLight->syncMenu();
-
-        // comment in if you want the menu to rebuild each time
-        //LLUICtrlFactory::getInstance()->buildFloater(windLight, "floater_windlight_options.xml");
-        //windLight->initCallbacks();
+        if (!sWindLight)
+        {
+                LLFloaterWindLight* windLight = instance();
+                windLight->syncMenu();
 
-        windLight->open();
+                // comment in if you want the menu to rebuild each time
+                //LLUICtrlFactory::getInstance()->buildFloater(windLight, "floater_windlight_options.xml");
+                //windLight->initCallbacks();
+        }
+        else
+        {
+                if (sWindLight->getVisible())
+                {
+                        sWindLight->close();
+                }
+                else
+                {
+                        sWindLight->open();
+                }
+        }
 }
 
 bool LLFloaterWindLight::isOpen()
@@ -993,3 +1020,61 @@ void LLFloaterWindLight::deactivateAnimator()
         LLWLParamManager::instance()->mAnimator.mIsRunning = false;
         LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
 }
+
+void LLFloaterWindLight::onClickNext(void* user_data)
+{
+        LLWLParamManager * param_mgr = LLWLParamManager::instance();
+        LLWLParamSet& currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWLParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the end, loop
+        std::map<std::string, LLWLParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+        if(mIt == last) 
+        {
+                mIt = param_mgr->mParamList.begin();
+        }
+        else
+        {
+                mIt++;
+        }
+        param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;
+        param_mgr->loadPreset(mIt->first, true);
+}
+
+void LLFloaterWindLight::onClickPrev(void* user_data)
+{
+        LLWLParamManager * param_mgr = LLWLParamManager::instance();
+        LLWLParamSet& currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWLParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the beginning, loop
+        if(mIt == param_mgr->mParamList.begin()) 
+        {
+                std::map<std::string, LLWLParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+                mIt = last;
+        }
+        else
+        {
+                mIt--;
+        }
+        param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;
+        param_mgr->loadPreset(mIt->first, true);
+}
+
+//static
+void LLFloaterWindLight::selectTab(std::string tab_name)
+{
+        if (!tab_name.empty())
+        {
+                LLTabContainer* tabs = LLFloaterWindLight::instance()->getChild<LLTabContainer>("WindLight Tabs");
+                tabs->selectTabByName(tab_name);
+        }
+}
diff --git a/linden/indra/newview/llfloaterwindlight.h b/linden/indra/newview/llfloaterwindlight.h
index 3447caa..23e3056 100644
--- a/linden/indra/newview/llfloaterwindlight.h
+++ b/linden/indra/newview/llfloaterwindlight.h
@@ -132,11 +132,16 @@ public:
         /// turn off animated skies
         static void deactivateAnimator();
 
+        static void selectTab(std::string tab_name);
+
 private:
         // one instance on the inside
         static LLFloaterWindLight* sWindLight;
 
         static std::set<std::string> sDefaultPresets;
+
+        static void onClickNext(void* user_data);
+        static void onClickPrev(void* user_data);
 };
 
 
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 213faf0..9257349 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -279,6 +279,13 @@ void LLFloaterWorldMap::onClose(bool app_quitting)
 // static
 void LLFloaterWorldMap::show(void*, BOOL center_on_target)
 {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0c)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP))
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         BOOL was_visible = gFloaterWorldMap->getVisible();
 
         gFloaterWorldMap->mIsClosing = FALSE;
@@ -326,6 +333,7 @@ void LLFloaterWorldMap::show(void*, BOOL center_on_target)
 
                 // If nothing is being tracked, set flag so the user position will be found
                 gFloaterWorldMap->mSetToUserPosition = ( LLTracker::getTrackingStatus() == LLTracker::TRACKING_NOTHING );
+
         }
         
         if (center_on_target)
@@ -452,7 +460,8 @@ void LLFloaterWorldMap::draw()
         childSetEnabled("Go Home", enable_go_home);
 
         updateLocation();
-        
+
+
         LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus(); 
         if (LLTracker::TRACKING_AVATAR == tracking_status)
         {
@@ -498,7 +507,6 @@ void LLFloaterWorldMap::draw()
                 centerOnTarget(TRUE);
         }
 
-        childSetEnabled("Teleport", (BOOL)tracking_status);
 //      childSetEnabled("Clear", (BOOL)tracking_status);
         childSetEnabled("Show Destination", (BOOL)tracking_status || LLWorldMap::getInstance()->mIsTrackingUnknownLocation);
         childSetEnabled("copy_slurl", (mSLURL.size() > 0) );
@@ -650,7 +658,10 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
         F32 region_x = (F32)fmod( pos_global.mdV[VX], (F64)REGION_WIDTH_METERS );
         F32 region_y = (F32)fmod( pos_global.mdV[VY], (F64)REGION_WIDTH_METERS );
         std::string full_name = llformat("%s (%d, %d, %d)", 
-                                                                  sim_name.c_str(), 
+//                                                                sim_name.c_str(), 
+// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a)
+                (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? sim_name.c_str() : rlv_handler_t::cstrHiddenRegion.c_str(),
+// [/RLVa:KB]
                                                                   llround(region_x), 
                                                                   llround(region_y),
                                                                   llround((F32)pos_global.mdV[VZ]));
@@ -704,6 +715,14 @@ void LLFloaterWorldMap::updateLocation()
 
                                 // Set the current SLURL
                                 mSLURL = LLURLDispatcher::buildSLURL(agent_sim_name, agent_x, agent_y, agent_z);
+
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                                {
+                                        childSetValue("location", rlv_handler_t::cstrHiddenRegion);
+                                        mSLURL.clear();
+                                }
+// [/RLVa:KB]
                         }
                 }
 
@@ -746,13 +765,21 @@ void LLFloaterWorldMap::updateLocation()
                 {       // Empty SLURL will disable the "Copy SLURL to clipboard" button
                         mSLURL = "";
                 }
+
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                {
+                        childSetValue("location", rlv_handler_t::cstrHiddenRegion);
+                        mSLURL.clear();
+                }
+// [/RLVa:KB]
         }
 }
 
 void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
 {
         LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name);
-        z_coord = llclamp(z_coord, 0, 4096);
+        z_coord = llclamp(z_coord, 0, 1000);
         if (sim_info)
         {
                 LLVector3 local_pos;
@@ -1062,6 +1089,7 @@ void LLFloaterWorldMap::onPanBtn( void* userdata )
 void LLFloaterWorldMap::onGoHome(void*)
 {
         gAgent.teleportHomeConfirm();
+        gFloaterWorldMap->close();
 }
 
 
diff --git a/linden/indra/newview/llfloaterworldmap.h b/linden/indra/newview/llfloaterworldmap.h
index b0e72f2..2153921 100644
--- a/linden/indra/newview/llfloaterworldmap.h
+++ b/linden/indra/newview/llfloaterworldmap.h
@@ -68,6 +68,8 @@ public:
         static void toggle(void*);
         static void hide(void*); 
 
+        static void addServer(const std::string& server);
+
         /*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE );
         /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
         /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
@@ -101,6 +103,7 @@ public:
         void                    clearLocationSelection(BOOL clear_ui = FALSE);
         void                    clearAvatarSelection(BOOL clear_ui = FALSE);
         void                    clearLandmarkSelection(BOOL clear_ui = FALSE);
+        void                    clearGridSelection(BOOL clear_ui = FALSE);
 
         // Adjust the maximally zoomed out limit of the zoom slider so you can
         // see the whole world, plus a little.
@@ -115,8 +118,9 @@ public:
 protected:
         static void             onPanBtn( void* userdata );
 
-        static void             onGoHome(void* data);
+        static void             onGridManager(void* data);
 
+        static void             onGoHome(void* data);
         static void             onLandmarkComboPrearrange( LLUICtrl* ctrl, void* data );
         static void             onLandmarkComboCommit( LLUICtrl* ctrl, void* data );
 
@@ -158,6 +162,7 @@ protected:
         static void             onLocationCommit( void* userdata );
         static void             onCommitLocation( LLUICtrl* ctrl, void* userdata );
         static void             onCommitSearchResult( LLUICtrl* ctrl, void* userdata );
+        static void             onSelectServer(LLUICtrl*, void* userdata);
 
         void                    cacheLandmarkPosition();
 
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 8e010b8..e87ac0c 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -282,7 +282,39 @@ void LLFolderViewItem::refreshFromListener()
 {
         if(mListener)
         {
+                //Super crazy hack to build the creator search label - RK
+                LLInventoryItem* item = gInventory.getItem(mListener->getUUID());
+                std::string creator_name;
+                if(item)
+                {
+                        if(item->getCreatorUUID().notNull())
+                        {
+                                gCacheName->getFullName(item->getCreatorUUID(), creator_name);
+                        }
+                }
+                mLabelCreator = creator_name;
+                /*if(creator_name == "(Loading...)")
+                        mLabelCreator = "";
+                else
+                        mLabelCreator = creator_name;*/
+                
+                //Label for desc search
+                std::string desc;
+                if(item)
+                {
+                        if(!item->getDescription().empty())
+                        {
+                                desc = item->getDescription();
+                        }
+                }
+                mLabelDesc = desc;
+
+                //Label for name search
                 mLabel = mListener->getDisplayName();
+
+                //Build label for combined search - RK
+                mLabelAll = mLabel + " " + mLabelCreator + " " + mLabelDesc;
+
                 setIcon(mListener->getIcon());
                 time_t creation_date = mListener->getCreationDate();
                 if (mCreationDate != creation_date)
@@ -300,20 +332,55 @@ void LLFolderViewItem::refresh()
         refreshFromListener();
         
         std::string searchable_label(mLabel);
+        std::string searchable_label_creator(mLabelCreator);
+        std::string searchable_label_desc(mLabelDesc);
+        std::string searchable_label_all(mLabelAll);
+
+        //add the (no modify), (no transfer) etc stuff to each label.
         searchable_label.append(mLabelSuffix);
+        searchable_label_creator.append(mLabelSuffix);
+        searchable_label_desc.append(mLabelSuffix);
+        searchable_label_all.append(mLabelSuffix);
+
+        //all labels need to be uppercase.
         LLStringUtil::toUpper(searchable_label);
+        LLStringUtil::toUpper(searchable_label_creator);
+        LLStringUtil::toUpper(searchable_label_desc);
+        LLStringUtil::toUpper(searchable_label_all);
 
-        if (mSearchableLabel.compare(searchable_label))
+        if (mSearchableLabel.compare(searchable_label) ||
+                mSearchableLabelCreator.compare(searchable_label_creator) ||
+                mSearchableLabelDesc.compare(searchable_label_creator))
         {
                 mSearchableLabel.assign(searchable_label);
+                mSearchableLabelCreator.assign(searchable_label_creator);
+                mSearchableLabelDesc.assign(searchable_label_desc);
+                mSearchableLabelAll.assign(searchable_label_all);
+
                 dirtyFilter();
-                // some part of label has changed, so overall width has potentially changed
+                //some part of label has changed, so overall width has potentially changed
                 if (mParentFolder)
-                {
                         mParentFolder->requestArrange();
-                }
+        }
+        
+        /*if(mSearchableLabelCreator.compare(searchable_label_creator))
+        {
+                mSearchableLabelCreator.assign(searchable_label_creator);
+
+                dirtyFilter();
+                if(mParentFolder)
+                        mParentFolder->requestArrange();
         }
 
+        if(mSearchableLabelDesc.compare(searchable_label_desc))
+        {
+                mSearchableLabelDesc.assign(searchable_label_desc);
+
+                dirtyFilter();
+                if(mParentFolder)
+                        mParentFolder->requestArrange();
+        }*/
+
         S32 label_width = sFont->getWidth(mLabel);
         if( mLabelSuffix.size() )   
         {   
@@ -587,9 +654,16 @@ void LLFolderViewItem::rename(const std::string& new_name)
         }
 }
 
-const std::string& LLFolderViewItem::getSearchableLabel() const
+const std::string& LLFolderViewItem::getSearchableLabel(U32 search_type = 0) const
 {
-        return mSearchableLabel;
+        if(search_type == 3)
+                return mSearchableLabelAll;
+        else if(search_type == 2)
+                return mSearchableLabelDesc;
+        else if(search_type == 1)
+                return mSearchableLabelCreator;
+        else
+                return mSearchableLabel;
 }
 
 const std::string& LLFolderViewItem::getName( void ) const
@@ -4524,11 +4598,13 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
         }
         LLFolderViewEventListener* listener = item->getListener();
         const LLUUID& item_id = listener->getUUID();
-        mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos;
+
+        U32 search_type = gSavedSettings.getU32("InventorySearchType");
+        mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel(search_type).find(mFilterSubString) : std::string::npos;
         BOOL passed = (listener->getNInventoryType() & mFilterOps.mFilterTypes || listener->getNInventoryType() == LLInventoryType::NIT_NONE)
                                         && (mFilterSubString.size() == 0 || mSubStringMatchOffset != std::string::npos)
                                         && (mFilterWorn == false || gAgent.isWearingItem(item_id) ||
-                                                gAgent.getAvatarObject() && gAgent.getAvatarObject()->isWearingAttachment(item_id))
+                                                (gAgent.getAvatarObject() && gAgent.getAvatarObject()->isWearingAttachment(item_id)))
                                         && ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions)
                                         && (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate);
         return passed;
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index b46b5c8..5e6902d 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -339,6 +339,16 @@ protected:
 
         std::string                                     mLabel;
         std::string                                     mSearchableLabel;
+
+        std::string                                     mLabelCreator;
+        std::string                                     mSearchableLabelCreator;
+
+        std::string                                     mLabelDesc;
+        std::string                                     mSearchableLabelDesc;
+
+        std::string                                     mLabelAll;
+        std::string                                     mSearchableLabelAll;
+
         std::string                                     mType;
         S32                                                     mLabelWidth;
         U32                                                     mCreationDate;
@@ -465,7 +475,7 @@ public:
         // viewed. This method will ask the viewed object itself.
         const std::string& getName( void ) const;
 
-        const std::string& getSearchableLabel( void ) const;
+        const std::string& getSearchableLabel( U32 search_type ) const;
 
         // This method returns the label displayed on the view. This
         // method was primarily added to allow sorting on the folder
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index 91beb80..7213e24 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -167,6 +167,13 @@ extern BOOL gDebugSelect;
 // Returns true if you got at least one object
 void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT))
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLVector3 av_pos = gAgent.getPositionAgent();
         F32 select_dist_squared = gSavedSettings.getF32("MaxSelectDistance");
         select_dist_squared = select_dist_squared * select_dist_squared;
@@ -231,6 +238,27 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
                 LLViewerCamera::getInstance()->setFar(new_far);
                 LLViewerCamera::getInstance()->setNear(new_near);
         }
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH))
+        {
+                // We'll allow drag selection under fartouch, but only within the fartouch range
+                // (just copy/paste the code above us to make that work, thank you Lindens!)
+                LLVector3 relative_av_pos = av_pos;
+                relative_av_pos -= LLViewerCamera::getInstance()->getOrigin();
+
+                F32 new_far = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() + 1.5f;
+                F32 new_near = relative_av_pos * LLViewerCamera::getInstance()->getAtAxis() - 1.5f;
+
+                new_near = llmax(new_near, 0.1f);
+
+                LLViewerCamera::getInstance()->setFar(new_far);
+                LLViewerCamera::getInstance()->setNear(new_near);
+
+                // Usurp these two
+                limit_select_distance = TRUE;
+                select_dist_squared = 1.5f * 1.5f;
+        }
+// [/RLVa:KB]
         LLViewerCamera::getInstance()->setPerspective(FOR_SELECTION, 
                                                         center_x-width/2, center_y-height/2, width, height, 
                                                         limit_select_distance);
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index dd2b562..44ef594 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -245,14 +245,25 @@ void LLHoverView::updateText()
                         LLNameValue* lastname =  hit_object->getNVPair("LastName");
                         if (firstname && lastname)
                         {
-                                if (title)
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
                                 {
-                                        line.append(title->getString());
+                                        line = gRlvHandler.getAnonym(line.append(firstname->getString()).append(1, ' ').append(lastname->getString()));
+                                }
+                                else
+                                {
+// [/RLVa:KB]
+                                        if (title)
+                                        {
+                                                line.append(title->getString());
+                                                line.append(1, ' ');
+                                        }
+                                        line.append(firstname->getString());
                                         line.append(1, ' ');
+                                        line.append(lastname->getString());
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
                                 }
-                                line.append(firstname->getString());
-                                line.append(1, ' ');
-                                line.append(lastname->getString());
+// [/RLVa:KB]
                         }
                         else
                         {
@@ -308,6 +319,13 @@ void LLHoverView::updateText()
                                                 }
                                                 else if(gCacheName->getFullName(owner, name))
                                                 {
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                                                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                                                        {
+                                                                name = gRlvHandler.getAnonym(name);
+                                                        }
+// [/RLVa:KB]
+
                                                         line.append(name);
                                                 }
                                                 else
@@ -469,7 +487,10 @@ void LLHoverView::updateText()
                 line.append(LLTrans::getString("TooltipLand"));
                 if (hover_parcel)
                 {
-                        line.append(hover_parcel->getName());
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-0.2.0b
+                        line.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? hover_parcel->getName() : rlv_handler_t::cstrHiddenParcel );
+// [/RLVa:KB]
+                        //line.append(hover_parcel->getName());
                 }
                 mText.push_back(line);
 
@@ -498,7 +519,10 @@ void LLHoverView::updateText()
                         }
                         else if(gCacheName->getFullName(owner, name))
                         {
-                                line.append(name);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
+                                line.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? name : gRlvHandler.getAnonym(name));
+// [/RLVa:KB]
+                                //line.append(name);
                         }
                         else
                         {
diff --git a/linden/indra/newview/llhudtext.cpp b/linden/indra/newview/llhudtext.cpp
index 2014007..661a786 100644
--- a/linden/indra/newview/llhudtext.cpp
+++ b/linden/indra/newview/llhudtext.cpp
@@ -566,6 +566,30 @@ void LLHUDText::renderText(BOOL for_select)
 
 void LLHUDText::setStringUTF8(const std::string &wtext)
 {
+// [RLVa:KB] - Checked: 2009-07-09 (RLVa-1.0.0f)
+        // NOTE: setString() is only called for debug beacons and the floating name tags (which we don't want to censor
+        //       because you'd see "(Region hidden) LastName" if you happen to go to a sim who's name is your first name :p
+        if (rlv_handler_t::isEnabled())
+        {
+                std::string text(wtext);
+
+                if (gRlvHandler.canShowHoverText(mSourceObject))
+                {
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                                gRlvHandler.filterLocation(text);
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                                gRlvHandler.filterNames(text);
+                }
+                else
+                {
+                        text = "";
+                }
+
+                setString(utf8str_to_wstring(text));
+                return;
+        }
+// [/RLVa:KB]
+
         setString(utf8str_to_wstring(wtext));
 }
 
@@ -1161,3 +1185,18 @@ F32 LLHUDText::LLHUDTextSegment::getWidth(const LLFontGL* font)
                 return width;
         }
 }
+
+// [RLVa:KB] - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+void LLHUDText::refreshAllObjectText()
+{
+        for (TextObjectIterator itText = sTextObjects.begin(); itText != sTextObjects.end(); itText++)
+        {
+                LLHUDText* pText = *itText;
+                if ( (pText) && (!pText->mObjText.empty() && ("" != pText->mObjText) ) && 
+                         (pText->mSourceObject) && (LL_PCODE_VOLUME == pText->mSourceObject->getPCode()) )
+                {
+                        pText->setStringUTF8(pText->mObjText);
+                }
+        }
+}
+// [/RLVa:KB]
diff --git a/linden/indra/newview/llhudtext.h b/linden/indra/newview/llhudtext.h
index 645cbc2..297e4d5 100644
--- a/linden/indra/newview/llhudtext.h
+++ b/linden/indra/newview/llhudtext.h
@@ -131,6 +131,11 @@ public:
         static void addPickable(std::set<LLViewerObject*> &pick_list);
         static void reshape();
         static void setDisplayText(BOOL flag) { sDisplayText = flag ; }
+// [RLVa:KB] - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+        const std::string& getObjectText() const                                                { return mObjText; }
+        void               setObjectText(const std::string &utf8string) { mObjText = utf8string; }
+        static void        refreshAllObjectText();
+// [/RLVa:KB]
 protected:
         LLHUDText(const U8 type);
 
@@ -176,6 +181,9 @@ private:
         EVertAlignment  mVertAlignment;
         S32                             mLOD;
         BOOL                    mHidden;
+// [RLVa:KB] - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+        std::string     mObjText;
+// [/RLVa:KB]
 
         static BOOL    sDisplayText ;
         static std::set<LLPointer<LLHUDText> > sTextObjects;
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 63d7907..9368e4e 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -74,6 +74,7 @@
 #include "llhttpclient.h"
 #include "llmutelist.h"
 #include "llstylemap.h"
+#include <sys/stat.h>
 
 //
 // Constants
@@ -1279,6 +1280,10 @@ BOOL LLFloaterIMPanel::postBuild()
         requires<LLLineEditor>("chat_editor");
         requires<LLTextEditor>("im_history");
 
+#if LL_LINUX || LL_DARWIN
+        childSetVisible("history_btn", false);
+#endif
+
         if (checkRequirements())
         {
                 mInputEditor = getChild<LLLineEditor>("chat_editor");
@@ -1293,6 +1298,7 @@ BOOL LLFloaterIMPanel::postBuild()
 
                 childSetAction("profile_callee_btn", onClickProfile, this);
                 childSetAction("group_info_btn", onClickGroupInfo, this);
+                childSetAction("history_btn", onClickHistory, this);
 
                 childSetAction("start_call_btn", onClickStartCall, this);
                 childSetAction("end_call_btn", onClickEndCall, this);
@@ -1806,6 +1812,41 @@ void LLFloaterIMPanel::onClickProfile( void* userdata )
 }
 
 // static
+void LLFloaterIMPanel::onClickHistory( void* userdata )
+{
+        LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
+        
+        if (self->mOtherParticipantUUID.notNull())
+        {
+                struct stat fileInfo;
+                int result;
+                
+                std::string fullname = self->getTitle();;
+                //gCacheName->getFullName(self->mOtherParticipantUUID, fullname);
+                //if(fullname == "(Loading...)")
+                std::string file_path = gDirUtilp->getPerAccountChatLogsDir() + "\\" + fullname + ".txt";
+
+                // check if file exists by trying to get its attributes
+                result = stat(file_path.c_str(), &fileInfo);
+                if(result == 0)
+                {
+                        char command[256];
+                        sprintf(command, "\"%s\\%s.txt\"", gDirUtilp->getPerAccountChatLogsDir().c_str(),fullname.c_str());
+                        gViewerWindow->getWindow()->ShellEx(command);
+
+                        llinfos << command << llendl;
+                }
+                else
+                {
+                        LLStringUtil::format_map_t args;
+                        args["[NAME]"] = fullname;
+                        gViewerWindow->alertXml("IMLogNotFound", args);
+                        llinfos << file_path << llendl;
+                }
+        }
+}
+
+// static
 void LLFloaterIMPanel::onClickGroupInfo( void* userdata )
 {
         //  Bring up the Profile window
@@ -2015,6 +2056,42 @@ void LLFloaterIMPanel::sendMsg()
                         std::string utf8_text = wstring_to_utf8str(text);
                         utf8_text = utf8str_truncate(utf8_text, MAX_MSG_BUF_SIZE - 1);
                         
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-1.0.0g
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM))
+                        {
+                                if (IM_NOTHING_SPECIAL == mDialog)                      // One-on-one IM: allow if recipient is a sendim exception
+                                {
+                                        if (!gRlvHandler.isException(RLV_BHVR_SENDIM, mOtherParticipantUUID))
+                                                utf8_text = rlv_handler_t::cstrBlockedSendIM;
+                                }
+                                else if (gAgent.isInGroup(mSessionUUID))        // Group chat: allow if recipient is a sendim exception
+                                {
+                                        if (!gRlvHandler.isException(RLV_BHVR_SENDIM, mSessionUUID))
+                                                utf8_text = rlv_handler_t::cstrBlockedSendIM;
+                                }
+                                else if (mSpeakers)                                                     // Conference chat: allow if all participants are sendim exceptions
+                                {
+                                        LLSpeakerMgr::speaker_list_t speakers;
+                                        mSpeakers->getSpeakerList(&speakers, TRUE);
+
+                                        for (LLSpeakerMgr::speaker_list_t::const_iterator itSpeaker = speakers.begin(); 
+                                                        itSpeaker != speakers.end(); ++itSpeaker)
+                                        {
+                                                LLSpeaker* pSpeaker = *itSpeaker;
+                                                if ( (gAgent.getID() != pSpeaker->mID) && (!gRlvHandler.isException(RLV_BHVR_SENDIM, pSpeaker->mID)) )
+                                                {
+                                                        utf8_text = rlv_handler_t::cstrBlockedSendIM;
+                                                        break;
+                                                }
+                                        }
+                                }
+                                else                                                                            // Catch all fall-through
+                                {
+                                        utf8_text = rlv_handler_t::cstrBlockedSendIM;
+                                }
+                        }
+// [/RLVa:KB]
+
                         if ( mSessionInitialized )
                         {
                                 deliver_message(utf8_text,
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index 90cab61..f3477bb 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -231,6 +231,7 @@ public:
         static void             onTabClick( void* userdata );
 
         static void             onClickProfile( void* userdata );
+        static void             onClickHistory( void* userdata );
         static void             onClickGroupInfo( void* userdata );
         static void             onClickOfferTeleport( void* userdata );
         static void             onClickClose( void* userdata );
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index 08e274b..790e20b 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -1515,6 +1515,19 @@ public:
                         {
                                 return;
                         }
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                        // TODO-RLVa: duplicate from process_improved_im()?
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM))
+                        {
+                                if (gAgent.isInGroup(session_id))
+                                {
+                                        if (!gRlvHandler.isException(RLV_BHVR_RECVIM, session_id))
+                                                return;
+                                }
+                                else if (!gRlvHandler.isException(RLV_BHVR_RECVIM, from_id))
+                                        message = message.substr(0, message_offset) + rlv_handler_t::cstrBlockedRecvIM;
+                        }
+// [/RLVa:KB]
 
                         // standard message, not from system
                         std::string saved;
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index 083ec7c..d7af8d1 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -86,6 +86,9 @@
 #include "lluictrlfactory.h"
 #include "llselectmgr.h"
 
+// Defined in llinventorybridge.cpp
+void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove);
+
 const std::string NEW_LSL_NAME = "New Script"; // *TODO:Translate? (probably not)
 const std::string NEW_NOTECARD_NAME = "New Note"; // *TODO:Translate? (probably not)
 const std::string NEW_GESTURE_NAME = "New Gesture"; // *TODO:Translate? (probably not)
@@ -116,6 +119,12 @@ bool doToSelected(LLFolderView* folder, std::string action)
         std::set<LLUUID> selected_items;
         folder->getSelectionList(selected_items);
 
+        if ( ("attach" == action) && (selected_items.size() > 1) )
+        {
+                wear_attachments_on_avatar(selected_items, FALSE);
+                return true;
+        }
+
         LLMultiPreview* multi_previewp = NULL;
         LLMultiProperties* multi_propertiesp = NULL;
 
@@ -467,6 +476,56 @@ class LLDoCreateFloater : public inventory_listener_t
         }
 };
 
+//Handles the search type buttons
+class SetSearchType : public inventory_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string search_type = userdata.asString();
+                if(search_type == "name")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 0);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(TRUE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE); 
+                        mPtr->getControl("Inventory.SearchByDesc")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(FALSE);
+                }
+                else if(search_type == "creator")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 1);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(TRUE);
+                        mPtr->getControl("Inventory.SearchByDesc")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(FALSE);
+                }
+                else if(search_type == "desc")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 2);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByDesc")->setValue(TRUE);
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(FALSE);
+                }
+                else if(search_type == "all")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 3);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByDesc")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(TRUE);
+                }
+                
+                //Clear search when switching modes.
+                mPtr->getActivePanel()->setFilterSubString(LLStringUtil::null);
+                mPtr->getActivePanel()->setFilterTypes(LLInventoryType::NIT_ALL);
+        return true;
+        }
+};
+
 class LLSetSortBy : public inventory_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -714,6 +773,8 @@ void init_inventory_actions(LLInventoryView *floater)
         (new LLShowFilters())->registerListener(floater, "Inventory.ShowFilters");
         (new LLResetFilter())->registerListener(floater, "Inventory.ResetFilter");
         (new LLSetSortBy())->registerListener(floater, "Inventory.SetSortBy");
+        
+        (new SetSearchType())->registerListener(floater, "Inventory.SetSearchBy");
 }
 
 void init_inventory_panel_actions(LLInventoryPanel *panel)
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index cd38185..5a4fad7 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -112,6 +112,8 @@ void remove_inventory_category_from_avatar(LLInventoryCategory* category);
 void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata);
 bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, LLMoveInv*);
 bool confirm_replace_attachment_rez(const LLSD& notification, const LLSD& response);
+void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove);
+void wear_attachments_on_avatar(const LLInventoryModel::item_array_t& items, BOOL remove);
 
 std::string ICON_NAME[ICON_NAME_COUNT] =
 {
@@ -1944,6 +1946,12 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
         LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
         LLUUID lost_and_found_id = model->findCategoryUUIDForType(LLAssetType::AT_LOST_AND_FOUND);
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        // Fixes LL bug
+        mItems.clear();
+        mDisabledItems.clear();
+// [/RLVa:KB]
+
         if (lost_and_found_id == mUUID)
           {
                 // This is the lost+found folder.
@@ -2965,6 +2973,13 @@ void open_notecard(LLViewerInventoryItem* inv_item,
                                    const LLUUID& source_id,
                                    BOOL take_focus)
 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         // See if we can bring an existing preview to the front
         if(!LLPreview::show(inv_item->getUUID(), take_focus))
         {
@@ -3290,7 +3305,14 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model
                 item = (LLViewerInventoryItem*)gInventory.getItem(object_id);
                 if(item && gInventory.isObjectDescendentOf(object_id, gAgent.getInventoryRootID()))
                 {
-                        rez_attachment(item, NULL);
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                        // User picked "Wear" so either nothing is locked, or we need to look up the specific attach point from its name
+                        // (NOTE: rez_attachment will take care of deciding whether or not we *can* attach)
+                        rez_attachment(item, 
+                                ((!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment()) || (RlvSettings::getEnableWear()))
+                                        ? NULL : gRlvHandler.getAttachPoint(item, true));
+// [/RLVa:KB]
+//                      rez_attachment(item, NULL);
                 }
                 else if(item && item->isComplete())
                 {
@@ -3309,6 +3331,15 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model
         else if ("detach" == action)
         {
                 LLInventoryItem* item = gInventory.getItem(mUUID);
+
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                // Fall-through: if there's a "Detach from yourself" code path we missed then we'll still disallow the detach here
+                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(item)) )
+                {
+                        return;
+                }
+// [/RLVa:KB]
+
                 if( item )
                 {
                         gMessageSystem->newMessageFast(_PREHASH_DetachAttachmentIntoInv);
@@ -3472,6 +3503,11 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                         if( avatarp->isWearingAttachment( mUUID ) )
                         {
                                 items.push_back(std::string("Detach From Yourself"));
+
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(item)) )
+                                        disabled_items.push_back(std::string("Detach From Yourself"));
+// [/RLVa:KB]
                         }
                         else
                         if( !isInTrash() )
@@ -3483,6 +3519,16 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                                 items.push_back(std::string("RestoreToWorld Separator"));
                                 items.push_back(std::string("Restore to Last Position"));
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0c
+                                // Only enable "Wear" if there is an attach point name *and* there isn't a worn attachment there that's currently locked
+                                if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getEnableWear()) && (gRlvHandler.hasLockedAttachment()) )
+                                {
+                                        LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(item, true);
+                                        if ( (!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt)) )
+                                                disabled_items.push_back(std::string("Object Wear"));
+                                }
+// [/RLVa:KB]
+
                                 LLMenuGL* attach_menu = menu.getChildMenuByName("Attach To", TRUE);
                                 LLMenuGL* attach_hud_menu = menu.getChildMenuByName("Attach To HUD", TRUE);
                                 LLVOAvatar *avatarp = gAgent.getAvatarObject();
@@ -3498,15 +3544,27 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                                                 LLMenuItemCallGL *new_item;
                                                 if (attachment->getIsHUDAttachment())
                                                 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
                                                         attach_hud_menu->append(new_item = new LLMenuItemCallGL(attachment->getName(), 
                                                                 NULL, //&LLObjectBridge::attachToAvatar, 
-                                                                NULL, &attach_label, (void*)attachment));
+                                                                (rlv_handler_t::isEnabled()) ? &rlvAttachToEnabler : NULL,
+                                                                &attach_label, (void*)attachment));
+// [/RLVa:KB]
+                                                        //attach_hud_menu->append(new_item = new LLMenuItemCallGL(attachment->getName(), 
+                                                        //      NULL, //&LLObjectBridge::attachToAvatar, 
+                                                        //      NULL, &attach_label, (void*)attachment));
                                                 }
                                                 else
                                                 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
                                                         attach_menu->append(new_item = new LLMenuItemCallGL(attachment->getName(), 
                                                                 NULL, //&LLObjectBridge::attachToAvatar,
-                                                                NULL, &attach_label, (void*)attachment));
+                                                                (rlv_handler_t::isEnabled()) ? &rlvAttachToEnabler : NULL,
+                                                                &attach_label, (void*)attachment));
+// [/RLVa:KB]
+                                                        //attach_menu->append(new_item = new LLMenuItemCallGL(attachment->getName(), 
+                                                        //      NULL, //&LLObjectBridge::attachToAvatar,
+                                                        //      NULL, &attach_label, (void*)attachment));
                                                 }
 
                                                 LLSimpleListener* callback = mInventoryPanel->getListenerByName("Inventory.AttachObject");
@@ -3703,6 +3761,31 @@ private:
         bool mAppend;
 };
 
+class LLWearAttachmentsCallback : public LLInventoryCallback
+{
+public:
+        LLWearAttachmentsCallback(bool append) : mAppend(append) {}
+        void fire(const LLUUID& item_id)
+        {
+                mItemIDs.insert(item_id);
+        }
+protected:
+        ~LLWearAttachmentsCallback()
+        {
+                if( LLInventoryCallbackManager::is_instantiated() )
+                {
+                        wear_attachments_on_avatar(mItemIDs, mAppend);
+                }
+                else
+                {
+                        llwarns << "Dropping unhandled LLWearAttachments" << llendl;
+                }
+        }
+private:
+        std::set<LLUUID> mItemIDs;
+        bool mAppend;
+};
+
 void LLOutfitObserver::done()
 {
         // We now have an outfit ready to be copied to agent inventory. Do
@@ -3986,6 +4069,20 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
                                                                                 is_gesture);
                 S32 gest_count = gest_item_array.count();
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-1.0.0c
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) && (!RlvSettings::getEnableWear()) )
+                {
+                        // Filter anything that doesn't specify an attachment point (or that specifies one that's currently locked)
+                        for (S32 idxObj = obj_item_array.count() - 1; idxObj >= 0; idxObj--)
+                        {
+                                LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(obj_item_array.get(idxObj).get(), true);
+                                if ( ((!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt))) )
+                                        obj_item_array.remove(idxObj);
+                        }
+                        obj_count = obj_item_array.count();
+                }
+// [/RLVa:KB]
+
                 if( !wearable_count && !obj_count && !gest_count)
                 {
                         LLNotifications::instance().add("CouldNotPutOnOutfit");
@@ -4058,57 +4155,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
                 if( obj_count > 0 )
                 {
                         // We've found some attachements.  Add these.
-
-                        LLVOAvatar* avatar = gAgent.getAvatarObject();
-                        if( avatar )
-                        {
-                                // Build a compound message to send all the objects that need to be rezzed.
-
-                                // Limit number of packets to send
-                                const S32 MAX_PACKETS_TO_SEND = 10;
-                                const S32 OBJECTS_PER_PACKET = 4;
-                                const S32 MAX_OBJECTS_TO_SEND = MAX_PACKETS_TO_SEND * OBJECTS_PER_PACKET;
-                                if( obj_count > MAX_OBJECTS_TO_SEND )
-                                {
-                                        obj_count = MAX_OBJECTS_TO_SEND;
-                                }
-                                
-                                // Create an id to keep the parts of the compound message together
-                                LLUUID compound_msg_id;
-                                compound_msg_id.generate();
-                                LLMessageSystem* msg = gMessageSystem;
-
-                                for(i = 0; i < obj_count; ++i)
-                                {
-                                        if( 0 == (i % OBJECTS_PER_PACKET) )
-                                        {
-                                                // Start a new message chunk
-                                                msg->newMessageFast(_PREHASH_RezMultipleAttachmentsFromInv);
-                                                msg->nextBlockFast(_PREHASH_AgentData);
-                                                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                                                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                                                msg->nextBlockFast(_PREHASH_HeaderData);
-                                                msg->addUUIDFast(_PREHASH_CompoundMsgID, compound_msg_id );
-                                                msg->addU8Fast(_PREHASH_TotalObjects, obj_count );
-                                                msg->addBOOLFast(_PREHASH_FirstDetachAll, !wear_info->mAppend );
-                                        }
-
-                                        LLInventoryItem* item = obj_item_array.get(i);
-                                        msg->nextBlockFast(_PREHASH_ObjectData );
-                                        msg->addUUIDFast(_PREHASH_ItemID, item->getUUID() );
-                                        msg->addUUIDFast(_PREHASH_OwnerID, item->getPermissions().getOwner());
-                                        msg->addU8Fast(_PREHASH_AttachmentPt, 0 );      // Wear at the previous or default attachment point
-                                        pack_permissions_slam(msg, item->getFlags(), item->getPermissions());
-                                        msg->addStringFast(_PREHASH_Name, item->getName());
-                                        msg->addStringFast(_PREHASH_Description, item->getDescription());
-
-                                        if( (i+1 == obj_count) || ((OBJECTS_PER_PACKET-1) == (i % OBJECTS_PER_PACKET)) )
-                                        {
-                                                // End of message chunk
-                                                msg->sendReliable( gAgent.getRegion()->getHost() );
-                                        }
-                                }
-                        }
+                        wear_attachments_on_avatar(obj_item_array, !wear_info->mAppend);
                 }
         }
         delete wear_info;
@@ -4173,6 +4220,13 @@ void wear_inventory_category_on_avatar_step3(LLWearableHoldingPattern* holder, B
 //                                              item->setAssetUUID(wearable->getID());
 //                                              item->updateAssetOnServer();
 //                                      }
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-1.0.0c
+                                        if ( (!gRlvHandler.isWearable(wearable->getType())) ||
+                                                 ( (!gRlvHandler.isRemovable(wearable->getType())) && (gAgent.getWearable(wearable->getType())) ) )
+                                        {
+                                                continue;
+                                        }
+// [/RLVa:KB]
                                         items.put(item);
                                         wearables.put(wearable);
                                 }
@@ -4192,6 +4246,117 @@ void wear_inventory_category_on_avatar_step3(LLWearableHoldingPattern* holder, B
         dec_busy_count();
 }
 
+void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove)
+{
+        // NOTE: the inventory items can reside in the user's inventory, the library, or any combination of the two
+
+        LLInventoryModel::item_array_t items;
+        LLPointer<LLInventoryCallback> cb;
+
+        for (std::set<LLUUID>::const_iterator it = item_ids.begin(); it != item_ids.end(); ++it)
+        {
+                LLViewerInventoryItem* item = gInventory.getItem(*it);
+                if ( (item) && (LLAssetType::AT_OBJECT == item->getType()) )
+                {
+                        if ( (gInventory.isObjectDescendentOf(*it, gAgent.getInventoryRootID())) )
+                        {
+//                              items.put(item);
+// [RLVa:KB] - Checked: 2009-09-11 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
+                                LLViewerJointAttachment* pAttachPt = NULL;
+                                if ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) || 
+                                         (((pAttachPt = gRlvHandler.getAttachPoint(item, true)) != NULL) && (gRlvHandler.isDetachable(pAttachPt))) )
+                                {
+                                        items.put(item);
+                                }
+// [/RLVa:KB]
+                        }
+                        else if ( (item->isComplete()) )
+                        {
+                                if (cb.isNull())
+                                        cb = new LLWearAttachmentsCallback(remove);
+                                copy_inventory_item(gAgent.getID(), item->getPermissions().getOwner(), item->getUUID(), LLUUID::null, std::string(), cb);
+                        }
+                }
+        }
+
+        wear_attachments_on_avatar(items, remove);
+}
+
+void wear_attachments_on_avatar(const LLInventoryModel::item_array_t& items, BOOL remove)
+{
+        // NOTE: all inventory items must reside in the user's inventory
+
+        LLVOAvatar* avatarp = gAgent.getAvatarObject();
+        if(!avatarp)
+        {
+                llwarns << "No avatar found." << llendl;
+                return;
+        }
+
+        // Build a compound message to send all the objects that need to be rezzed.
+
+        // Limit number of packets to send
+        const S32 MAX_PACKETS_TO_SEND = 10;
+        const S32 OBJECTS_PER_PACKET = 4;
+        const S32 MAX_OBJECTS_TO_SEND = MAX_PACKETS_TO_SEND * OBJECTS_PER_PACKET;
+
+        S32 count = items.count();
+        if ( !count )
+        {
+                return;
+        }
+        else if ( count > MAX_OBJECTS_TO_SEND )
+        {
+                count = MAX_OBJECTS_TO_SEND;
+        }
+        
+        // Create an id to keep the parts of the compound message together
+        LLUUID compound_msg_id;
+        compound_msg_id.generate();
+        LLMessageSystem* msg = gMessageSystem;
+
+        for(S32 i = 0; i < count; ++i)
+        {
+                if( 0 == (i % OBJECTS_PER_PACKET) )
+                {
+                        // Start a new message chunk
+                        msg->newMessageFast(_PREHASH_RezMultipleAttachmentsFromInv);
+                        msg->nextBlockFast(_PREHASH_AgentData);
+                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                        msg->nextBlockFast(_PREHASH_HeaderData);
+                        msg->addUUIDFast(_PREHASH_CompoundMsgID, compound_msg_id );
+                        msg->addU8Fast(_PREHASH_TotalObjects, count );
+//                      msg->addBOOLFast(_PREHASH_FirstDetachAll, remove );
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.2a
+                                // This really should just *always* be FALSE since TRUE can result in loss of the current asset state
+                                msg->addBOOLFast(_PREHASH_FirstDetachAll, remove && (!gRlvHandler.hasLockedAttachment()) );
+// [/RLVa:KB]
+                        }
+
+                LLInventoryItem* item = items.get(i);
+                msg->nextBlockFast(_PREHASH_ObjectData );
+                msg->addUUIDFast(_PREHASH_ItemID, item->getUUID() );
+                msg->addUUIDFast(_PREHASH_OwnerID, item->getPermissions().getOwner());
+//              msg->addU8Fast(_PREHASH_AttachmentPt, 0 );      // Wear at the previous or default attachment point
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.2a
+                        msg->addU8Fast(_PREHASH_AttachmentPt, 
+                                ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) )
+                                        ? 0
+                                        : gRlvHandler.getAttachPointIndex(gRlvHandler.getAttachPoint(item, true)));
+// [/RLVa:KB]
+                pack_permissions_slam(msg, item->getFlags(), item->getPermissions());
+                msg->addStringFast(_PREHASH_Name, item->getName());
+                msg->addStringFast(_PREHASH_Description, item->getDescription());
+
+                if( (i+1 == count) || ((OBJECTS_PER_PACKET-1) == (i % OBJECTS_PER_PACKET)) )
+                {
+                        // End of message chunk
+                        msg->sendReliable( gAgent.getRegion()->getHost() );
+                }
+        }
+}
+
 void remove_inventory_category_from_avatar( LLInventoryCategory* category )
 {
         if(!category) return;
@@ -4261,7 +4426,11 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata)
                 {
                         for(i = 0; i  < wearable_count; ++i)
                         {
-                                if( gAgent.isWearingItem (item_array.get(i)->getUUID()) )
+//                              if( gAgent.isWearingItem (item_array.get(i)->getUUID()) )
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-0.2.2a
+                                LLWearable* pWearable = gAgent.getWearableFromWearableItem(item_array.get(i)->getUUID());
+                                if ( (pWearable) && ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.isRemovable(pWearable->getType()))) )
+// [/RLVa:KB]
                                 {
                                         gWearableList.getAsset(item_array.get(i)->getAssetUUID(),
                                                                         item_array.get(i)->getName(),
@@ -4278,6 +4447,18 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata)
                 {
                         for(i = 0; i  < obj_count; ++i)
                         {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.2a
+                                // TODO-RLVa: is there a reason why LL doesn't bother checking to see if you're actually wearing the object?
+                                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+                                {
+                                        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                                        if ( (!pAvatar) || (!pAvatar->isWearingAttachment(obj_item_array.get(i)->getUUID())) || 
+                                                 (!gRlvHandler.isDetachable(obj_item_array.get(i).get())) ) // Why does LLPointer have a cast to BOOL aka S32??? 
+                                        {
+                                                continue;
+                                        }
+                                }
+// [/RVLa:KB]
                                 gMessageSystem->newMessageFast(_PREHASH_DetachAttachmentIntoInv);
                                 gMessageSystem->nextBlockFast(_PREHASH_ObjectData );
                                 gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
@@ -4670,8 +4851,11 @@ void LLWearableBridge::onRemoveFromAvatarArrived(LLWearable* wearable,
                 {
                         EWearableType type = wearable->getType();
         
-                        if( !(type==WT_SHAPE || type==WT_SKIN || type==WT_HAIR ) ) //&&
+                        //if( !(type==WT_SHAPE || type==WT_SKIN || type==WT_HAIR ) ) //&&
                                 //!((!gAgent.isTeen()) && ( type==WT_UNDERPANTS || type==WT_UNDERSHIRT )) )
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.2a | SL big fix
+                        if( !(type==WT_SHAPE || type==WT_SKIN || type==WT_HAIR || type==WT_EYES) )
+// [/RLVa:KB]
                         {
                                 gAgent.removeWearable( type );
                         }
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index f98a3f9..5a6a26b 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -1500,6 +1500,8 @@ void LLInventoryModel::stopBackgroundFetch()
 //static 
 void LLInventoryModel::backgroundFetch(void*)
 {
+        if (gDisconnected)
+                return;
         if (sBackgroundFetchActive && gAgent.getRegion())
         {
                 //If we'll be using the capability, we'll be sending batches and the background thing isn't as important.
@@ -2877,6 +2879,14 @@ void LLInventoryModel::processSaveAssetIntoInventory(LLMessageSystem* msg,
                 llinfos << "LLInventoryModel::processSaveAssetIntoInventory item"
                         " not found: " << item_id << llendl;
         }
+
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0e
+        if (rlv_handler_t::isEnabled())
+        {
+                gRlvHandler.onSavedAssetIntoInventory(item_id);
+        }
+// [/RLVa:KB]
+
         if(gViewerWindow)
         {
                 gViewerWindow->getWindow()->decBusyCount();
@@ -2919,6 +2929,23 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**)
                 //              << llendl;
                 if(tfolder->getUUID().notNull())
                 {
+// [RLVa:KB] - Checked: 2009-08-07 (RLVa-1.0.1f) | Added: RLVa-1.0.0f
+                        // TODO-RLVa: this really shouldn't go here, but if the inventory offer spans multiple BulkUpdateInventory messages
+                        //            then the second message will cause the viewer to show the folder under its original name even though
+                        //                        it is renamed properly on the inventory server
+                        if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getForbidGiveToRLV()) )
+                        {
+                                LLViewerInventoryCategory* pRlvRoot = gRlvHandler.getSharedRoot();
+                                std::string strName = tfolder->getName();
+                                if ((pRlvRoot) && (pRlvRoot->getUUID() == tfolder->getParentUUID() ) && (strName.find(RLV_PUTINV_PREFIX) == 0))
+                                {
+                                        strName.erase(0, strName.find(RLV_FOLDER_PREFIX_PUTINV)); // Strips the prefix while retaining while the '~'
+                                        tfolder->rename(strName);
+                                        tfolder->updateServer(FALSE);
+                                }
+                        }
+// [/RLVa:KB]
+
                         folders.push_back(tfolder);
                         LLViewerInventoryCategory* folderp = gInventory.getCategory(tfolder->getUUID());
                         if(folderp)
diff --git a/linden/indra/newview/llinventorymodel.h b/linden/indra/newview/llinventorymodel.h
index d73fef7..74a2ec7 100644
--- a/linden/indra/newview/llinventorymodel.h
+++ b/linden/indra/newview/llinventorymodel.h
@@ -323,6 +323,8 @@ public:
         // relations.
         void buildParentChildMap();
 
+        // Empty the entire contents
+        void empty();
         //
         // Category accounting.
         //
@@ -374,6 +376,7 @@ public:
         static bool isEverythingFetched();
         static void backgroundFetch(void*); // background fetch idle function
         static void incrBulkFetch(S16 fetching) {  sBulkFetchCount+=fetching; if (sBulkFetchCount<0) sBulkFetchCount=0; }
+
 protected:
 
         // Internal methods which add inventory and make sure that all of
@@ -387,8 +390,7 @@ protected:
         // preferred type. Returns LLUUID::null if not found
         LLUUID findCatUUID(LLAssetType::EType preferred_type);
 
-        // Empty the entire contents
-        void empty();
+
 
         // Given the current state of the inventory items, figure out the
         // clone information. *FIX: This is sub-optimal, since we can
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 34409ff..f0bfa00 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -522,6 +522,16 @@ void LLInventoryView::init(LLInventoryModel* inventory)
         addBoolControl("Inventory.FoldersAlwaysByName", sort_folders_by_name );
         addBoolControl("Inventory.SystemFoldersToTop", sort_system_folders_to_top );
 
+        //Search Controls
+        U32 search_type = gSavedSettings.getU32("InventorySearchType");
+        BOOL search_by_name = (search_type == 0);
+
+        addBoolControl("Inventory.SearchByName", search_by_name);
+        addBoolControl("Inventory.SearchByCreator", !search_by_name);
+        addBoolControl("Inventory.SearchByDesc", !search_by_name);
+
+        addBoolControl("Inventory.SearchByAll", !search_by_name);
+
         mSavedFolderState = new LLSaveFolderState();
         mSavedFolderState->setApply(FALSE);
 
@@ -766,7 +776,17 @@ void LLInventoryView::setVisible( BOOL visible )
 // Destroy all but the last floater, which is made invisible.
 void LLInventoryView::onClose(bool app_quitting)
 {
-        S32 count = sActiveViews.count();
+//      S32 count = sActiveViews.count();
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        // See LLInventoryView::closeAll() on why we're doing it this way
+        S32 count = 0;
+        for (S32 idx = 0, cnt = sActiveViews.count(); idx < cnt; idx++)
+        {
+                if (!sActiveViews.get(idx)->isDead())
+                        count++;
+        }
+// [/RLVa:KB]
+
         if (count > 1)
         {
                 destroy();
@@ -844,6 +864,13 @@ LLInventoryView* LLInventoryView::showAgentInventory(BOOL take_keyboard_focus)
                 return NULL;
         }
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWINV))
+        {
+                return NULL;
+        }
+// [/RLVa:KB]
+
         LLInventoryView* iv = LLInventoryView::getActiveInventory();
 #if 0 && !LL_RELEASE_FOR_DOWNLOAD
         if (sActiveViews.count() == 1)
@@ -942,6 +969,7 @@ void LLInventoryView::cleanup()
         {
                 sActiveViews.get(i)->destroy();
         }
+        gInventory.empty();
 }
 
 void LLInventoryView::toggleFindOptions()
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index 1f73d51..0c525c3 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -226,6 +226,34 @@ public:
         static void toggleVisibility();
         static void toggleVisibility(void*) { toggleVisibility(); }
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        static void closeAll() 
+        {
+                // If there are mulitple inventory floaters open then clicking the "Inventory" button will close
+                // them one by one (see LLToolBar::onClickInventory() => toggleVisibility() ) until we get to the
+                // last one which will just be hidden instead of closed/destroyed (see LLInventoryView::onClose)
+                //
+                // However the view isn't removed from sActiveViews until its destructor is called and since
+                // 'LLMortician::sDestroyImmediate == FALSE' while the viewer is running the destructor won't be 
+                // called right away
+                //
+                // Result: we can't call close() on the last (sActiveViews.count() will still be > 1) because
+                //         onClose() would take the wrong branch and destroy() it as well
+                //
+                // Workaround: "fix" onClose() to count only views that aren't marked as "dead"
+
+                LLInventoryView* pView; U8 flagsSound;
+                for (S32 idx = sActiveViews.count() - 1; idx >= 0; idx--)
+                {
+                        pView = sActiveViews.get(idx);
+                        flagsSound = pView->getSoundFlags();
+                        pView->setSoundFlags(LLView::SILENT);   // Suppress the window close sound
+                        pView->close();                                                 // onClose() protects against closing the last inventory floater
+                        pView->setSoundFlags(flagsSound);               // One view won't be destroy()'ed so it needs its sound flags restored
+                }
+        }
+// [/RLVa:KB]
+
         // Final cleanup, destroy all open inventory views.
         static void cleanup();
 
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index b1cdfe3..65f99ef 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -70,6 +70,8 @@ const F32 SNAP_GUIDE_SCREEN_LENGTH = 0.7f;
 const F32 SELECTED_MANIPULATOR_SCALE = 1.2f;
 const F32 MANIPULATOR_SCALE_HALF_LIFE = 0.07f;
 const S32 NUM_MANIPULATORS = 14;
+const F32 DEFAULT_LL_MAX_PRIM_SCALE = 10.f; 
+const F32 DEFAULT_OPENSIM_MAX_PRIM_SCALE = 128.f;
 
 const LLManip::EManipPart MANIPULATOR_IDS[NUM_MANIPULATORS] = 
 {
@@ -174,6 +176,7 @@ LLManipScale::LLManipScale( LLToolComposite* composite )
         mScaledBoxHandleSize( 1.f ),
         mLastMouseX( -1 ),
         mLastMouseY( -1 ),
+        mMaxPrimSize(0.f),
         mSendUpdateOnMouseUp( FALSE ),
         mLastUpdateFlags( 0 ),
         mScaleSnapUnit1(1.f),
@@ -202,6 +205,7 @@ void LLManipScale::render()
         LLGLDepthTest gls_depth(GL_TRUE);
         LLGLEnable gl_blend(GL_BLEND);
         LLGLEnable gls_alpha_test(GL_ALPHA_TEST);
+        mMaxPrimSize = gSavedSettings.getBOOL("LoggedIntoOpenSim") ? DEFAULT_OPENSIM_MAX_PRIM_SCALE : DEFAULT_LL_MAX_PRIM_SCALE;
         
         if( canAffectSelection() )
         {
@@ -953,8 +957,8 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                 mInSnapRegime = FALSE;
         }
 
-        F32 max_scale_factor = DEFAULT_MAX_PRIM_SCALE / MIN_PRIM_SCALE;
-        F32 min_scale_factor = MIN_PRIM_SCALE / DEFAULT_MAX_PRIM_SCALE;
+        F32 max_scale_factor = mMaxPrimSize / MIN_PRIM_SCALE;
+        F32 min_scale_factor = MIN_PRIM_SCALE / mMaxPrimSize;
 
         // find max and min scale factors that will make biggest object hit max absolute scale and smallest object hit min absolute scale
         for (LLObjectSelection::iterator iter = mObjectSelection->begin();
@@ -966,7 +970,7 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                 {
                         const LLVector3& scale = selectNode->mSavedScale;
 
-                        F32 cur_max_scale_factor = llmin( DEFAULT_MAX_PRIM_SCALE / scale.mV[VX], DEFAULT_MAX_PRIM_SCALE / scale.mV[VY], DEFAULT_MAX_PRIM_SCALE / scale.mV[VZ] );
+                        F32 cur_max_scale_factor = llmin( mMaxPrimSize / scale.mV[VX], mMaxPrimSize / scale.mV[VY], mMaxPrimSize / scale.mV[VZ] );
                         max_scale_factor = llmin( max_scale_factor, cur_max_scale_factor );
 
                         F32 cur_min_scale_factor = llmax( MIN_PRIM_SCALE / scale.mV[VX], MIN_PRIM_SCALE / scale.mV[VY], MIN_PRIM_SCALE / scale.mV[VZ] );
@@ -1263,7 +1267,7 @@ void LLManipScale::stretchFace( const LLVector3& drag_start_agent, const LLVecto
 
                         F32 denom = axis * dir_local;
                         F32 desired_delta_size  = is_approx_zero(denom) ? 0.f : (delta_local_mag / denom);  // in meters
-                        F32 desired_scale               = llclamp(selectNode->mSavedScale.mV[axis_index] + desired_delta_size, MIN_PRIM_SCALE, DEFAULT_MAX_PRIM_SCALE);
+                        F32 desired_scale               = llclamp(selectNode->mSavedScale.mV[axis_index] + desired_delta_size, MIN_PRIM_SCALE, mMaxPrimSize);
                         // propagate scale constraint back to position offset
                         desired_delta_size              = desired_scale - selectNode->mSavedScale.mV[axis_index]; // propagate constraint back to position
 
@@ -1963,7 +1967,7 @@ F32		LLManipScale::partToMaxScale( S32 part, const LLBBox &bbox ) const
                         max_extent = bbox_extents.mV[i];
                 }
         }
-        max_scale_factor = bbox_extents.magVec() * DEFAULT_MAX_PRIM_SCALE / max_extent;
+        max_scale_factor = bbox_extents.magVec() * mMaxPrimSize / max_extent;
 
         if (getUniform())
         {
@@ -1978,7 +1982,7 @@ F32		LLManipScale::partToMinScale( S32 part, const LLBBox &bbox ) const
 {
         LLVector3 bbox_extents = unitVectorToLocalBBoxExtent( partToUnitVector( part ), bbox );
         bbox_extents.abs();
-        F32 min_extent = DEFAULT_MAX_PRIM_SCALE;
+        F32 min_extent = mMaxPrimSize;
         for (U32 i = VX; i <= VZ; i++)
         {
                 if (bbox_extents.mV[i] > 0.f && bbox_extents.mV[i] < min_extent)
@@ -2053,3 +2057,13 @@ BOOL LLManipScale::canAffectSelection()
         }
         return can_scale;
 }
+
+//static
+F32 LLManipScale::getMaxPrimSize()
+{
+        if (gSavedSettings.getBOOL("LoggedIntoOpenSim"))
+        {
+                return DEFAULT_OPENSIM_MAX_PRIM_SCALE;
+        }
+        return DEFAULT_LL_MAX_PRIM_SCALE;
+}
diff --git a/linden/indra/newview/llmanipscale.h b/linden/indra/newview/llmanipscale.h
index 1de0459..c6545fd 100644
--- a/linden/indra/newview/llmanipscale.h
+++ b/linden/indra/newview/llmanipscale.h
@@ -89,6 +89,8 @@ public:
         static void             setShowAxes( BOOL b );
         static BOOL             getShowAxes();
 
+        static F32              getMaxPrimSize();
+
 private:
         void                    renderCorners( const LLBBox& local_bbox );
         void                    renderFaces( const LLBBox& local_bbox );
@@ -166,6 +168,7 @@ private:
         F32                             mScaleSnapValue;
         BOOL                    mInSnapRegime;
         F32*                    mManipulatorScales;
+        F32                             mMaxPrimSize;
 };
 
 #endif  // LL_MANIPSCALE_H
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index f2585c8..8d23e40 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -463,8 +463,15 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
                         if (mask == MASK_COPY)
                         {
                                 // ...we're trying to make a copy
-                                LLSelectMgr::getInstance()->selectDuplicate(LLVector3::zero, FALSE);
-                                mCopyMadeThisDrag = TRUE;
+//                              LLSelectMgr::getInstance()->selectDuplicate(LLVector3::zero, FALSE);
+//                              mCopyMadeThisDrag = TRUE;
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+                                if (!gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+                                {
+                                        LLSelectMgr::getInstance()->selectDuplicate(LLVector3::zero, FALSE);
+                                        mCopyMadeThisDrag = TRUE;
+                                }
+// [/RLVa:KB]
 
                                 // When we make the copy, we don't want to do any other processing.
                                 // If so, the object will also be moved, and the copy will be offset.
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index b0cce23..73f19d5 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -46,6 +46,7 @@
 #include "llcolorscheme.h"
 #include "llviewercontrol.h"
 #include "llfloateravatarinfo.h"
+#include "llfloatermap.h"
 #include "llfloaterworldmap.h"
 #include "llframetimer.h"
 #include "llmutelist.h"
@@ -70,13 +71,15 @@
 #include "llglheaders.h"
 
 const F32 MAP_SCALE_MIN = 32;
-const F32 MAP_SCALE_MID = 172;
-const F32 MAP_SCALE_MAX = 512;
+const F32 MAP_SCALE_MID = 1024;
+const F32 MAP_SCALE_MAX = 4096;
 const F32 MAP_SCALE_INCREMENT = 16;
-const F32 MAP_MIN_PICK_DIST = 4;
+const F32 MAP_SCALE_ZOOM_FACTOR = 1.25f;                        // Zoom in factor per click of the scroll wheel (25%)
 const F32 MAP_MINOR_DIR_THRESHOLD = 0.08f;
+const F32 MIN_DOT_RADIUS = 3.5f;
+const F32 DOT_SCALE = 0.75f;
+const F32 MIN_PICK_SCALE = 2.f;
 const S32 SLOP = 2;
-
 const S32 TRACKING_RADIUS = 3;
 
 LLNetMap::LLNetMap(const std::string& name) :
@@ -92,6 +95,7 @@ LLNetMap::LLNetMap(const std::string& name) :
 {
         mScale = gSavedSettings.getF32("MiniMapScale");
         mPixelsPerMeter = mScale / LLWorld::getInstance()->getRegionWidthInMeters();
+        mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
 
         mObjectImageCenterGlobal = gAgent.getCameraPositionGlobal();
         
@@ -99,6 +103,8 @@ LLNetMap::LLNetMap(const std::string& name) :
         (new LLScaleMap())->registerListener(this, "MiniMap.ZoomLevel");
         (new LLCenterMap())->registerListener(this, "MiniMap.Center");
         (new LLCheckCenterMap())->registerListener(this, "MiniMap.CheckCenter");
+        (new LLRotateMap())->registerListener(this, "MiniMap.Rotate");
+        (new LLCheckRotateMap())->registerListener(this, "MiniMap.CheckRotate");
         (new LLShowWorldMap())->registerListener(this, "MiniMap.ShowWorldMap");
         (new LLStopTracking())->registerListener(this, "MiniMap.StopTracking");
         (new LLEnableTracking())->registerListener(this, "MiniMap.EnableTracking");
@@ -118,6 +124,11 @@ LLNetMap::LLNetMap(const std::string& name) :
         mPopupMenuHandle = menu->getHandle();
 }
 
+BOOL LLNetMap::postBuild()
+{
+        return TRUE;
+}
+
 LLNetMap::~LLNetMap()
 {
 }
@@ -144,6 +155,7 @@ void LLNetMap::setScale( F32 scale )
         }
 
         mPixelsPerMeter = mScale / LLWorld::getInstance()->getRegionWidthInMeters();
+        mDotRadius = llmax(DOT_SCALE * mPixelsPerMeter, MIN_DOT_RADIUS);
 
         mUpdateNow = TRUE;
 }
@@ -326,12 +338,16 @@ void LLNetMap::draw()
                 LLUI::getCursorPositionLocal(this, &local_mouse_x, &local_mouse_y);
                 mClosestAgentToCursor.setNull();
                 F32 closest_dist = F32_MAX;
+                F32 min_pick_dist = mDotRadius * MIN_PICK_SCALE; 
 
                 // Draw avatars
                 LLColor4 avatar_color = gColors.getColor( "MapAvatar" );
                 LLColor4 friend_color = gColors.getColor( "MapFriend" );
                 LLColor4 muted_color = gColors.getColor( "MapMuted" );
+                LLColor4 selected_color = gColors.getColor( "MapSelected" );
+                LLColor4 imp_dev_color = gColors.getColor( "MapImpDev" );
                 LLColor4 glyph_color;
+                int selected = -1;
 
                 std::vector<LLUUID> avatar_ids;
                 std::vector<LLVector3d> positions;
@@ -341,34 +357,78 @@ void LLNetMap::draw()
                         // TODO: it'd be very cool to draw these in sorted order from lowest Z to highest.
                         // just be careful to sort the avatar IDs along with the positions. -MG
                         pos_map = globalPosToView(positions[i], rotate_map);
-
-                        // Show them muted even if they're friends
-                        if (LLMuteList::getInstance()->isMuted(avatar_ids[i]))
+                        
+                        // Save this entry to draw last
+                        if (LLFloaterMap::getSelected() == avatar_ids[i])
                         {
-                                glyph_color = muted_color;
+                                selected = i;
+                                continue;
                         }
-                        else if (is_agent_friend(avatar_ids[i]))
+                        else
                         {
-                                glyph_color = friend_color;
+                                // Show them muted even if they're friends
+                                if (LLMuteList::getInstance()->isMuted(avatar_ids[i]))
+                                {
+                                        glyph_color = muted_color;
+                                }
+                                else if (LLFloaterMap::isImpDev(avatar_ids[i]))
+                                {
+                                        glyph_color = imp_dev_color;
+                                }
+                                else if (is_agent_friend(avatar_ids[i]))
+                                {
+                                        glyph_color = friend_color;
+                                }
+                                else
+                                {
+                                        glyph_color = avatar_color;
+                                }
                         }
-                        else
+
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+                        if ( gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
                         {
+                                // User is not allowed to see who it is, or even if it's a friend,
+                                // due to RLV settings.
                                 glyph_color = avatar_color;
                         }
+// [/RLVa:KB]
 
                         LLWorldMapView::drawAvatar(
                                 pos_map.mV[VX], pos_map.mV[VY], 
                                 glyph_color, 
-                                pos_map.mV[VZ]);
+                                pos_map.mV[VZ],
+                                mDotRadius);
 
                         F32     dist_to_cursor = dist_vec(LLVector2(pos_map.mV[VX], pos_map.mV[VY]), LLVector2(local_mouse_x,local_mouse_y));
-                        if(dist_to_cursor < MAP_MIN_PICK_DIST && dist_to_cursor < closest_dist)
+                        if(dist_to_cursor < min_pick_dist && dist_to_cursor < closest_dist)
                         {
                                 closest_dist = dist_to_cursor;
                                 mClosestAgentToCursor = avatar_ids[i];
                         }
                 }
 
+                // Draw dot for selected avatar last
+                if (selected >= 0 && avatar_ids[selected].notNull())
+                {
+                        pos_map = globalPosToView(positions[selected], rotate_map);
+                        F32 glyph_radius = mDotRadius * 1.7f;
+                        glyph_color = selected_color;
+
+                        LLWorldMapView::drawAvatar(
+                                pos_map.mV[VX], pos_map.mV[VY], 
+                                glyph_color, 
+                                pos_map.mV[VZ],
+                                glyph_radius);
+
+                        F32     dist_to_cursor = dist_vec(LLVector2(pos_map.mV[VX], pos_map.mV[VY]), LLVector2(local_mouse_x,local_mouse_y));
+                        if(dist_to_cursor < min_pick_dist && dist_to_cursor < closest_dist)
+                        {
+                                closest_dist = dist_to_cursor;
+                                mClosestAgentToCursor = avatar_ids[selected];
+                        }
+                }
+
                 // Draw dot for autopilot target
                 if (gAgent.getAutoPilot())
                 {
@@ -391,10 +451,13 @@ void LLNetMap::draw()
                 // Draw dot for self avatar position
                 pos_global = gAgent.getPositionGlobal();
                 pos_map = globalPosToView(pos_global, rotate_map);
-                LLUIImagePtr you = LLWorldMapView::sAvatarYouSmallImage;
+                LLUIImagePtr you = LLWorldMapView::sAvatarYouLargeImage;
+                S32 dot_width = llround(mDotRadius * 2.f);
                 you->draw(
-                        llround(pos_map.mV[VX]) - you->getWidth()/2, 
-                        llround(pos_map.mV[VY]) - you->getHeight()/2);
+                        llround(pos_map.mV[VX] - mDotRadius),
+                        llround(pos_map.mV[VY] - mDotRadius),
+                        dot_width,
+                        dot_width);
 
                 // Draw frustum
                 F32 meters_to_pixels = mScale/ LLWorld::getInstance()->getRegionWidthInMeters();
@@ -451,6 +514,8 @@ void LLNetMap::draw()
         setDirectionPos( getChild<LLTextBox>("se_label"), rotation + F_PI + F_PI_BY_TWO + F_PI_BY_TWO / 2);
 
         LLView::draw();
+
+        LLFloaterMap::updateRadar();
 }
 
 void LLNetMap::reshape(S32 width, S32 height, BOOL called_from_parent)
@@ -533,8 +598,12 @@ LLVector3d LLNetMap::viewPosToGlobal( S32 x, S32 y, BOOL rotated )
 
 BOOL LLNetMap::handleScrollWheel(S32 x, S32 y, S32 clicks)
 {
-        // note that clicks are reversed from what you'd think
-        setScale(llclamp(mScale - clicks*MAP_SCALE_INCREMENT, MAP_SCALE_MIN, MAP_SCALE_MAX));
+        // note that clicks are reversed from what you'd think: i.e. > 0  means zoom out, < 0 means zoom in
+        F32 scale = mScale;
+        
+        scale *= pow(MAP_SCALE_ZOOM_FACTOR, -clicks);
+        setScale(llclamp(scale, MAP_SCALE_MIN, MAP_SCALE_MAX));
+
         return TRUE;
 }
 
@@ -552,11 +621,26 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
                 std::string fullname;
                 if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname))
                 {
-                        msg.append(fullname);
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+                        // User is not allowed to see who it is, due to RLV settings.
+                        msg.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullname : gRlvHandler.getAnonym(fullname) );
                         msg.append("\n");
+ // [/RLVa:KB]
                 }
-                msg.append( region->getName() );
                 
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+                if ( gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC) )
+                {
+                        // User is not allowed to see where they are, due to RLV settings.
+                        msg.append( rlv_handler_t::cstrHidden ); 
+                }
+                else
+                {
+                        msg.append( region->getName() );
+                }
+// [/RLVa:KB]
+
+
                 msg.append("\n");
                 gSavedSettings.getBOOL( "MiniMapTeleport" ) ?
                                                 msg.append(getString("tooltip_tp")) : msg.append(getString("tooltip_map"));
@@ -893,6 +977,22 @@ bool LLNetMap::LLScaleMap::handleEvent(LLPointer<LLEvent> event, const LLSD& use
         return true;
 }
 
+bool LLNetMap::LLRotateMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+{
+        BOOL rotate = gSavedSettings.getBOOL("MiniMapRotate");
+        gSavedSettings.setBOOL("MiniMapRotate", !rotate);
+
+        return true;
+}
+
+bool LLNetMap::LLCheckRotateMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+{
+        LLNetMap *self = mPtr;
+        BOOL enabled = gSavedSettings.getBOOL("MiniMapRotate");
+        self->findControl(userdata["control"].asString())->setValue(enabled);
+        return true;
+}
+
 bool LLNetMap::LLCenterMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
         S32 center = userdata.asInteger();
@@ -940,6 +1040,13 @@ bool LLNetMap::LLEnableTracking::handleEvent(LLPointer<LLEvent> event, const LLS
 
 bool LLNetMap::LLShowAgentProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+        {
+                return true;
+        }
+// [/RLVa:KB]
+
         LLNetMap *self = mPtr;
         LLFloaterAvatarInfo::show(self->mClosestAgentAtLastRightClick);
         return true;
@@ -948,6 +1055,9 @@ bool LLNetMap::LLShowAgentProfile::handleEvent(LLPointer<LLEvent> event, const L
 bool LLNetMap::LLEnableProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
         LLNetMap *self = mPtr;
-        self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor());
+        //self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor());
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+        self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+// [/RLVa:KB]
         return true;
 }
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 4202e24..c0c19d5 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -53,6 +53,8 @@ class LLNetMap : public LLPanel
 {
 public:
         LLNetMap(const std::string& name);
+
+        virtual BOOL postBuild();
         virtual ~LLNetMap();
 
         virtual void    draw();
@@ -94,7 +96,8 @@ private:
         F32                             mScale;                                 // Size of a region in pixels
         F32                             mPixelsPerMeter;                // world meters to map pixels
         F32                             mObjectMapTPM;                  // texels per meter on map
-        F32                             mObjectMapPixels;               // Width of object map in pixels;
+        F32                             mObjectMapPixels;               // Width of object map in pixels
+        F32                             mDotRadius;                             // Size of avatar markers
         F32                             mTargetPanX;
         F32                             mTargetPanY;
         F32                             mCurPanX;
@@ -112,8 +115,8 @@ private:
         LLPointer<LLImageGL>    mObjectImagep;
 
 private:
-        LLUUID                  mClosestAgentToCursor;
-        LLUUID                  mClosestAgentAtLastRightClick;
+        LLUUID                          mClosestAgentToCursor;
+        LLUUID                          mClosestAgentAtLastRightClick;
 
         static BOOL             sRotateMap;
         static LLNetMap*        sInstance;
@@ -141,6 +144,18 @@ private:
                 /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
         };
 
+        class LLRotateMap : public LLMemberListener<LLNetMap>
+        {
+        public:
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        };
+
+        class LLCheckRotateMap : public LLMemberListener<LLNetMap>
+        {
+        public:
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        };
+
         class LLShowWorldMap : public LLMemberListener<LLNetMap>
         {
         public:
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index a119dc4..6820622 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -55,7 +55,10 @@
 #include "lloverlaybar.h" // for gOverlayBar
 #include "lluictrlfactory.h"
 
-
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
+#include "rlvhandler.h"
+// [/RLVa:KB]
+  
 // Globals
 LLNotifyBoxView* gNotifyBoxView = NULL;
 
@@ -270,6 +273,13 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification,
                 // TODO: Make a separate archive for these.
                 LLChat chat(mMessage);
                 chat.mSourceType = CHAT_SOURCE_SYSTEM;
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
+                if (rlv_handler_t::isEnabled())
+                {
+                        // Notices should already have their contents filtered where necessary
+                        chat.mRlvLocFiltered = chat.mRlvNamesFiltered = TRUE;
+                }
+// [/RLVa:KB]
                 LLFloaterChat::getInstance(LLSD())->addChatHistory(chat);
         }
         else
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 24b1474..599d736 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -42,6 +42,7 @@
 #include "llagent.h"
 #include "llbutton.h"
 #include "llchatbar.h"
+#include "llfloaterchat.h"
 #include "llfocusmgr.h"
 #include "llimview.h"
 #include "llmediaremotectrl.h"
@@ -63,6 +64,7 @@
 #include "llvoavatar.h"
 #include "llvoiceremotectrl.h"
 #include "llwebbrowserctrl.h"
+#include "llwindlightremotectrl.h"
 #include "llselectmgr.h"
 
 //
@@ -73,6 +75,53 @@ LLOverlayBar *gOverlayBar = NULL;
 
 extern S32 MENU_BAR_HEIGHT;
 
+
+class LLTitleObserver
+        :       public LLMediaObserver
+{
+public:
+        void init(std::string url);
+        /*virtual*/ void onMediaTitleChange(const EventType& event_in);
+private:
+        LLMediaBase* mMediaSource;
+};
+
+static LLTitleObserver sTitleObserver;
+
+static LLRegisterWidget<LLMediaRemoteCtrl> r("media_remote");
+
+void LLTitleObserver::init(std::string url)
+{
+
+        if (!gAudiop)
+        {
+                return;
+        }
+
+        mMediaSource = gAudiop->getStreamMedia(); // LLViewerMedia::getSource();
+
+        if ( mMediaSource )
+        {
+                mMediaSource->addObserver(this);
+        }
+}
+
+//virtual
+void LLTitleObserver::onMediaTitleChange(const EventType& event_in)
+{
+        if ( !gSavedSettings.getBOOL("ShowStreamTitle") )
+        {
+                return;
+        }
+
+        LLChat chat;
+        //TODO: set this in XUI
+        std::string playing_msg = "Playing: " + event_in.getStringValue();
+        chat.mText = playing_msg;
+        LLFloaterChat::addChat(chat, FALSE, FALSE);
+}
+
+
 //
 // Functions
 //
@@ -93,6 +142,13 @@ void* LLOverlayBar::createVoiceRemote(void* userdata)
         return self->mVoiceRemote;
 }
 
+void* LLOverlayBar::createWindlightRemote(void* userdata)
+{
+        LLOverlayBar *self = (LLOverlayBar*)userdata;   
+        self->mWindlightRemote = new LLWindlightRemoteCtrl();
+        return self->mWindlightRemote;
+}
+
 void* LLOverlayBar::createChatBar(void* userdata)
 {
         gChatBar = new LLChatBar();
@@ -103,6 +159,7 @@ LLOverlayBar::LLOverlayBar()
         :       LLPanel(),
                 mMediaRemote(NULL),
                 mVoiceRemote(NULL),
+                mWindlightRemote(NULL),
                 mMusicState(STOPPED),
                 mOriginalIMLabel("")
 {
@@ -114,6 +171,7 @@ LLOverlayBar::LLOverlayBar()
         LLCallbackMap::map_t factory_map;
         factory_map["media_remote"] = LLCallbackMap(LLOverlayBar::createMediaRemote, this);
         factory_map["voice_remote"] = LLCallbackMap(LLOverlayBar::createVoiceRemote, this);
+        factory_map["windlight_remote"] = LLCallbackMap(LLOverlayBar::createWindlightRemote, this);
         factory_map["chat_bar"] = LLCallbackMap(LLOverlayBar::createChatBar, this);
         
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_overlaybar.xml", &factory_map);
@@ -258,7 +316,10 @@ void LLOverlayBar::refresh()
         BOOL sitting = FALSE;
         if (gAgent.getAvatarObject())
         {
-                sitting = gAgent.getAvatarObject()->mIsSitting;
+//              sitting = gAgent.getAvatarObject()->mIsSitting;
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                sitting = gAgent.getAvatarObject()->mIsSitting && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT);
+// [/RLVa:KB]
         }
         button = getChild<LLButton>("Stand Up");
 
@@ -271,6 +332,7 @@ void LLOverlayBar::refresh()
         }
 
 
+        moveChildToBackOfTabGroup(mWindlightRemote);
         moveChildToBackOfTabGroup(mMediaRemote);
         moveChildToBackOfTabGroup(mVoiceRemote);
 
@@ -279,6 +341,7 @@ void LLOverlayBar::refresh()
         {
                 childSetVisible("media_remote_container", FALSE);
                 childSetVisible("voice_remote_container", FALSE);
+                childSetVisible("windlight_remote_container", FALSE);
                 childSetVisible("state_buttons", FALSE);
         }
         else
@@ -286,6 +349,7 @@ void LLOverlayBar::refresh()
                 // update "remotes"
                 childSetVisible("media_remote_container", TRUE);
                 childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled());
+                childSetVisible("windlight_remote_container", gSavedSettings.getBOOL("EnableWindlightRemote"));
                 childSetVisible("state_buttons", TRUE);
         }
 
@@ -338,6 +402,13 @@ void LLOverlayBar::onClickMouselook(void*)
 //static
 void LLOverlayBar::onClickStandUp(void*)
 {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (gAgent.getAvatarObject()) && (gAgent.getAvatarObject()->mIsSitting) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLSelectMgr::getInstance()->deselectAllForStandingUp();
         gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
 }
@@ -408,6 +479,7 @@ void LLOverlayBar::toggleMusicPlay(void*)
         //                      if ( gAudiop->isInternetStreamPlaying() == 0 )
                                 {
                                         gAudiop->startInternetStream(parcel->getMusicURL());
+                                        sTitleObserver.init(parcel->getMusicURL());
                                 }
                         }
                 }
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 1d55cc4..50ad3d1 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -41,6 +41,7 @@ extern S32 STATUS_BAR_HEIGHT;
 class LLButton;
 class LLLineEditor;
 class LLMediaRemoteCtrl;
+
 class LLMessageSystem;
 class LLTextBox;
 class LLTextEditor;
@@ -50,6 +51,7 @@ class LLFrameTimer;
 class LLStatGraph;
 class LLSlider;
 class LLVoiceRemoteCtrl;
+class LLWindlightRemoteCtrl;
 
 class LLOverlayBar
 :       public LLPanel
@@ -89,13 +91,15 @@ public:
 protected:      
         static void* createMediaRemote(void* userdata);
         static void* createVoiceRemote(void* userdata);
+        static void* createWindlightRemote(void* userdata);
         static void* createChatBar(void* userdata);
 
         void enableMediaButtons();
 
 protected:
-        LLMediaRemoteCtrl*      mMediaRemote;
-        LLVoiceRemoteCtrl*      mVoiceRemote;
+        LLMediaRemoteCtrl*              mMediaRemote;
+        LLVoiceRemoteCtrl*              mVoiceRemote;
+        LLWindlightRemoteCtrl*  mWindlightRemote;
         bool                            mBuilt; // dialog constructed yet?
         S32                                     mMusicState;
         std::string                     mOriginalIMLabel;
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index ed7a71b..489f0d3 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -52,6 +52,7 @@
 
 #include "llfloaterfriends.h"
 #include "llfloatergroupinfo.h"
+#include "llfloatergroups.h"
 #include "llfloaterworldmap.h"
 #include "llfloatermute.h"
 #include "llfloateravatarinfo.h"
@@ -84,6 +85,7 @@
 std::list<LLPanelAvatar*> LLPanelAvatar::sAllPanels;
 BOOL LLPanelAvatar::sAllowFirstLife = FALSE;
 
+extern void callback_invite_to_group(LLUUID group_id, void *user_data);
 extern void handle_lure(const LLUUID& invitee);
 extern void handle_pay_by_id(const LLUUID& payee);
 
@@ -365,6 +367,7 @@ BOOL LLPanelAvatarSecondLife::postBuild(void)
 
         childSetAction("Find on Map", LLPanelAvatar::onClickTrack, getPanelAvatar());
         childSetAction("Instant Message...", LLPanelAvatar::onClickIM, getPanelAvatar());
+        childSetAction("Invite to Group...", LLPanelAvatar::onClickGroupInvite, getPanelAvatar());
         
         childSetAction("Add Friend...", LLPanelAvatar::onClickAddFriend, getPanelAvatar());
         childSetAction("Pay...", LLPanelAvatar::onClickPay, getPanelAvatar());
@@ -731,6 +734,9 @@ void LLPanelAvatarClassified::refresh()
         S32 tab_count = tabs ? tabs->getTabCount() : 0;
 
         bool allow_new = tab_count < MAX_CLASSIFIEDS;
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        allow_new &= !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC);
+// [/RLVa:KB]
         bool allow_delete = (tab_count > 0);
         bool show_help = (tab_count == 0);
 
@@ -866,6 +872,12 @@ void LLPanelAvatarClassified::processAvatarClassifiedReply(LLMessageSystem* msg,
 // static
 void LLPanelAvatarClassified::onClickNew(void* data)
 {
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-04 (RLVa-1.0.0a)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                return;
+        }
+// [/RLVa:KB]
         LLPanelAvatarClassified* self = (LLPanelAvatarClassified*)data;
 
         LLNotifications::instance().add("AddClassified", LLSD(), LLSD(), boost::bind(&LLPanelAvatarClassified::callbackNew, self, _1, _2));
@@ -961,7 +973,10 @@ void LLPanelAvatarPicks::refresh()
         BOOL self = (gAgent.getID() == getPanelAvatar()->getAvatarID());
         LLTabContainer* tabs = getChild<LLTabContainer>("picks tab");
         S32 tab_count = tabs ? tabs->getTabCount() : 0;
-        childSetEnabled("New...",    self && tab_count < MAX_AVATAR_PICKS);
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        childSetEnabled("New...", self && tab_count < MAX_AVATAR_PICKS && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) );
+// [/RLVa:KB]
+        //childSetEnabled("New...",    self && tab_count < MAX_AVATAR_PICKS);
         childSetEnabled("Delete...", self && tab_count > 0);
         childSetVisible("New...",    self && getPanelAvatar()->isEditable());
         childSetVisible("Delete...", self && getPanelAvatar()->isEditable());
@@ -1039,6 +1054,12 @@ void LLPanelAvatarPicks::processAvatarPicksReply(LLMessageSystem* msg, void**)
 // static
 void LLPanelAvatarPicks::onClickNew(void* data)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                return;
+        }
+// [/RLVa:KB]
         LLPanelAvatarPicks* self = (LLPanelAvatarPicks*)data;
         LLPanelPick* panel_pick = new LLPanelPick(FALSE);
         LLTabContainer* tabs =  self->getChild<LLTabContainer>("picks tab");
@@ -1238,14 +1259,6 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
 
         mPanelSecondLife->childSetVisible("online_yes", (online_status == ONLINE_STATUS_YES));
 
-        // Since setOnlineStatus gets called after setAvatarID
-        // need to make sure that "Offer Teleport" doesn't get set
-        // to TRUE again for yourself
-        if (mAvatarID != gAgent.getID())
-        {
-                childSetVisible("Offer Teleport...",TRUE);
-        }
-
         BOOL in_prelude = gAgent.inPrelude();
         if(gAgent.isGodlike())
         {
@@ -1262,6 +1275,18 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
                 childSetEnabled("Offer Teleport...", TRUE);
                 childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
         }
+
+        // Since setOnlineStatus gets called after setAvatarID
+        // need to make sure that "Offer Teleport" doesn't get set
+        // to TRUE again for yourself
+        if (mAvatarID != gAgent.getID())
+        {
+                childSetVisible("Offer Teleport...",TRUE);
+        }
+        else
+        {
+                childSetEnabled("Offer Teleport...", FALSE);
+        }
 }
 
 void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name,
@@ -1354,20 +1379,30 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
                                 childSetVisible("Cancel",FALSE);
                                 childSetEnabled("Cancel",FALSE);
                         }
-                        childSetVisible("Instant Message...",FALSE);
+                        //childSetVisible("Instant Message...",FALSE);
                         childSetEnabled("Instant Message...",FALSE);
-                        childSetVisible("Mute",FALSE);
+                        //childSetVisible("Invite to Group...",FALSE);
+                        childSetEnabled("Invite to Group...",FALSE);
+                        //childSetVisible("Mute",FALSE);
                         childSetEnabled("Mute",FALSE);
-                        childSetVisible("Offer Teleport...",FALSE);
+                        //childSetVisible("Offer Teleport...",FALSE);
                         childSetEnabled("Offer Teleport...",FALSE);
-                        childSetVisible("drop target",FALSE);
+                        //childSetVisible("drop target",FALSE);
                         childSetEnabled("drop target",FALSE);
-                        childSetVisible("Find on Map",FALSE);
+                        //childSetVisible("Find on Map",FALSE);
                         childSetEnabled("Find on Map",FALSE);
-                        childSetVisible("Add Friend...",FALSE);
+                        //childSetVisible("Add Friend...",FALSE);
                         childSetEnabled("Add Friend...",FALSE);
-                        childSetVisible("Pay...",FALSE);
+                        //childSetVisible("Pay...",FALSE);
                         childSetEnabled("Pay...",FALSE);
+                        childSetVisible("Kick",FALSE);
+                        childSetEnabled("Kick",FALSE);
+                        childSetVisible("Freeze",FALSE);
+                        childSetEnabled("Freeze",FALSE);
+                        childSetVisible("Unfreeze",FALSE);
+                        childSetEnabled("Unfreeze",FALSE);
+                        childSetVisible("csr_btn", FALSE);
+                        childSetEnabled("csr_btn", FALSE);
                 }
                 else
                 {
@@ -1379,6 +1414,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
 
                         childSetVisible("Instant Message...",TRUE);
                         childSetEnabled("Instant Message...",FALSE);
+                        childSetVisible("Invite to Group...",TRUE);
+                        childSetEnabled("Invite to Group...",FALSE);
                         childSetVisible("Mute",TRUE);
                         childSetEnabled("Mute",FALSE);
 
@@ -1405,20 +1442,20 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
                         childSetEnabled("Add Friend...", !avatar_is_friend);
                         childSetVisible("Pay...",TRUE);
                         childSetEnabled("Pay...",FALSE);
+
+                        BOOL is_god = FALSE;
+                        if (gAgent.isGodlike()) is_god = TRUE;
+                        
+                        childSetVisible("Kick", is_god);
+                        childSetEnabled("Kick", is_god);
+                        childSetVisible("Freeze", is_god);
+                        childSetEnabled("Freeze", is_god);
+                        childSetVisible("Unfreeze", is_god);
+                        childSetEnabled("Unfreeze", is_god);
+                        childSetVisible("csr_btn", is_god);
+                        childSetEnabled("csr_btn", is_god);
                 }
         }
-        
-        BOOL is_god = FALSE;
-        if (gAgent.isGodlike()) is_god = TRUE;
-        
-        childSetVisible("Kick", is_god);
-        childSetEnabled("Kick", is_god);
-        childSetVisible("Freeze", is_god);
-        childSetEnabled("Freeze", is_god);
-        childSetVisible("Unfreeze", is_god);
-        childSetEnabled("Unfreeze", is_god);
-        childSetVisible("csr_btn", is_god);
-        childSetEnabled("csr_btn", is_god);
 }
 
 
@@ -1461,9 +1498,18 @@ void LLPanelAvatar::resetGroupList()
                                 LLSD row;
 
                                 row["id"] = id ;
-                                row["columns"][0]["value"] = group_string;
                                 row["columns"][0]["font"] = "SANSSERIF_SMALL";
                                 row["columns"][0]["width"] = 0;
+                                if (group_data.mListInProfile)
+                                {
+                                        row["columns"][0]["value"] = group_string;
+                                        row["columns"][0]["color"] = gColors.getColor("ScrollUnselectedColor").getValue();
+                                }
+                                else
+                                {
+                                        row["columns"][0]["value"] = group_string + " " + getString("HiddenLabel");
+                                        row["columns"][0]["color"] = gColors.getColor("ScrollReadOnlyColor").getValue();
+                                }
                                 group_list->addElement(row);
                         }
                         group_list->sortByColumnIndex(0, TRUE);
@@ -1486,6 +1532,22 @@ void LLPanelAvatar::onClickIM(void* userdata)
         gIMMgr->addSession(name, IM_NOTHING_SPECIAL, self->mAvatarID);
 }
 
+void LLPanelAvatar::onClickGroupInvite(void* userdata)
+{
+        LLPanelAvatar* self = (LLPanelAvatar*) userdata;
+        if (self->getAvatarID().notNull())
+        {
+                LLFloaterGroupPicker* widget;
+                widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
+                if (widget)
+                {
+                        widget->center();
+                        widget->setPowersMask(GP_MEMBER_INVITE);
+                        widget->setSelectCallback(callback_invite_to_group, (void *)&(self->getAvatarID()));
+                }
+        }
+}
+
 
 // static
 //-----------------------------------------------------------------------------
@@ -1702,11 +1764,27 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                 {
                         continue;
                 }
-                self->childSetEnabled("Instant Message...",TRUE);
-                self->childSetEnabled("Pay...",TRUE);
-                self->childSetEnabled("Mute",TRUE);
 
-                self->childSetEnabled("drop target",TRUE);
+                if (self->mAvatarID == agent_id)
+                {
+                        self->childSetEnabled("Instant Message...",FALSE);
+                        self->childSetEnabled("Invite to Group...",FALSE);
+                        self->childSetEnabled("Pay...",FALSE);
+                        self->childSetEnabled("Mute",FALSE);
+
+                        self->childSetVisible("drop target",FALSE);
+                        self->childSetEnabled("drop target",FALSE);
+                }
+                else
+                {
+                        self->childSetEnabled("Instant Message...",TRUE);
+                        self->childSetEnabled("Invite to Group...",TRUE);
+                        self->childSetEnabled("Pay...",TRUE);
+                        self->childSetEnabled("Mute",TRUE);
+
+                        self->childSetVisible("drop target",TRUE);
+                        self->childSetEnabled("drop target",TRUE);
+                }
 
                 self->mHaveProperties = TRUE;
                 self->enableOKIfReady();
@@ -1923,8 +2001,34 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**)
 
                                 LLSD row;
                                 row["id"] = group_id;
-                                row["columns"][0]["value"] = group_string;
                                 row["columns"][0]["font"] = "SANSSERIF_SMALL";
+
+                                LLGroupData *group_data = NULL;
+
+                                if (avatar_id == agent_id) // own avatar
+                                {
+                                        // Search for this group in the agent's groups list
+                                        LLDynamicArray<LLGroupData>::iterator i;
+                                        for (i = gAgent.mGroups.begin(); i != gAgent.mGroups.end(); i++)
+                                        {
+                                                if (i->mID == group_id)
+                                                {
+                                                        group_data = &*i;
+                                                        break;
+                                                }
+                                        }
+                                }
+                                // Set normal color if not found or if group is visible in profile
+                                if (!group_data || group_data->mListInProfile)
+                                {
+                                        row["columns"][0]["value"] = group_string;
+                                        row["columns"][0]["color"] = gColors.getColor("ScrollUnselectedColor").getValue();
+                                }
+                                else
+                                {
+                                        row["columns"][0]["value"] = group_string + " " + self->getString("HiddenLabel");
+                                        row["columns"][0]["color"] = gColors.getColor("ScrollReadOnlyColor").getValue();
+                                }
                                 if (group_list)
                                 {
                                         group_list->addElement(row);
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index 041d503..01653d8 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -312,6 +312,7 @@ public:
 
         static void onClickTrack(       void *userdata);
         static void onClickIM(          void *userdata);
+        static void onClickGroupInvite( void *userdata);
         static void onClickOfferTeleport(       void *userdata);
         static void onClickPay( void *userdata);
         static void onClickAddFriend(void* userdata);
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index 9e4f970..4428133 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -777,7 +777,10 @@ void LLPanelClassified::refresh()
                 mClickThroughText->setVisible(is_self);
 
                 mSetBtn->setVisible(is_self);
-                mSetBtn->setEnabled(is_self);
+                //mSetBtn->setEnabled(is_self);
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                mSetBtn->setEnabled(is_self && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) );
+// [/RLVa:KB]
 
                 mUpdateBtn->setEnabled(is_self && checkDirty());
                 mUpdateBtn->setVisible(is_self);
@@ -978,6 +981,12 @@ void LLPanelClassified::onClickLandmark(void* data)
 // static
 void LLPanelClassified::onClickSet(void* data)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                return;
+        }
+// [/RLVa:KB]
     LLPanelClassified* self = (LLPanelClassified*)data;
 
         // Save location for later.
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index a2f3d9e..d576a20 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -68,6 +68,10 @@
 #include "lltoolcomp.h"
 #include "llpanelinventory.h"
 
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+#include "llvoavatar.h"
+// [/RLVa:KB]
+
 //
 // Imported globals
 //
@@ -153,6 +157,22 @@ void LLPanelContents::onClickNewScript(void *userdata)
         LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
         if(object)
         {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                if (rlv_handler_t::isEnabled()) // Fallback code [see LLPanelContents::getState()]
+                {
+                        if (!gRlvHandler.isDetachable(object))
+                        {
+                                return;                                 // Disallow creating new scripts in a locked attachment
+                        }
+                        else if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) )
+                        {
+                                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                                if ( (pAvatar) && (pAvatar->mIsSitting) && (pAvatar->getRoot() == object->getRootEdit()) )
+                                        return;                         // .. or in a linkset the avie is sitting on under @unsit=n/@sittp=n
+                        }
+                }
+// [/RLVa:KB]
+
                 LLPermissions perm;
                 perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
                 perm.initMasks(
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index 035b43f..7d88cf9 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -319,6 +319,9 @@ BOOL LLPanelDisplay::postBuild()
         mLightingText = getChild<LLTextBox>("LightingDetailText");
         mMeshDetailText = getChild<LLTextBox>("MeshDetailText");
 
+        childSetValue("toggle_windlight_control", gSavedSettings.getBOOL("EnableWindlightRemote"));
+        mWLControl = gSavedSettings.getBOOL("EnableWindlightRemote");
+
         refresh();
 
         return TRUE;
@@ -476,7 +479,12 @@ void LLPanelDisplay::refreshEnabledState()
         }
 
         // Vertex Shaders
-        mCtrlShaderEnable->setEnabled(LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"));
+//      mCtrlShaderEnable->setEnabled(LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable"));
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0a
+        // "Basic Shaders" can't be disabled - but can be enabled - under @setenv=n
+        bool fCtrlShaderEnable = LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable");
+        mCtrlShaderEnable->setEnabled(fCtrlShaderEnable && (!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV) || !mShaderEnable));
+// [/RLVa:KB]
 
         BOOL shaders = mCtrlShaderEnable->get();
         if (shaders)
@@ -491,7 +499,12 @@ void LLPanelDisplay::refreshEnabledState()
 
         // *HACK just checks to see if we can use shaders... 
         // maybe some cards that use shaders, but don't support windlight
-        mCtrlWindLight->setEnabled(mCtrlShaderEnable->getEnabled() && shaders);
+//      mCtrlWindLight->setEnabled(mCtrlShaderEnable->getEnabled() && shaders);
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0a
+        // "Atmospheric Shaders" can't be disabled - but can be enabled - under @setenv=n
+        bool fCtrlWindLightEnable = fCtrlShaderEnable && shaders;
+        mCtrlWindLight->setEnabled(fCtrlWindLightEnable && (!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV) || !mWindLight));
+// [/RLVa:KB]
 
         // turn off sky detail if atmostpherics isn't on
         mCtrlSkyFactor->setEnabled(gSavedSettings.getBOOL("WindLightUseAtmosShaders"));
@@ -691,6 +704,8 @@ void LLPanelDisplay::cancel()
         gSavedSettings.setU32("WLSkyDetail", mSkyLOD);
         gSavedSettings.setS32("RenderMaxPartCount", mParticleCount);
         gSavedSettings.setS32("RenderGlowResolutionPow", mPostProcess);
+
+        gSavedSettings.setBOOL("EnableWindlightRemote", mWLControl);
 }
 
 void LLPanelDisplay::apply()
@@ -702,6 +717,8 @@ void LLPanelDisplay::apply()
         {
                 applyWindowSize();
         }
+
+        gSavedSettings.setBOOL("EnableWindlightRemote", childGetValue("toggle_windlight_control").asBoolean());
 }
 
 void LLPanelDisplay::onChangeQuality(LLUICtrl *ctrl, void *data)
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index 1aedee4..1cbdbba 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -171,6 +171,8 @@ protected:
         S32 mParticleCount;
         S32 mPostProcess;
 
+        BOOL mWLControl;
+
         static void setGraphicsSettings(LLControlGroup& group);
         static void createGroup();
 
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index ddd3781..51cac4b 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -64,6 +64,8 @@ BOOL LLPanelGeneral::postBuild()
         childSetValue("small_avatar_names_checkbox", gSavedSettings.getBOOL("SmallAvatarNames"));
         childSetValue("show_my_title_checkbox", gSavedSettings.getBOOL("RenderHideGroupTitle"));
         childSetValue("afk_timeout_spinner", gSavedSettings.getF32("AFKTimeout"));
+        childSetValue("mini_map_notify_chat", gSavedSettings.getBOOL("MiniMapNotifyChatRange"));
+        childSetValue("mini_map_notify_sim", gSavedSettings.getBOOL("MiniMapNotifySimRange"));
         childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
 
         getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor"));
@@ -76,6 +78,7 @@ BOOL LLPanelGeneral::postBuild()
         
         childSetValue("language_combobox",      gSavedSettings.getString("Language"));
 
+        childSetAction("reset_ui_size", onClickResetUISize, this);
         
         // if we have no agent, we can't let them choose anything
         // if we have an agent, then we only let them choose if they have a choice
@@ -84,7 +87,6 @@ BOOL LLPanelGeneral::postBuild()
         
         if (can_choose)
         {
-
                 // if they're not adult or a god, they shouldn't see the adult selection, so delete it
                 if (!gAgent.isAdult() && !gAgent.isGodlike())
                 {
@@ -125,6 +127,8 @@ void LLPanelGeneral::apply()
         gSavedSettings.setBOOL("SmallAvatarNames", childGetValue("small_avatar_names_checkbox"));
         gSavedSettings.setBOOL("RenderHideGroupTitle", childGetValue("show_my_title_checkbox"));
         gSavedSettings.setF32("AFKTimeout", childGetValue("afk_timeout_spinner").asReal());
+        gSavedSettings.setBOOL("MiniMapNotifyChatRange", childGetValue("mini_map_notify_chat"));
+        gSavedSettings.setBOOL("MiniMapNotifySimRange", childGetValue("mini_map_notify_sim"));
         gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
         gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
         gSavedSettings.setF32("UIScaleFactor", childGetValue("ui_scale_slider").asReal());
@@ -157,3 +161,9 @@ void LLPanelGeneral::cancel()
 {
 }
 
+// static
+void LLPanelGeneral::onClickResetUISize(void* user_data)
+{
+        LLPanelGeneral* self = (LLPanelGeneral*)user_data;
+        self->childSetValue("ui_scale_slider", 1.0f);
+}
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index 4afa5dd..c5a1f63 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -46,6 +46,9 @@ public:
 
         void apply();
         void cancel();
+        
+private:
+        static void onClickResetUISize(void*);
 };
 
 #endif
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 7ef7f45..bc7c60f 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -82,6 +82,10 @@
 #include "llviewerwindow.h"
 #include "llwearable.h"
 
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+#include "llvoavatar.h"
+// [/RLVa:KB]
+
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -368,8 +372,16 @@ void LLTaskInvFVBridge::previewItem()
 
 BOOL LLTaskInvFVBridge::isItemRenameable() const
 {
-        if(gAgent.isGodlike()) return TRUE;
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
         LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
+        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        {
+                return FALSE;
+        }
+// [/RLVa:KB]
+
+        if(gAgent.isGodlike()) return TRUE;
+//      LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
         if(object)
         {
                 LLInventoryItem* item;
@@ -386,6 +398,12 @@ BOOL LLTaskInvFVBridge::isItemRenameable() const
 BOOL LLTaskInvFVBridge::renameItem(const std::string& new_name)
 {
         LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        {
+                return TRUE; // Fallback code [see LLTaskInvFVBridge::isItemRenameable()]
+        }
+// [/RLVa:KB]
         if(object)
         {
                 LLViewerInventoryItem* item = NULL;
@@ -412,12 +430,47 @@ BOOL LLTaskInvFVBridge::isItemMovable()
         //      return TRUE;
         //}
         //return FALSE;
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0g
+        if (rlv_handler_t::isEnabled())
+        {
+                LLViewerObject* pObj = gObjectList.findObject(mPanel->getTaskUUID());
+                if (pObj)
+                {
+                        if (!gRlvHandler.isDetachable(pObj))
+                        {
+                                return FALSE;
+                        }
+                        else if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) )
+                        {
+                                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                                if ( (pAvatar) && (pAvatar->mIsSitting) && (pAvatar->getRoot() == pObj->getRootEdit()) )
+                                        return FALSE;
+                        }
+                }
+        }
+// [/RLVa:KB]
         return TRUE;
 }
 
 BOOL LLTaskInvFVBridge::isItemRemovable()
 {
         LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0g
+        if ( (object) && (rlv_handler_t::isEnabled()) )
+        {
+                if (!gRlvHandler.isDetachable(object))
+                {
+                        return FALSE;
+                }
+                else if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) )
+                {
+                        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                        if ( (pAvatar) && (pAvatar->mIsSitting) && (pAvatar->getRoot() == object->getRootEdit()) )
+                                return FALSE;
+                }
+        }
+// [/RLVa:KB]
+
         if(object
            && (object->permModify() || object->permYouOwner()))
         {
@@ -565,6 +618,13 @@ BOOL LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
                                 const LLPermissions& perm = inv->getPermissions();
                                 bool can_copy = gAgent.allowOperation(PERM_COPY, perm,
                                                                                                                 GP_OBJECT_MANIPULATE);
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                                // Kind of redundant due to the note below, but in case that ever gets fixed
+                                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+                                {
+                                        return FALSE;
+                                }
+// [/RLVa:KB]
                                 if (object->isAttachment() && !can_copy)
                                 {
                     //RN: no copy contents of attachments cannot be dragged out
@@ -687,6 +747,14 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                 {
                         disabled_items.push_back(std::string("Task Open"));
                 }
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                else if ( (rlv_handler_t::isEnabled()) && 
+                                  ((LLAssetType::AT_LSL_TEXT == item->getType()) || (LLAssetType::AT_NOTECARD == item->getType())) && 
+                                  (!gRlvHandler.isDetachable(gObjectList.findObject(mPanel->getTaskUUID()))) )
+                {
+                        disabled_items.push_back(std::string("Task Open"));
+                }
+// [/RLVa:KB]
         }
         items.push_back(std::string("Task Properties"));
         if(isItemRenameable())
@@ -1192,12 +1260,20 @@ LLTaskLSLBridge::LLTaskLSLBridge(
 
 void LLTaskLSLBridge::openItem()
 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
+        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         llinfos << "LLTaskLSLBridge::openItem() " << mUUID << llendl;
         if(LLLiveLSLEditor::show(mUUID, mPanel->getTaskUUID()))
         {
                 return;
         }
-        LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
+//      LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
         if(!object || object->isInventoryPending())
         {
                 return;
@@ -1312,6 +1388,12 @@ void LLTaskNotecardBridge::openItem()
         {
                 return;
         }
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) || (!gRlvHandler.isDetachable(object))) )
+        {
+                return;
+        }
+// [/RLVa:KB]
         if(object->permModify() || gAgent.isGodlike())
         {
                 S32 left, top;
diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp
index 8bb100d..27bfaea 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -231,6 +231,12 @@ void LLPanelLandInfo::refresh()
 //static
 void LLPanelLandInfo::onClickClaim(void*)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                return;
+        }
+// [/RLVa:KB]
         LLViewerParcelMgr::getInstance()->startBuyLand();
 }
 
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 8bb7152..feb85a7 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -36,6 +36,9 @@
 
 #include "llpanelgeneral.h"
 
+#include "hippoGridManager.h"
+#include "floaterlogin.h"
+
 #include "indra_constants.h"            // for key and mask constants
 #include "llfontgl.h"
 #include "llmd5.h"
@@ -65,17 +68,24 @@
 #include "llviewernetwork.h"
 #include "llviewerwindow.h"                     // to link into child list
 #include "llnotify.h"
+#include "llappviewer.h"                                        // for gHideLinks
 #include "llurlsimstring.h"
 #include "lluictrlfactory.h"
 #include "llhttpclient.h"
 #include "llweb.h"
 #include "llwebbrowserctrl.h"
 
+#include "llfloaterhtml.h"
+
 #include "llfloaterhtmlhelp.h"
 #include "llfloatertos.h"
 
 #include "llglheaders.h"
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #define USE_VIEWER_AUTH 0
 
 const S32 BLACK_BORDER_HEIGHT = 160;
@@ -152,11 +162,6 @@ namespace {
         boost::intrusive_ptr< LLIamHereLogin > gResponsePtr = 0;
 };
 
-void set_start_location(LLUICtrl* ctrl, void* data)
-{
-    LLURLSimString::setString(ctrl->getValue().asString());
-}
-
 //---------------------------------------------------------------------------
 // Public methods
 //---------------------------------------------------------------------------
@@ -243,13 +248,13 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
                 combo->setCurrentByIndex( 0 );
         }
 
-        combo->setCommitCallback( &set_start_location );
 
         LLComboBox* server_choice_combo = sInstance->getChild<LLComboBox>("server_combo");
         server_choice_combo->setCommitCallback(onSelectServer);
-        server_choice_combo->setFocusLostCallback(onServerComboLostFocus);
+        //server_choice_combo->setFocusLostCallback(onServerComboLostFocus);
 
         childSetAction("connect_btn", onClickConnect, this);
+        childSetAction("grid_btn", onClickGrid, this);
 
         setDefaultBtn("connect_btn");
 
@@ -551,6 +556,7 @@ void LLPanelLogin::show(const LLRect &rect,
 
         // Make sure that focus always goes here (and use the latest sInstance that was just created)
         gFocusMgr.setDefaultKeyboardFocus(sInstance);
+        LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel());
 }
 
 // static
@@ -594,7 +600,7 @@ void LLPanelLogin::setFields(const std::string& firstname,
 
 
 // static
-void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
+void LLPanelLogin::addServer(const std::string& server)
 {
         if (!sInstance)
         {
@@ -602,17 +608,29 @@ void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
                 return;
         }
 
-        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
-        combo->add(server, LLSD(domain_name) );
-        combo->setCurrentByIndex(0);
-}
+        const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick();
 
+        LLComboBox *grids = sInstance->getChild<LLComboBox>("server_combo");
+        S32 selectIndex = -1, i = 0;
+        grids->removeall();
+        if (defaultGrid != "") {
+                grids->add(defaultGrid);
+                selectIndex = i++;
+        }
+        HippoGridManager::GridIterator it, end = gHippoGridManager->endGrid();
+        for (it = gHippoGridManager->beginGrid(); it != end; ++it) {
+                const std::string &grid = it->second->getGridNick();
+                if (grid != defaultGrid) {
+                        grids->add(grid);
+                        //if (grid == mCurGrid) selectIndex = i;
+                        i++;
+                }
+        }
+        grids->setCurrentByIndex(0);
 
-// static
-void LLPanelLogin::setServer(S32 domain_name)
-{
-        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
-        combo->setCurrentByIndex(domain_name);
+        //LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
+        //combo->add(server, LLSD(domain_name) );
+        //combo->setCurrentByIndex(0);
 }
 
 // static
@@ -690,10 +708,27 @@ void LLPanelLogin::refreshLocation( bool force_visible )
         if ( ! force_visible )
                 show_start = gSavedSettings.getBOOL("ShowStartLocation");
 
+
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+// TODO-RLVa: figure out some way to make this work with RLV_EXTENSION_STARTLOCATION
+#ifndef RLV_EXTENSION_STARTLOCATION
+                if (rlv_handler_t::isEnabled())
+                {
+                        show_start = FALSE;
+                }
+#endif // RLV_EXTENSION_STARTLOCATION
+// [/RLVa:KB]
+
+
         sInstance->childSetVisible("start_location_combo", show_start);
         sInstance->childSetVisible("start_location_text", show_start);
 
+/*#if LL_RELEASE_FOR_DOWNLOAD
+        BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
+        sInstance->childSetVisible("server_combo", show_server);
+#else*/
         sInstance->childSetVisible("server_combo", TRUE);
+//#endif
 
 #endif
 }
@@ -726,18 +761,39 @@ void LLPanelLogin::setAlwaysRefresh(bool refresh)
 }
 
 
+// static
+void LLPanelLogin::refreshLoginPage()
+{
+    if (!sInstance) return;
+
+    sInstance->childSetVisible("create_new_account_text",
+        !gHippoGridManager->getConnectedGrid()->getRegisterUrl().empty());
+    sInstance->childSetVisible("forgot_password_text",
+        !gHippoGridManager->getConnectedGrid()->getPasswordUrl().empty());
+
+    // kick off a request to grab the url manually
+        gResponsePtr = LLIamHereLogin::build(sInstance);
+        std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage();
+        if (!login_page.empty()) {
+                LLHTTPClient::head(login_page, gResponsePtr);
+        } else {
+                sInstance->setSiteIsAlive(false);
+        }
+}
+
 
 void LLPanelLogin::loadLoginPage()
 {
         if (!sInstance) return;
         
-        std::ostringstream oStr;
 
-        std::string login_page = gSavedSettings.getString("LoginPage");
-        if (login_page.empty())
-        {
-                login_page = sInstance->getString( "real_url" );
+        std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage();
+        if (login_page.empty()) {
+                sInstance->setSiteIsAlive(false);
+                return;
         }
+
+        std::ostringstream oStr;
         oStr << login_page;
         
         // Use the right delimeter depending on how LLURI parses the URL
@@ -772,11 +828,12 @@ void LLPanelLogin::loadLoginPage()
         curl_free(curl_version);
 
         // Grid
-        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridCodeName().c_str(), 0);
+        char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridLabel().c_str(), 0);
         oStr << "&grid=" << curl_grid;
         curl_free(curl_grid);
 
         gViewerWindow->setMenuBackgroundColor(false, !LLViewerLogin::getInstance()->isInProductionGrid());
+        //LLViewerLogin::getInstance()->setMenuColor();
         gLoginMenuBarView->setBackgroundColor(gMenuBarView->getBackgroundColor());
 
 
@@ -915,7 +972,15 @@ void LLPanelLogin::onClickConnect(void *)
                 }
         }
 }
+}
 
+void LLPanelLogin::onClickGrid(void *)
+{
+        if (sInstance && sInstance->mCallback)
+        {
+                LoginFloater::newShow(std::string("Test"), false);
+        }
+}
 
 // static
 bool LLPanelLogin::newAccountAlertCallback(const LLSD& notification, const LLSD& response)
@@ -983,7 +1048,7 @@ void LLPanelLogin::onPassKey(LLLineEditor* caller, void* user_data)
 }
 
 // static
-void LLPanelLogin::onSelectServer(LLUICtrl*, void*)
+void LLPanelLogin::onSelectServer(LLUICtrl* ctrl, void*)
 {
         // *NOTE: The paramters for this method are ignored. 
         // LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
@@ -992,46 +1057,29 @@ void LLPanelLogin::onSelectServer(LLUICtrl*, void*)
         // The user twiddled with the grid choice ui.
         // apply the selection to the grid setting.
         std::string grid_label;
-        S32 grid_index;
+        //S32 grid_index;
 
         LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
         LLSD combo_val = combo->getValue();
 
-        if (LLSD::TypeInteger == combo_val.type())
-        {
-                grid_index = combo->getValue().asInteger();
-
-                if ((S32)GRID_INFO_OTHER == grid_index)
-                {
-                        // This happens if the user specifies a custom grid
-                        // via command line.
-                        grid_label = combo->getSimple();
-                }
-        }
-        else
-        {
-                // no valid selection, return other
-                grid_index = (S32)GRID_INFO_OTHER;
-                grid_label = combo_val.asString();
-        }
+        std::string mCurGrid = ctrl->getValue().asString();
+        //KOW
+        gHippoGridManager->setCurrentGrid(mCurGrid);
+        // HippoGridInfo *gridInfo = gHippoGridManager->getGrid(mCurGrid);
+        // if (gridInfo) {
+        //      //childSetText("gridnick", gridInfo->getGridNick());
+        //      //platform->setCurrentByIndex(gridInfo->getPlatform());
+        //      //childSetText("gridname", gridInfo->getGridName());
+        //      LLPanelLogin::setFields( gridInfo->getFirstName(), gridInfo->getLastName(), gridInfo->getAvatarPassword(), 1 );
+        // }
 
-        // This new seelction will override preset uris
-        // from the command line.
-        LLViewerLogin* vl = LLViewerLogin::getInstance();
-        vl->resetURIs();
-        if(grid_index != GRID_INFO_OTHER)
-        {
-                vl->setGridChoice((EGridInfo)grid_index);
-        }
-        else
-        {
-                vl->setGridChoice(grid_label);
-        }
+        
+        llwarns << "current grid = " << mCurGrid << llendl;
 
         // grid changed so show new splash screen (possibly)
         loadLoginPage();
 }
-
+/*
 void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
 {
         LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
@@ -1040,3 +1088,4 @@ void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
                 onSelectServer(combo, NULL);    
         }
 }
+*/
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 8d5bf3a..f2c589d 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2009, Linden Research, Inc.
+ * Copyright (c) 2002-2008, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -63,8 +63,7 @@ public:
         static void setFields(const std::string& firstname, const std::string& lastname, 
                 const std::string& password);
 
-        static void addServer(const std::string& server, S32 domain_name);
-        static void setServer(S32 domain_name);
+        static void addServer(const std::string& server);
         static void refreshLocation( bool force_visible );
 
         static void getFields(std::string *firstname, std::string *lastname,
@@ -78,12 +77,14 @@ public:
         void setSiteIsAlive( bool alive );
 
         static void loadLoginPage();    
+        static void refreshLoginPage();
         static void giveFocus();
         static void setAlwaysRefresh(bool refresh); 
         static void mungePassword(LLUICtrl* caller, void* user_data);
         
 private:
         static void onClickConnect(void*);
+        static void onClickGrid(void*);
         static void onClickNewAccount(void*);
         static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response);
         static void onClickQuit(void*);
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index b0274e6..270a8ed 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -76,6 +76,10 @@
 
 #include "lldrawpool.h"
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+#include "llvoavatar.h"
+// [/RLVa:KB]
+
 //
 // Constants
 //
@@ -386,6 +390,15 @@ void LLPanelObject::getState( )
                 enable_rotate = FALSE;
         }
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP))) )
+        {
+                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                if ( (pAvatar) && (pAvatar->mIsSitting) && (pAvatar->getRoot() == objectp->getRootEdit()) )
+                        enable_move = enable_scale = enable_rotate = FALSE;
+        }
+// [/RLVa:KB]
+
         LLVector3 vec;
         if (enable_move)
         {
@@ -619,6 +632,10 @@ void LLPanelObject::getState( )
         }
         else
         {
+                mCtrlScaleX->setMaxValue(LLManipScale::getMaxPrimSize());
+                mCtrlScaleY->setMaxValue(LLManipScale::getMaxPrimSize());
+                mCtrlScaleZ->setMaxValue(LLManipScale::getMaxPrimSize());
+
                 // Only allowed to change these parameters for objects
                 // that you have permissions on AND are not attachments.
                 enabled = root_objectp->permModify();
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index da8c9a9..0cb5b9e 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -85,6 +85,7 @@ BOOL LLPanelPermissions::postBuild()
 
         
         this->childSetAction("button owner profile",LLPanelPermissions::onClickOwner,this);
+        this->childSetAction("button last owner profile",LLPanelPermissions::onClickLastOwner,this);
         this->childSetAction("button creator profile",LLPanelPermissions::onClickCreator,this);
 
         this->childSetAction("button set group",LLPanelPermissions::onClickGroup,this);
@@ -178,6 +179,11 @@ void LLPanelPermissions::refresh()
                 childSetEnabled("Owner Name",false);
                 childSetEnabled("button owner profile",false);
 
+                childSetEnabled("Last Owner:",false);
+                childSetText("Last Owner Name",LLStringUtil::null);
+                childSetEnabled("Last Owner Name",false);
+                childSetEnabled("button last owner profile",false);
+
                 childSetEnabled("Group:",false);
                 childSetText("Group Name",LLStringUtil::null);
                 childSetEnabled("Group Name",false);
@@ -297,6 +303,8 @@ void LLPanelPermissions::refresh()
         owners_identical = LLSelectMgr::getInstance()->selectGetOwner(mOwnerID, owner_name);
 
 //      llinfos << "owners_identical " << (owners_identical ? "TRUE": "FALSE") << llendl;
+        std::string last_owner_name;
+        LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, last_owner_name);
 
         if (mOwnerID.isNull())
         {
@@ -307,8 +315,8 @@ void LLPanelPermissions::refresh()
                 else
                 {
                         // Display last owner if public
-                        std::string last_owner_name;
-                        LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, last_owner_name);
+                        //std::string last_owner_name;
+                        //LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, last_owner_name);
 
                         // It should never happen that the last owner is null and the owner
                         // is null, but it seems to be a bug in the simulator right now. JC
@@ -320,9 +328,44 @@ void LLPanelPermissions::refresh()
                 }
         }
 
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+        bool fRlvEnableOwner = true;
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
+        {
+                // Only filter the owner name if: the selection is all owned by the same avie and not group owned
+                if ( (owners_identical) && (!LLSelectMgr::getInstance()->selectIsGroupOwned()) )
+                {
+                        owner_name = gRlvHandler.getAnonym(owner_name);
+                        fRlvEnableOwner = false;
+                }
+        }
+// [/RLVa:KB]
+
         childSetText("Owner Name",owner_name);
         childSetEnabled("Owner Name",TRUE);
-        childSetEnabled("button owner profile",owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
+//      childSetEnabled("button owner profile",owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+        childSetEnabled("button owner profile",
+                fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
+// [/RLVa:KB]
+
+        //if (owner_name != last_owner_name)
+// [RLVa:KB]
+        if ( (owner_name != last_owner_name) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
+// [/RLVa:KB]
+        {
+                childSetEnabled("Last Owner:", TRUE);
+                childSetText("Last Owner Name", last_owner_name);
+                childSetEnabled("Last Owner Name", TRUE);
+                childSetEnabled("button last owner profile", TRUE);
+        }
+        else
+        {
+                childSetEnabled("Last Owner:", FALSE);
+                childSetText("Last Owner Name", LLStringUtil::null);
+                childSetEnabled("Last Owner Name", FALSE);
+                childSetEnabled("button last owner profile", FALSE);
+        }
 
         // update group text field
         childSetEnabled("Group:",true);
@@ -839,7 +882,23 @@ void LLPanelPermissions::onClickOwner(void *data)
         }
         else
         {
-                LLFloaterAvatarInfo::showFromObject(self->mOwnerID);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                {
+                        LLFloaterAvatarInfo::showFromObject(self->mOwnerID);
+                }
+// [/RLVa:KB]
+//              LLFloaterAvatarInfo::showFromObject(self->mOwnerID);
+        }
+}
+
+void LLPanelPermissions::onClickLastOwner(void *data)
+{
+        LLPanelPermissions *self = (LLPanelPermissions *)data;
+
+        if ( self->mLastOwnerID.notNull() )
+        {
+                LLFloaterAvatarInfo::showFromObject(self->mLastOwnerID);
         }
 }
 
diff --git a/linden/indra/newview/llpanelpermissions.h b/linden/indra/newview/llpanelpermissions.h
index bb816ac..9aa5573 100644
--- a/linden/indra/newview/llpanelpermissions.h
+++ b/linden/indra/newview/llpanelpermissions.h
@@ -69,6 +69,7 @@ protected:
         static void onClickRelease(void*);
         static void onClickCreator(void*);
         static void onClickOwner(void*);
+        static void onClickLastOwner(void*);
         static void onClickGroup(void*);
         static void cbGroupID(LLUUID group_id, void* userdata);
         static void onClickDeedToGroup(void*);
diff --git a/linden/indra/newview/llpanelpick.cpp b/linden/indra/newview/llpanelpick.cpp
index 43ecd27..b26b51a 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -401,7 +401,10 @@ void LLPanelPick::refresh()
                 mEnabledCheck->setEnabled(godlike);
 
                 mSetBtn->setVisible(godlike);
-                mSetBtn->setEnabled(godlike);
+                //mSetBtn->setEnabled(godlike);
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                mSetBtn->setEnabled(godlike && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) );
+// [/RLVa:KB]
         }
         else
         {
@@ -418,7 +421,10 @@ void LLPanelPick::refresh()
                 mEnabledCheck->setEnabled(FALSE);
 
                 mSetBtn->setVisible(is_self);
-                mSetBtn->setEnabled(is_self);
+                //mSetBtn->setEnabled(is_self);
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                mSetBtn->setEnabled(is_self && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) );
+// [/RLVa]
         }
 }
 
@@ -456,6 +462,12 @@ void LLPanelPick::onClickLandmark(void* data)
 // static
 void LLPanelPick::onClickSet(void* data)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                return;
+        }
+// [/RLVa:KB]
     LLPanelPick* self = (LLPanelPick*)data;
 
         // Save location for later.
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 559ad2b..2e08cac 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -33,6 +33,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llchatbar.h"
+#include "llfloaterchat.h"
 #include "llprefschat.h"
 #include "lltexteditor.h"
 #include "llviewercontrol.h"
@@ -71,11 +73,11 @@ private:
         BOOL mPlayTypingAnim;
         BOOL mChatBubbles;
         BOOL mScriptErrorAsChat;
+        BOOL mChatChannel;
         F32     mConsoleOpacity;
         F32     mBubbleOpacity;
 };
 
-
 LLPrefsChatImpl::LLPrefsChatImpl()
         :       LLPanel(std::string("Chat Panel"))
 {
@@ -105,6 +107,7 @@ LLPrefsChatImpl::LLPrefsChatImpl()
         childSetValue("chat_full_width_check", gSavedSettings.getBOOL("ChatFullWidth"));
         childSetValue("close_chat_on_return_check", gSavedSettings.getBOOL("CloseChatOnReturn"));
         childSetValue("play_typing_animation", gSavedSettings.getBOOL("PlayTypingAnim"));
+        childSetValue("toggle_channel_control", gSavedSettings.getBOOL("ChatChannelSelect"));
         childSetValue("console_opacity", gSavedSettings.getF32("ConsoleBackgroundOpacity"));
         childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
 }
@@ -131,6 +134,7 @@ void LLPrefsChatImpl::refreshValues()
         mChatFullWidth = gSavedSettings.getBOOL("ChatFullWidth");
         mCloseChatOnReturn = gSavedSettings.getBOOL("CloseChatOnReturn");
         mPlayTypingAnim = gSavedSettings.getBOOL("PlayTypingAnim"); 
+        mChatChannel = gSavedSettings.getBOOL("ChatChannelSelect");
         mConsoleOpacity = gSavedSettings.getF32("ConsoleBackgroundOpacity");
         mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
 }
@@ -156,6 +160,7 @@ void LLPrefsChatImpl::cancel()
         gSavedSettings.setBOOL("ChatFullWidth", mChatFullWidth);
         gSavedSettings.setBOOL("CloseChatOnReturn", mCloseChatOnReturn);
         gSavedSettings.setBOOL("PlayTypingAnim", mPlayTypingAnim); 
+        gSavedSettings.setBOOL("ChatChannelSelect", mChatChannel); 
         gSavedSettings.setF32("ConsoleBackgroundOpacity", mConsoleOpacity);
         gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);     
 }
@@ -189,6 +194,18 @@ void LLPrefsChatImpl::apply()
         gSavedSettings.setF32("ConsoleBackgroundOpacity", childGetValue("console_opacity").asReal());
         gSavedSettings.setF32("ChatBubbleOpacity", childGetValue("bubble_chat_opacity").asReal());
 
+        BOOL chan_check = childGetValue("toggle_channel_control");
+        gSavedSettings.setBOOL("ChatChannelSelect", chan_check);
+        if (mChatChannel != chan_check)
+        {
+                if (gChatBar)
+                {
+                        gChatBar->toggleChannelControl();
+                        //LLFloaterChat::toggleHistoryChannelControl(); temporarily disable until working
+                }
+                mChatChannel = chan_check;
+        }
+
         refreshValues(); // member values become the official values and cancel becomes a no-op.
 }
 
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 4daead0..0c06122 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -47,6 +47,8 @@
 
 #include "lldirpicker.h"
 
+#include "hippoGridManager.h"
+
 class LLPrefsIMImpl : public LLPanel
 {
 public:
@@ -59,7 +61,7 @@ public:
         void cancel();
         void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email);
         void enableHistory();
-
+        
         static void onClickLogPath(void* user_data);
         static void onCommitLogging(LLUICtrl* ctrl, void* user_data);
 
@@ -120,6 +122,7 @@ BOOL LLPrefsIMImpl::postBuild()
         childSetValue("include_im_in_chat_history", gSavedSettings.getBOOL("IMInChatHistory"));
         childSetValue("show_timestamps_check", gSavedSettings.getBOOL("IMShowTimestamps"));
         childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
+        childSetValue("vertical-imtabs-toggle", gSavedSettings.getBOOL("VerticalIMTabs"));
 
         childSetText("log_path_string", gSavedPerAccountSettings.getString("InstantMessageLogPath"));
         childSetValue("log_instant_messages", gSavedPerAccountSettings.getBOOL("LogInstantMessages")); 
@@ -182,7 +185,7 @@ void LLPrefsIMImpl::apply()
 
                 gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));
 
-                gDirUtilp->setPerAccountChatLogsDir(gSavedSettings.getString("FirstName"), 
+                gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getCurrentGridNick(), gSavedSettings.getString("FirstName"), 
                                                                                         gSavedSettings.getString("LastName") );
                 LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
                 
@@ -215,6 +218,7 @@ void LLPrefsIMImpl::apply()
                         gAgent.sendReliableMessage();
                 }
         }
+        gSavedSettings.setBOOL("VerticalIMTabs", childGetValue("vertical-imtabs-toggle").asBoolean());
 }
 
 void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
@@ -260,6 +264,12 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e
         LLWStringUtil::replaceChar(busy_response, '^', '\n');
         LLWStringUtil::replaceChar(busy_response, '%', ' ');
         childSetText("busy_response", wstring_to_utf8str(busy_response));
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM))
+        {
+                childDisable("busy_response");
+        }
+// [/RLVa:KB]
 
         enableHistory();
 
diff --git a/linden/indra/newview/llpreview.cpp b/linden/indra/newview/llpreview.cpp
index 6d7082b..9961003 100644
--- a/linden/indra/newview/llpreview.cpp
+++ b/linden/indra/newview/llpreview.cpp
@@ -597,3 +597,32 @@ void LLMultiPreview::setAutoOpenInstance(LLMultiPreview* previewp, const LLUUID&
                 sAutoOpenPreviewHandles[id] = previewp->getHandle();
         }
 }
+
+void LLPreview::setAssetId(const LLUUID& asset_id)
+{
+        const LLViewerInventoryItem* item = getItem();
+        if(NULL == item)
+        {
+                return;
+        }
+
+        if(mObjectUUID.isNull())
+        {
+                // Update avatar inventory asset_id.
+                LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
+                new_item->setAssetUUID(asset_id);
+                gInventory.updateItem(new_item);
+                gInventory.notifyObservers();
+        }
+        else
+        {
+                // Update object inventory asset_id.
+                LLViewerObject* object = gObjectList.findObject(mObjectUUID);
+                if(NULL == object)
+                {
+                        llwarns << "LLPreview::setAssetId() called on unrecognized object, UUID : " << mObjectUUID << llendl;
+                        return;
+                }
+                object->updateViewerInventoryAsset(item, asset_id);
+        }
+}
diff --git a/linden/indra/newview/llpreview.h b/linden/indra/newview/llpreview.h
index ff084be..fba4ef2 100644
--- a/linden/indra/newview/llpreview.h
+++ b/linden/indra/newview/llpreview.h
@@ -84,6 +84,7 @@ public:
         void setItemID(const LLUUID& item_id);
         void setObjectID(const LLUUID& object_id);
         void setSourceID(const LLUUID& source_id);
+        void setAssetId(const LLUUID& asset_id);
         const LLViewerInventoryItem *getItem() const; // searches if not constructed with it
 
         static LLPreview* find(const LLUUID& item_uuid);
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index c148f17..4b8a151 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -438,6 +438,14 @@ void LLScriptEdCore::initMenu()
         menuItem->setMenuCallback(onBtnHelp, this);
         menuItem->setEnabledCallback(NULL);
 
+        menuItem = getChild<LLMenuItemCallGL>("Load from Disk");
+        menuItem->setMenuCallback(onBtnLoadFromDisc, this);
+        menuItem->setEnabledCallback(NULL);
+
+        menuItem = getChild<LLMenuItemCallGL>("Save to Disk");
+        menuItem->setMenuCallback(onBtnSaveToDisc, this);
+        menuItem->setEnabledCallback(NULL);
+
         menuItem = getChild<LLMenuItemCallGL>("LSL Wiki Help...");
         menuItem->setMenuCallback(onBtnDynamicHelp, this);
         menuItem->setEnabledCallback(NULL);
@@ -558,6 +566,7 @@ void LLScriptEdCore::setHelpPage(const std::string& help_string)
         if (!history_combo) return;
 
         LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
+        url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir());
         url_string.setArg("[LSL_STRING]", help_string);
 
         addHelpItemToHistory(help_string);
@@ -786,6 +795,7 @@ void LLScriptEdCore::onHelpComboCommit(LLUICtrl* ctrl, void* userdata)
 
                 LLWebBrowserCtrl* web_browser = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
                 LLUIString url_string = gSavedSettings.getString("LSLHelpURL");
+                url_string.setArg("[APP_DIRECTORY]", gDirUtilp->getWorkingDir());
                 url_string.setArg("[LSL_STRING]", help_string);
                 web_browser->navigateTo(url_string);
         }
@@ -835,6 +845,60 @@ void LLScriptEdCore::onBtnUndoChanges( void* userdata )
         }
 }
 
+void LLScriptEdCore::onBtnSaveToDisc( void* userdata )
+{
+
+        LLViewerStats::getInstance()->incStat( LLViewerStats::ST_LSL_SAVE_COUNT );
+
+   LLScriptEdCore* self = (LLScriptEdCore*) userdata;
+
+   if( self->mSaveCallback )
+   {
+      LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TEXT ) )
+        {
+                return;
+        }
+        
+                std::string filename = file_picker.getFirstFile();
+      std::string scriptText=self->mEditor->getText();
+          std::ofstream fout(filename.c_str());
+      fout<<(scriptText);
+      fout.close();
+      self->mSaveCallback( self->mUserdata, FALSE );
+         
+   }
+        
+}
+void LLScriptEdCore::onBtnLoadFromDisc( void* data )
+{
+
+        LLScriptEdCore* self = (LLScriptEdCore*) data;
+        
+        LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getOpenFile( LLFilePicker::FFLOAD_TEXT ) )
+        {
+                return;
+        }
+        
+        std::string filename = file_picker.getFirstFile();
+
+        std::ifstream fin(filename.c_str());
+        
+        std::string line;
+        std::string linetotal;
+        self->mEditor->clear();
+        while (!fin.eof())
+        { 
+                getline(fin,line);
+                line=line+"\n";
+                self->mEditor->insertText(line);
+
+        }
+        fin.close();
+        
+}
+
 void LLScriptEdCore::onSearchMenu(void* userdata)
 {
         LLScriptEdCore* sec = (LLScriptEdCore*)userdata;
@@ -1937,6 +2001,12 @@ void LLLiveLSLEditor::onRunningCheckboxClicked( LLUICtrl*, void* userdata )
         LLCheckBoxCtrl* runningCheckbox = self->getChild<LLCheckBoxCtrl>("running");
         BOOL running =  runningCheckbox->get();
         //self->mRunningCheckbox->get();
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        {
+                return;
+        }
+// [/RLVa:KB]
         if( object )
         {
                 LLMessageSystem* msg = gMessageSystem;
@@ -1962,6 +2032,12 @@ void LLLiveLSLEditor::onReset(void *userdata)
         LLLiveLSLEditor* self = (LLLiveLSLEditor*) userdata;
 
         LLViewerObject* object = gObjectList.findObject( self->mObjectID );
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        {
+                return;
+        }
+// [/RLV:KB]
         if(object)
         {
                 LLMessageSystem* msg = gMessageSystem;
@@ -2383,6 +2459,14 @@ void LLLiveLSLEditor::onLoad(void* userdata)
 void LLLiveLSLEditor::onSave(void* userdata, BOOL close_after_save)
 {
         LLLiveLSLEditor* self = (LLLiveLSLEditor*)userdata;
+
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(gObjectList.findObject(self->mObjectID))) )
+        {
+                return;
+        }
+// [/RLV:KB]
+
         self->mCloseAfterSave = close_after_save;
         self->saveIfNeeded();
 }
diff --git a/linden/indra/newview/llpreviewscript.h b/linden/indra/newview/llpreviewscript.h
index eb8b414..ee7d773 100644
--- a/linden/indra/newview/llpreviewscript.h
+++ b/linden/indra/newview/llpreviewscript.h
@@ -98,6 +98,8 @@ public:
         static void             doSave( void* userdata, BOOL close_after_save );
         static void             onBtnSave(void*);
         static void             onBtnUndoChanges(void*);
+        static void             onBtnSaveToDisc(void*);
+        static void             onBtnLoadFromDisc(void*);
         static void             onSearchMenu(void* userdata);
 
         static void             onUndoMenu(void* userdata);
diff --git a/linden/indra/newview/llprogressview.cpp b/linden/indra/newview/llprogressview.cpp
index bfd14f7..aa7a61f 100644
--- a/linden/indra/newview/llprogressview.cpp
+++ b/linden/indra/newview/llprogressview.cpp
@@ -228,7 +228,7 @@ void LLProgressView::onCancelButtonClicked(void*)
 {
         if (gAgent.getTeleportState() == LLAgent::TELEPORT_NONE)
         {
-                LLAppViewer::instance()->requestQuit();
+                LLAppViewer::instance()->requestLogout(true);
         }
         else
         {
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 480273f..e4f914f 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -3437,12 +3437,20 @@ void LLSelectMgr::deselectAllIfTooFar()
         }
 
         LLVector3d selectionCenter = getSelectionCenterGlobal();
-        if (gSavedSettings.getBOOL("LimitSelectDistance")
+
+//      if (gSavedSettings.getBOOL("LimitSelectDistance")
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+        BOOL fRlvFartouch = gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH) && gFloaterTools->getVisible();
+        if ( (gSavedSettings.getBOOL("LimitSelectDistance") || (fRlvFartouch) )
+// [/RLVa:KB]
                 && (!mSelectedObjects->getPrimaryObject() || !mSelectedObjects->getPrimaryObject()->isAvatar())
                 && !mSelectedObjects->isAttachment()
                 && !selectionCenter.isExactlyZero())
         {
-                F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance");
+//              F32 deselect_dist = gSavedSettings.getF32("MaxSelectDistance");
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+                F32 deselect_dist = (!fRlvFartouch) ? gSavedSettings.getF32("MaxSelectDistance") : 1.5f;
+// [/RLVa:KB]
                 F32 deselect_dist_sq = deselect_dist * deselect_dist;
 
                 LLVector3d select_delta = gAgent.getPositionGlobal() - selectionCenter;
@@ -4538,6 +4546,11 @@ extern LLGLdouble	gGLModelView[16];
 
 void LLSelectMgr::updateSilhouettes()
 {
+        if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights)
+        {
+                return;
+        }
+
         S32 num_sils_genned = 0;
 
         LLVector3d      cameraPos = gAgent.getCameraPositionGlobal();
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index f8b8247..31b537c 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -577,7 +577,7 @@ void LLSpatialPartition::rebuildGeom(LLSpatialGroup* group)
                 return;
         }
 
-        if (group->changeLOD())
+        if (!LLPipeline::sSkipUpdate && group->changeLOD())
         {
                 group->mLastUpdateDistance = group->mDistance;
                 group->mLastUpdateViewAngle = group->mViewAngle;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index dae40dc..b862d61 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -30,7 +30,14 @@
  * $/LicenseInfo$
  */
 
-#include "llviewerprecompiledheaders.h"
+// #include "llviewerprecompiledheaders.h"
+
+
+#if LL_WINDOWS
+        #define WIN32_LEAN_AND_MEAN
+        #include <winsock2.h>
+        #include <windows.h>
+#endif
 
 #include "llstartup.h"
 
@@ -194,6 +201,8 @@
 #include "lldxhardware.h"
 #endif
 
+#include "hippoGridManager.h"
+#include "hippoLimits.h"
 //
 // exported globals
 //
@@ -226,7 +235,8 @@ static std::string sInitialOutfitGender;	// "male" or "female"
 static bool gUseCircuitCallbackCalled = false;
 
 EStartupState LLStartUp::gStartupState = STATE_FIRST;
-
+bool LLStartUp::mStartedOnce = false;
+bool LLStartUp::mShouldAutoLogin = false;
 
 //
 // local function declaration
@@ -249,7 +259,6 @@ void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S3
 bool callback_choose_gender(const LLSD& notification, const LLSD& response);
 void init_start_screen(S32 location_id);
 void release_start_screen();
-void reset_login();
 void apply_udp_blacklist(const std::string& csv);
 
 void callback_cache_name(const LLUUID& id, const std::string& firstname, const std::string& lastname, BOOL is_group, void* data)
@@ -323,6 +332,7 @@ bool idle_startup()
         static S32 timeout_count = 0;
 
         static LLTimer login_time;
+        static LLFrameTimer wearables_timer;
 
         // until this is encapsulated, this little hack for the
         // auth/transform loop will do.
@@ -384,6 +394,11 @@ bool idle_startup()
                 // Initialize stuff that doesn't need data from simulators
                 //
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.1d
+                if ( (gSavedSettings.controlExists(RLV_SETTING_MAIN)) && (gSavedSettings.getBOOL(RLV_SETTING_MAIN)) )
+                        rlv_handler_t::setEnabled(TRUE);
+// [/RLVa:KB]
+
                 if (LLFeatureManager::getInstance()->isSafe())
                 {
                         LLNotifications::instance().add("DisplaySetToSafe");
@@ -674,7 +689,7 @@ bool idle_startup()
                         show_connect_box = 
                                 firstname.empty() || lastname.empty() || web_login_key.isNull();
                 }
-        else if(gSavedSettings.getLLSD("UserLoginInfo").size() == 3)
+        else if((gSavedSettings.getLLSD("UserLoginInfo").size() == 3) && !LLStartUp::shouldAutoLogin())
         {
             LLSD cmd_line_login = gSavedSettings.getLLSD("UserLoginInfo");
                         firstname = cmd_line_login[0].asString();
@@ -708,7 +723,6 @@ bool idle_startup()
                 else
                 {
                         // if not automatically logging in, display login dialog
-                        // a valid grid is selected
                         firstname = gSavedSettings.getString("FirstName");
                         lastname = gSavedSettings.getString("LastName");
                         password = LLStartUp::loadPasswordFromDisk();
@@ -738,10 +752,17 @@ bool idle_startup()
         if (STATE_LOGIN_SHOW == LLStartUp::getStartupState())
         {
                 LL_DEBUGS("AppInit") << "Initializing Window" << LL_ENDL;
+                sAuthUris.clear();
+                sAuthUriNum = -1;
                 
                 gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
 
                 timeout_count = 0;
+                
+                if(LLStartUp::shouldAutoLogin())
+                {
+                        show_connect_box = false;
+                }
 
                 if (show_connect_box)
                 {
@@ -828,6 +849,19 @@ bool idle_startup()
                         lastname = gLoginHandler.getLastName();
                         web_login_key = gLoginHandler.getWebLoginKey();
                 }
+                
+                /* Jacek - Grid manager stuff that's changed with 1.23
+                if(!gLoginHandler.mPassword.empty())
+                {
+                        firstname = gLoginHandler.mFirstName;
+                        lastname = gLoginHandler.mLastName;
+                        password = gLoginHandler.mPassword;
+                        
+                        gLoginHandler.mFirstName = "";
+                        gLoginHandler.mLastName = "";
+                        gLoginHandler.mPassword = "";
+                        LLStartUp::setShouldAutoLogin(false);
+                }*/
                                 
                 if (show_connect_box)
                 {
@@ -845,13 +879,14 @@ bool idle_startup()
                         gSavedSettings.setString("FirstName", firstname);
                         gSavedSettings.setString("LastName", lastname);
 
-                        LL_INFOS("AppInit") << "Attempting login as: " << firstname << " " << lastname << LL_ENDL;
+                        //LL_INFOS("AppInit") << "Attempting login as: " << firstname << " " << lastname << " " << password << LL_ENDL;
                         gDebugInfo["LoginName"] = firstname + " " + lastname;   
                 }
 
+        gHippoGridManager->setCurrentGridAsConnected();
                 // create necessary directories
                 // *FIX: these mkdir's should error check
-                gDirUtilp->setLindenUserDir(firstname, lastname);
+                gDirUtilp->setLindenUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
         LLFile::mkdir(gDirUtilp->getLindenUserDir());
 
         // Set PerAccountSettingsFile to the default value.
@@ -882,7 +917,7 @@ bool idle_startup()
                         gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));         
                 }
                 
-                gDirUtilp->setPerAccountChatLogsDir(firstname, lastname);
+                gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
 
                 LLFile::mkdir(gDirUtilp->getChatLogsDir());
                 LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
@@ -933,6 +968,23 @@ bool idle_startup()
                 // their last location, or some URL "-url //sim/x/y[/z]"
                 // All accounts have both a home and a last location, and we don't support
                 // more locations than that.  Choose the appropriate one.  JC
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.1d
+                #ifndef RLV_EXTENSION_STARTLOCATION
+                if (rlv_handler_t::isEnabled())
+                #else
+                if ( (rlv_handler_t::isEnabled()) && (RlvSettings::getLoginLastLocation()) )
+                #endif // RLV_EXTENSION_STARTLOCATION
+                {
+                        // Force login at the last location
+                        agent_location_id = START_LOCATION_ID_LAST;
+                        location_which = START_LOCATION_ID_LAST;
+                        gSavedSettings.setBOOL("LoginLastLocation", FALSE);
+                        
+                        // Clear some things that would cause us to divert to a user-specified location
+                        LLURLSimString::setString(LLURLSimString::sLocationStringLast);
+                        LLStartUp::sSLURLCommand.clear();
+                } else
+// [/RLVa:KB]
                 if (LLURLSimString::parse())
                 {
                         // a startup URL was specified
@@ -1012,6 +1064,7 @@ bool idle_startup()
                 requested_options.push_back("event_categories");
                 requested_options.push_back("event_notifications");
                 requested_options.push_back("classified_categories");
+                requested_options.push_back("adult_compliant");
                 //requested_options.push_back("inventory-targets");
                 requested_options.push_back("buddy-list");
                 requested_options.push_back("ui-config");
@@ -1040,6 +1093,10 @@ bool idle_startup()
                 LLStringUtil::format_map_t args;
                 args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle();
                 auth_desc = LLTrans::getString("LoginInProgress", args);
+
+                //Since we are about to login, we don't want the client to attempt auto login
+                //again until the user does a grid2grid teleport.
+                LLStartUp::setShouldAutoLogin(false);
                 LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE );
         }
 
@@ -1079,13 +1136,30 @@ bool idle_startup()
                 hashed_mac.hex_digest(hashed_mac_string);
 
                 // TODO if statement here to use web_login_key
+                if(web_login_key.isNull()){
                 sAuthUriNum = llclamp(sAuthUriNum, 0, (S32)sAuthUris.size()-1);
                 LLUserAuth::getInstance()->authenticate(
                         sAuthUris[sAuthUriNum],
                         auth_method,
                         firstname,
                         lastname,                       
-                        password, // web_login_key,
+                        password, 
+                        //web_login_key,
+                        start.str(),
+                        gSkipOptionalUpdate,
+                        gAcceptTOS,
+                        gAcceptCriticalMessage,
+                        gLastExecEvent,
+                        requested_options,
+                        hashed_mac_string,
+                        LLAppViewer::instance()->getSerialNumber());
+                } else {
+                LLUserAuth::getInstance()->authenticate(
+                        sAuthUris[sAuthUriNum],
+                        auth_method,
+                        firstname,
+                        lastname,                        
+                        web_login_key,
                         start.str(),
                         gSkipOptionalUpdate,
                         gAcceptTOS,
@@ -1094,6 +1168,7 @@ bool idle_startup()
                         requested_options,
                         hashed_mac_string,
                         LLAppViewer::instance()->getSerialNumber());
+                }
 
                 // reset globals
                 gAcceptTOS = FALSE;
@@ -1153,7 +1228,6 @@ bool idle_startup()
                 LL_DEBUGS("AppInit") << "STATE_LOGIN_PROCESS_RESPONSE" << LL_ENDL;
                 std::ostringstream emsg;
                 bool quit = false;
-                bool update = false;
                 std::string login_response;
                 std::string reason_response;
                 std::string message_response;
@@ -1255,7 +1329,16 @@ bool idle_startup()
                                 if(reason_response == "update")
                                 {
                                         auth_message = LLUserAuth::getInstance()->getResponse("message");
-                                        update = true;
+                                        if (show_connect_box)
+                                        {
+                                                update_app(TRUE, auth_message);
+                                                LLStartUp::setStartupState( STATE_UPDATE_CHECK );
+                                                return false;
+                                        }
+                                        else
+                                        {
+                                                quit = true;
+                                        }
                                 }
                                 if(reason_response == "optional")
                                 {
@@ -1293,21 +1376,6 @@ bool idle_startup()
                         break;
                 }
 
-                if (update || gSavedSettings.getBOOL("ForceMandatoryUpdate"))
-                {
-                        gSavedSettings.setBOOL("ForceMandatoryUpdate", FALSE);
-                        if (show_connect_box)
-                        {
-                                update_app(TRUE, auth_message);
-                                LLStartUp::setStartupState( STATE_UPDATE_CHECK );
-                                return false;
-                        }
-                        else
-                        {
-                                quit = true;
-                        }
-                }
-
                 // Version update and we're not showing the dialog
                 if(quit)
                 {
@@ -1370,6 +1438,18 @@ bool idle_startup()
                                 // agent_access can be 'A', 'M', and 'PG'.
                                 gAgent.setMaturity(text[0]);
                         }
+                        else // we're on an older sim version (prolly an opensim)
+                        {
+                                text = LLUserAuth::getInstance()->getResponse("agent_access");
+                                if(!text.empty() && (text[0] == 'M'))
+                                {
+                                        gAgent.setTeen(false);
+                                }
+                                else
+                                {
+                                        gAgent.setTeen(true);
+                                }
+                        }
                         
                         // this is the value of their preference setting for that content
                         // which will always be <= agent_access_max
@@ -1540,6 +1620,42 @@ bool idle_startup()
                                 }
                         }
 
+            // Override grid info with anything sent in the login response
+                        std::string tmp = LLUserAuth::getInstance()->getResponse("gridname");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setGridName(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("loginuri");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setLoginUri(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("welcome");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setLoginPage(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("loginpage");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setLoginPage(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("economy");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setHelperUri(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("helperuri");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setHelperUri(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("about");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setWebSite(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("website");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setWebSite(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("help");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSupportUrl(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("support");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSupportUrl(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("register");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRegisterUrl(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("account");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRegisterUrl(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("password");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setPasswordUrl(tmp);
+                        tmp = LLUserAuth::getInstance()->getResponse("search");
+                        if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setSearchUrl(tmp);
+            tmp = LLUserAuth::getInstance()->getResponse("currency");
+            if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setCurrencySymbol(tmp);
+            tmp = LLUserAuth::getInstance()->getResponse("real_currency");
+            if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setRealCurrencySymbol(tmp);
+            tmp = LLUserAuth::getInstance()->getResponse("directory_fee");
+            if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setDirectoryFee(atoi(tmp.c_str()));
+            gHippoGridManager->saveFile();
 
                         // JC: gesture loading done below, when we have an asset system
                         // in place.  Don't delete/clear user_credentials until then.
@@ -1564,8 +1680,10 @@ bool idle_startup()
                                 LLSD args;
                                 args["ERROR_MESSAGE"] = emsg.str();
                                 LLNotifications::instance().add("ErrorMessage", args, LLSD(), login_alert_done);
-                                reset_login();
+                                LLStartUp::resetLogin();
                                 gSavedSettings.setBOOL("AutoLogin", FALSE);
+                                //this might be redundant
+                                LLStartUp::setShouldAutoLogin(false);
                                 show_connect_box = true;
                         }
                         
@@ -1584,8 +1702,10 @@ bool idle_startup()
                         LLSD args;
                         args["ERROR_MESSAGE"] = emsg.str();
                         LLNotifications::instance().add("ErrorMessage", args, LLSD(), login_alert_done);
-                        reset_login();
+                        LLStartUp::resetLogin();
                         gSavedSettings.setBOOL("AutoLogin", FALSE);
+                        //this might be redundant
+                        LLStartUp::setShouldAutoLogin(false);
                         show_connect_box = true;
                 }
                 return FALSE;
@@ -1597,6 +1717,7 @@ bool idle_startup()
         if (STATE_WORLD_INIT == LLStartUp::getStartupState())
         {
                 set_startup_status(0.40f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);
+                gDisconnected=FALSE;
                 display_startup();
                 // We should have an agent id by this point.
                 llassert(!(gAgentID == LLUUID::null));
@@ -1625,10 +1746,11 @@ bool idle_startup()
                 LLWaterParamManager::initClass();
 
                 // RN: don't initialize VO classes in drone mode, they are too closely tied to rendering
+
+                if (!LLStartUp::getStartedOnce())
                 LLViewerObject::initVOClasses();
 
                 display_startup();
-
                 // This is where we used to initialize gWorldp. Original comment said:
                 // World initialization must be done after above window init
 
@@ -1774,7 +1896,7 @@ bool idle_startup()
                 //reset statistics
                 LLViewerStats::getInstance()->resetStats();
 
-                if (!gNoRender)
+                if ((!gNoRender)&&(!LLStartUp::getStartedOnce()))
                 {
                         //
                         // Set up all of our statistics UI stuff.
@@ -2073,6 +2195,7 @@ bool idle_startup()
                                 }
                         }
                 }
+
                 options.clear();
                 bool show_hud = false;
                 if(LLUserAuth::getInstance()->getOptions("tutorial_setting", options))
@@ -2154,6 +2277,7 @@ bool idle_startup()
                 // Create the inventory views
                 llinfos << "Creating Inventory Views" << llendl;
                 LLInventoryView::showAgentInventory();
+                llinfos << "Inventory Views Created" << llendl;
 
                 // Hide the inventory if it wasn't shown at exit
                 if(!shown_at_exit)
@@ -2217,7 +2341,7 @@ bool idle_startup()
                         gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
                 };
 
-                if (!gNoRender)
+                if ((!gNoRender)&&(!LLStartUp::getStartedOnce()))
                 {
                         // JC: Initializing audio requests many sounds for download.
                         init_audio();
@@ -2377,25 +2501,11 @@ bool idle_startup()
                         LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender );
                 }
 
-
-                // We now have an inventory skeleton, so if this is a user's first
-                // login, we can start setting up their clothing and avatar 
-                // appearance.  This helps to avoid the generic "Ruth" avatar in
-                // the orientation island tutorial experience. JC
-                if (gAgent.isFirstLogin()
-                        && !sInitialOutfit.empty()    // registration set up an outfit
-                        && !sInitialOutfitGender.empty() // and a gender
-                        && gAgent.getAvatarObject()       // can't wear clothes without object
-                        && !gAgent.isGenderChosen() ) // nothing already loading
-                {
-                        // Start loading the wearables, textures, gestures
-                        LLStartUp::loadInitialOutfit( sInitialOutfit, sInitialOutfitGender );
-                }
-
                 // wait precache-delay and for agent's avatar or a lot longer.
                 if(((timeout_frac > 1.f) && gAgent.getAvatarObject())
                    || (timeout_frac > 3.f))
                 {
+                        wearables_timer.reset();
                         LLStartUp::setStartupState( STATE_WEARABLES_WAIT );
                 }
                 else
@@ -2417,7 +2527,6 @@ bool idle_startup()
 
         if (STATE_WEARABLES_WAIT == LLStartUp::getStartupState())
         {
-                static LLFrameTimer wearables_timer;
 
                 const F32 wearables_time = wearables_timer.getElapsedTimeF32();
                 const F32 MAX_WEARABLES_TIME = 10.f;
@@ -2500,6 +2609,10 @@ bool idle_startup()
 
                 // Have the agent start watching the friends list so we can update proxies
                 gAgent.observeFriends();
+
+                // Start loading inventory
+                gInventory.startBackgroundFetch();
+
                 if (gSavedSettings.getBOOL("LoginAsGod"))
                 {
                         gAgent.requestEnterGodMode();
@@ -2525,6 +2638,7 @@ bool idle_startup()
                 LLUserAuth::getInstance()->reset();
 
                 LLStartUp::setStartupState( STATE_STARTED );
+                LLStartUp::setStartedOnce(true);
 
                 // Unmute audio if desired and setup volumes.
                 // Unmute audio if desired and setup volumes.
@@ -2541,7 +2655,6 @@ bool idle_startup()
                 gDebugView->mFastTimerView->setVisible(TRUE);
 #endif
 
-                LLAppViewer::instance()->handleLoginComplete();
 
                 return TRUE;
         }
@@ -2571,14 +2684,15 @@ void login_show()
         // UI textures have been previously loaded in doPreloadImages()
         
         LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL;
-        LL_INFOS("AppInit") << "getGridChoice is " << LLViewerLogin::getInstance()->getGridChoice() << LL_ENDL;
 
+        //KOW
+/*
         LLViewerLogin* vl = LLViewerLogin::getInstance();
-        for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index)
+        for(int grid_index = 1; grid_index < GRID_INFO_OTHER; ++grid_index)
         {
-                LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index);
+                LLPanelLogin::addServer(vl->getKnownGridLabel(grid_index), grid_index);
         }
-        LLPanelLogin::setServer(LLViewerLogin::getInstance()->getGridChoice()-1);
+*/
 }
 
 // Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.
@@ -2885,8 +2999,6 @@ bool update_dialog_callback(const LLSD& notification, const LLSD& response)
                 if (mandatory)
                 {
                         LLAppViewer::instance()->forceQuit();
-                        // Bump them back to the login screen.
-                        //reset_login();
                 }
                 else
                 {
@@ -2914,7 +3026,7 @@ bool update_dialog_callback(const LLSD& notification, const LLSD& response)
         // *NOTE: This URL is also used in win_setup/lldownloader.cpp
         LLURI update_url = LLURI::buildHTTP("secondlife.com", 80, "update.php", query_map);
         
-        if(LLAppViewer::sUpdaterInfo)
+/*      if(LLAppViewer::sUpdaterInfo)
         {
                 delete LLAppViewer::sUpdaterInfo ;
         }
@@ -2987,14 +3099,16 @@ bool update_dialog_callback(const LLSD& notification, const LLSD& response)
         LL_DEBUGS("AppInit") << "Calling updater: " << LLAppViewer::sUpdaterInfo->mUpdateExePath << LL_ENDL;
 
         // Run the auto-updater.
-        system(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str()); /* Flawfinder: ignore */
-
+*/
+        //system(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str()); /* Flawfinder: ignore */
+/*
 #elif LL_LINUX || LL_SOLARIS
         OSMessageBox("Automatic updating is not yet implemented for Linux.\n"
                 "Please download the latest version from www.secondlife.com.",
                 LLStringUtil::null, OSMB_OK);
 #endif
         LLAppViewer::instance()->forceQuit();
+        */
         return false;
 }
 
@@ -3010,7 +3124,7 @@ void use_circuit_callback(void**, S32 result)
                         // Make sure user knows something bad happened. JC
                         LL_WARNS("AppInit") << "Backing up to login screen!" << LL_ENDL;
                         LLNotifications::instance().add("LoginPacketNeverReceived", LLSD(), LLSD(), login_alert_status);
-                        reset_login();
+                        LLStartUp::resetLogin();
                 }
                 else
                 {
@@ -3398,7 +3512,16 @@ void LLStartUp::setStartupState( EStartupState state )
 }
 
 
-void reset_login()
+//static
+void LLStartUp::setStartedOnce(bool started)
+{
+        mStartedOnce=started;
+}
+
+
+//displays the screen and cleans up UI
+// static
+void LLStartUp::resetLogin()
 {
         LLStartUp::setStartupState( STATE_LOGIN_SHOW );
 
diff --git a/linden/indra/newview/llstartup.h b/linden/indra/newview/llstartup.h
index fe347e9..28469d6 100644
--- a/linden/indra/newview/llstartup.h
+++ b/linden/indra/newview/llstartup.h
@@ -87,7 +87,10 @@ public:
         // Always use this to set gStartupState so changes are logged
         static void setStartupState( EStartupState state );
         static EStartupState getStartupState() { return gStartupState; };
-        static std::string getStartupStateString() { return startupStateToString(gStartupState); };
+        static void     resetLogin();
+
+        static void setStartedOnce(bool started);
+        static bool getStartedOnce() { return mStartedOnce;     };
 
         static void multimediaInit();
                 // Initialize LLViewerMedia multimedia engine.
@@ -114,8 +117,12 @@ public:
         static std::string sSLURLCommand;
                 // *HACK: On startup, if we were passed a secondlife://app/do/foo
                 // command URL, store it for later processing.
+        static bool shouldAutoLogin() { return mShouldAutoLogin; };
+        static void setShouldAutoLogin(bool value) { mShouldAutoLogin = value; };
 
 private:
+        static bool mStartedOnce;
+        static bool mShouldAutoLogin;
         static std::string startupStateToString(EStartupState state);
         static EStartupState gStartupState; // Do not set directly, use LLStartup::setStartupState
 };
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 971930d..b4076b9 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -572,6 +572,15 @@ void LLStatusBar::refresh()
                 mRegionDetails.mTraffic = 0.0f;
         }
 
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Modified: RLVa-1.0.0a
+        if ( (region) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ) // region == NULL if we loose our connection to the grid
+        {
+                // TODO-RLVa: find out whether the LCD code is still used because if so then we need to filter that as well
+                location_name = llformat("%s (%s) - %s", 
+                        rlv_handler_t::cstrHiddenRegion.c_str(), region->getSimAccessString().c_str(), rlv_handler_t::cstrHidden.c_str());
+        }
+// [/RLVa:KB]
+
         mTextParcelName->setText(location_name);
 
 
@@ -833,6 +842,12 @@ static void onClickScripts(void*)
 
 static void onClickBuyLand(void*)
 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+        {
+                return;
+        }
+// [/RLVa:KB]
         LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
         LLViewerParcelMgr::getInstance()->startBuyLand();
 }
diff --git a/linden/indra/newview/llstylemap.cpp b/linden/indra/newview/llstylemap.cpp
index a34b4b8..890bbf1 100644
--- a/linden/indra/newview/llstylemap.cpp
+++ b/linden/indra/newview/llstylemap.cpp
@@ -97,7 +97,7 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID& id, const std::string& link)
                         style->setColor(LLColor4::white);
                 (*this)[id] = style;
         }
-        else 
+        else
         {
                 LLStyleSP style = (*iter).second;
                 if ( style->getLinkHREF() != link )
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 97967c0..c4ea71e 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -355,6 +355,13 @@ void LLFloaterTexturePicker::updateImageStats()
                 {
                         mResolutionLabel->setTextArg("[DIMENSIONS]", std::string("[? x ?]"));
                 }
+                if (gAgent.isGodlike())
+                {
+                        std::string tstring = "Pick: ";
+                        std::string image_id_string = mTexturep->getID().asString();
+                        tstring = tstring + image_id_string.replace(24, 35, 12, '*'); // hide last segment to discourage theft
+                        setTitle(tstring);
+                }
         }
 }
 
diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp
index da9f3c5..6a3ada0 100644
--- a/linden/indra/newview/lltool.cpp
+++ b/linden/indra/newview/lltool.cpp
@@ -65,7 +65,6 @@ LLTool::~LLTool()
         }
 }
 
-
 BOOL LLTool::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         if (gDebugClicks)
@@ -125,6 +124,20 @@ BOOL LLTool::handleRightMouseUp(S32 x, S32 y, MASK mask)
         // llinfos << "LLTool::handleRightMouseDown" << llendl;
         return FALSE;
 }
+ 
+BOOL LLTool::handleMiddleMouseDown(S32 x,S32 y,MASK mask)
+{
+        // by default, didn't handle it
+        // llinfos << "LLTool::handleMiddleMouseDown" << llendl;
+        return FALSE;
+}
+
+BOOL LLTool::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
+{
+        // by default, didn't handle it
+        // llinfos << "LLTool::handleMiddleMouseUp" << llendl;
+        return FALSE;
+}
 
 BOOL LLTool::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
 {
diff --git a/linden/indra/newview/lltool.h b/linden/indra/newview/lltool.h
index 249088f..f954a8c 100644
--- a/linden/indra/newview/lltool.h
+++ b/linden/indra/newview/lltool.h
@@ -57,6 +57,9 @@ public:
         // Virtual functions inherited from LLMouseHandler
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
+        virtual BOOL    handleMiddleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL    handleMiddleMouseUp(S32 x, S32 y, MASK mask);
+
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks);
         virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/newview/lltoolbar.cpp b/linden/indra/newview/lltoolbar.cpp
index 33edb3e..cc6d4b8 100644
--- a/linden/indra/newview/lltoolbar.cpp
+++ b/linden/indra/newview/lltoolbar.cpp
@@ -471,6 +471,14 @@ void LLToolBar::onClickSit(void*)
         }
         else
         {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                // NOTE-RLVa: dead code?
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT))
+                {
+                        return;
+                }
+// [/RLVa:KB]
+
                 // stand up
                 gAgent.setFlying(FALSE);
                 gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 34831a2..c24dd78 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -1269,6 +1269,15 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target,
                 return;
         }
 
+
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+        // Fallback in case there's a new code path that leads here (see behaviour notes)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         //llinfos << "Rezzing object" << llendl;
         make_ui_sound("UISndObjectRezIn");
         LLViewerInventoryItem* item;
@@ -1961,6 +1970,23 @@ EAcceptance LLToolDragAndDrop::willObjectAcceptInventory(LLViewerObject* obj, LL
         BOOL volume = (LL_PCODE_VOLUME == obj->getPCode());
         BOOL attached = obj->isAttachment();
         BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE;
+
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if (rlv_handler_t::isEnabled())
+        {
+                if (!gRlvHandler.isDetachable(obj))
+                {
+                        return ACCEPT_NO_LOCKED;                // Disallow inventory drops on a locked attachment
+                }
+                else if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) )
+                {
+                        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                        if ( (pAvatar) && (pAvatar->mIsSitting) && (pAvatar->getRoot() == obj->getRootEdit()) )
+                                return ACCEPT_NO_LOCKED;        // ... or on a linkset the avie is sitting on under @unsit=n/@sittp=n
+                }
+        }
+// [/RLVa:KB]
+
         if(attached && !unrestricted)
         {
                 return ACCEPT_NO_LOCKED;
@@ -2092,6 +2118,15 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
                 return ACCEPT_NO;
         }
 
+// [RLVa:KB] - Checked: 2009-09-08 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
+        LLViewerJointAttachment* pAttachPt = NULL;
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) && (!RlvSettings::getEnableWear()) &&
+                 ( ((pAttachPt = gRlvHandler.getAttachPoint(item, true)) == NULL) || (!gRlvHandler.isDetachable(pAttachPt)) ) )
+        {
+                return ACCEPT_NO_LOCKED;
+        }
+// [/RLVa:KB]
+
         if( drop )
         {
                 if(mSource == SOURCE_LIBRARY)
@@ -2107,7 +2142,10 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
                 }
                 else
                 {
-                        rez_attachment(item, 0);
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-1.0.0c
+                        rez_attachment(item, pAttachPt);
+// [/RLVa:KB]
+                        //rez_attachment(item, 0);
                 }
         }
         return ACCEPT_YES_SINGLE;
@@ -2117,6 +2155,13 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
 EAcceptance LLToolDragAndDrop::dad3dRezObjectOnLand(
         LLViewerObject* obj, S32 face, MASK mask, BOOL drop)
 {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+        {
+                return ACCEPT_NO_LOCKED;
+        }
+// [/RLVa:KB]
+
         if (mSource == SOURCE_WORLD)
         {
                 return dad3dRezFromObjectOnLand(obj, face, mask, drop);
@@ -2180,6 +2225,14 @@ EAcceptance LLToolDragAndDrop::dad3dRezObjectOnLand(
 EAcceptance LLToolDragAndDrop::dad3dRezObjectOnObject(
         LLViewerObject* obj, S32 face, MASK mask, BOOL drop)
 {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+        // NOTE: if (mask & MASK_CONTROL) then it's a drop rather than a rez, so we let that pass through
+        if ( !(mask & MASK_CONTROL) && (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) )
+        {
+                return ACCEPT_NO_LOCKED;
+        }
+// [/RLVa:KB]
+
         // handle objects coming from object inventory
         if (mSource == SOURCE_WORLD)
         {
@@ -2385,6 +2438,20 @@ EAcceptance LLToolDragAndDrop::dad3dWearItem(
                         return ACCEPT_NO;
                 }
 
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
+                // (See behaviour notes for the "code path", this is just to give a visual indication on whether or not the drop is allowed)
+                if (rlv_handler_t::isEnabled())
+                {
+                        EWearableType type = (EWearableType)item->getFlags();
+
+                        // Block if: 1) we can't wear on that layer; 2) or if we're already wearing something there we can't take off
+                        if ( (!gRlvHandler.isWearable(type)) || ((gAgent.getWearable(type)) && (!gRlvHandler.isRemovable(type))) )
+                        {
+                                return ACCEPT_NO_LOCKED;
+                        }
+                }
+// [/RLVa:KB]
+
                 if( drop )
                 {
                         // Don't wear anything until initial wearables are loaded, can
@@ -2749,6 +2816,14 @@ EAcceptance LLToolDragAndDrop::dad3dGiveInventoryCategory(
 EAcceptance LLToolDragAndDrop::dad3dRezFromObjectOnLand(
         LLViewerObject* obj, S32 face, MASK mask, BOOL drop)
 {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+        // NOTE: it looks like this is only ever called from LLToolDragAndDrop::dad3dRezObjectOnLand() making this a bit redundant
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+        {
+                return ACCEPT_NO_LOCKED;
+        }
+// [/RLVa:KB]
+
         lldebugs << "LLToolDragAndDrop::dad3dRezFromObjectOnLand()" << llendl;
         LLViewerInventoryItem* item = NULL;
         LLViewerInventoryCategory* cat = NULL;
@@ -2770,6 +2845,14 @@ EAcceptance LLToolDragAndDrop::dad3dRezFromObjectOnLand(
 EAcceptance LLToolDragAndDrop::dad3dRezFromObjectOnObject(
         LLViewerObject* obj, S32 face, MASK mask, BOOL drop)
 {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+        // NOTE: it looks like this is only ever called from LLToolDragAndDrop::dad3dRezObjectOnObject) making this a bit redundant
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+        {
+                return ACCEPT_NO_LOCKED;
+        }
+// [/RLVa:KB]
+
         lldebugs << "LLToolDragAndDrop::dad3dRezFromObjectOnObject()" << llendl;
         LLViewerInventoryItem* item;
         LLViewerInventoryCategory* cat;
diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp
index d06e41c..3cddba7 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -100,6 +100,16 @@ void LLToolFace::pickCallback(const LLPickInfo& pick_info)
                         return;
                 }
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+                if ( (rlv_handler_t::isEnabled()) &&
+                         ( (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) || 
+                           ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && ((!hit_obj->isAttachment()) || (!hit_obj->permYouOwner())) && 
+                             (dist_vec_squared(gAgent.getPositionAgent(), hit_obj->getPositionRegion() + pick_info.mObjectOffset) > 1.5f * 1.5f) )))
+                {
+                        return;
+                }
+// [/RLVa:KB]
+
                 // ...clicked on a world object, try to pick the appropriate face
 
                 if (pick_info.mKeyMask & MASK_SHIFT)
diff --git a/linden/indra/newview/lltoolgrab.cpp b/linden/indra/newview/lltoolgrab.cpp
index ed9ca85..3437193 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -186,7 +186,12 @@ BOOL LLToolGrab::handleObjectHit(const LLPickInfo& info)
                 return FALSE;
         }
 
-        if (objectp->isAvatar())
+        //if (objectp->isAvatar())
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+        if ( (objectp->isAvatar()) ||
+                 ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && ((!objectp->isAttachment()) || (!objectp->permYouOwner())) &&
+                   (dist_vec_squared(gAgent.getPositionAgent(), mGrabPick.mIntersection) > 1.5f * 1.5f) ) )
+// [/RLVa:KB]
         {
                 if (gGrabTransientTool)
                 {
@@ -421,6 +426,23 @@ BOOL LLToolGrab::handleHover(S32 x, S32 y, MASK mask)
                 return TRUE;
         }
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0f
+        // Don't allow dragging beyond 1.5m under @fartouch=n
+        LLViewerObject* pObj;
+        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && (GRAB_INACTIVE != mMode) && (hasMouseCapture()) &&
+                 ((pObj = mGrabPick.getObject()) != NULL) && (!pObj->isDead()) && (!pObj->isHUDAttachment()) && 
+                 (dist_vec_squared(gAgent.getPositionAgent(), pObj->getPositionRegion() + mGrabPick.mObjectOffset) > 1.5f * 1.5f) )
+        {
+                if (gGrabTransientTool)
+                {
+                        // Prevent the grab tool from popping up as soon as we kill the drag operation
+                        gBasicToolset->selectTool(gGrabTransientTool);
+                        gGrabTransientTool = NULL;
+                }
+                setMouseCapture(FALSE);
+        }
+// [/RLVa:KB]
+
         // Do the right hover based on mode
         switch( mMode )
         {
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 60e40dd..f6c2eef 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -166,6 +166,15 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
         // If it's a left-click, and we have a special action, do it.
         if (useClickAction(always_show, mask, object, parent))
         {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+                // Block left-click special actions (fallback code really since LLToolSelect::handleObjectSelection() wouldn't select it anyway)
+                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) &&
+                         (dist_vec_squared(gAgent.getPositionAgent(), mPick.mIntersection) > 1.5f * 1.5f) )
+                {
+                        return TRUE;
+                }
+// [/RLVa:KB]
+
                 mClickAction = 0;
                 if (object && object->getClickAction()) 
                 {
@@ -182,7 +191,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                         // touch behavior down below...
                         break;
                 case CLICK_ACTION_SIT:
-                        if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) // agent not already sitting
+                        if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting) && !gSavedSettings.getBOOL("BlockClickSit")) // agent not already sitting
                         {
                                 handle_sit_or_stand();
                                 return TRUE;
@@ -362,7 +371,22 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                                 //gMutePieMenu->setLabel("Mute");
                         }
 
-                        gPieAvatar->show(x, y, mPieMouseButtonDown);
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0f
+#ifdef RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK
+                        // If we have an empty selection under @fartouch=n don't show the pie menu but play the "operation block" sound
+                        if ( (!gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) || (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) )
+                        {
+#endif // RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK
+                                gPieAvatar->show(x, y, mPieMouseButtonDown);
+#ifdef RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK
+                        }
+                        else
+                        {
+                                make_ui_sound("UISndInvalidOp");
+                        }
+#endif // RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK
+// [/RLVa:KB]
+
                 }
                 else if (object->isAttachment() && !object->isHUDAttachment())
                 {
@@ -392,15 +416,32 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                                 //gMuteObjectPieMenu->setLabel("Mute");
                         }
                         
-                        gPieObject->show(x, y, mPieMouseButtonDown);
-
-                        // VEFFECT: ShowPie object
-                        // Don't show when you click on someone else, it freaks them
-                        // out.
-                        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
-                        effectp->setPositionGlobal(mPick.mPosGlobal);
-                        effectp->setColor(LLColor4U(gAgent.getEffectColor()));
-                        effectp->setDuration(0.25f);
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0f
+                        #ifdef RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK
+                                // If we have an empty selection under @fartouch=n don't show the pie menu but play the "operation block" sound
+                                // (not entirely accurate in case of Tools / Select Only XXX [see LLToolSelect::handleObjectSelection()]
+                                if ( (!gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) || (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) )
+                                {
+                        #endif // RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK
+// [/RLVa:KB]
+                                        gPieObject->show(x, y, mPieMouseButtonDown);
+
+                                        // VEFFECT: ShowPie object
+                                        // Don't show when you click on someone else, it freaks them
+                                        // out.
+                                        LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
+                                        effectp->setPositionGlobal(mPick.mPosGlobal);
+                                        effectp->setColor(LLColor4U(gAgent.getEffectColor()));
+                                        effectp->setDuration(0.25f);
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0f
+                        #ifdef RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK
+                                }
+                                else
+                                {
+                                        make_ui_sound("UISndInvalidOp");
+                                }
+                        #endif // RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK
+// [/RLVa:KB]
                 }
         }
 
@@ -653,7 +694,7 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
                 llinfos << "LLToolPie handleDoubleClick (becoming mouseDown)" << llendl;
         }
 
-        if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
+        if (gSavedSettings.getBOOL("DoubleClickAutoPilot") || gSavedSettings.getBOOL("DoubleClickTeleport"))
         {
                 if (mPick.mPickType == LLPickInfo::PICK_LAND
                         && !mPick.mPosGlobal.isExactlyZero())
@@ -664,9 +705,10 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
                 else if (mPick.mObjectID.notNull()
                                  && !mPick.mPosGlobal.isExactlyZero())
                 {
-                        // Hit an object
-                        // HACK: Call the last hit position the point we hit on the object
-                        //gLastHitPosGlobal += gLastHitObjectOffset;
+                        //Zwagoth: No more teleport to HUD attachments. >:o
+                        if(mPick.getObject().notNull() && mPick.getObject()->isHUDAttachment())
+                                return FALSE;
+
                         handle_go_to();
                         return TRUE;
                 }
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index a053849..84e0203 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -125,6 +125,14 @@ BOOL LLToolPlacer::raycastForNewObjPos( S32 x, S32 y, LLViewerObject** hit_obj,
                 return FALSE;
         }
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+        // NOTE: don't use surface_pos_global since for prims it will be the center of the prim while we need center + offset
+        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && (dist_vec_squared(gAgent.getPositionGlobal(), pick.mPosGlobal) > 1.5f * 1.5f) )
+        {
+                return FALSE;
+        }
+// [/RLVa:KB]
+
         // Find the sim where the surface lives.
         LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromPosGlobal(surface_pos_global);
         if (!regionp)
@@ -256,7 +264,10 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
         {
                 flags |= FLAGS_USE_PHYSICS;
         }
-        if (create_selected)
+        //if (create_selected)
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b) | Added: RLVa-1.0.0b
+        if ( (create_selected) && (!gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) )
+// [/RLVa:KB]
         {
                 flags |= FLAGS_CREATE_SELECTED;
         }
@@ -514,6 +525,13 @@ BOOL LLToolPlacer::placeObject(S32 x, S32 y, MASK mask)
 {
         BOOL added = TRUE;
         
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+        {
+                return TRUE; // Callers seem to expect a "did you handle it?" so we return TRUE rather than FALSE
+        }
+// [/RLVa:KB]
+
         if (gSavedSettings.getBOOL("CreateToolCopySelection"))
         {
                 added = addDuplicate(x, y);
diff --git a/linden/indra/newview/lltoolselect.cpp b/linden/indra/newview/lltoolselect.cpp
index 80e9917..02755d7 100644
--- a/linden/indra/newview/lltoolselect.cpp
+++ b/linden/indra/newview/lltoolselect.cpp
@@ -51,6 +51,10 @@
 #include "llvoavatar.h"
 #include "llworld.h"
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+#include "llfloatertools.h"
+// [/RLVa:KB]
+
 // Globals
 extern BOOL gAllowSelectAvatar;
 
@@ -83,6 +87,51 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi
         {
                 object = object->getRootEdit();
         }
+
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+        if (rlv_handler_t::isEnabled())
+        {
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT))
+                {
+                        if (!temp_select)
+                        {
+                                return LLSelectMgr::getInstance()->getSelection();
+                        }
+                        else
+                        {
+                                // Temporary selection, but if the build floater is open then it'll be permanent so get rid of the floater
+                                if (gFloaterTools->getVisible())
+                                {
+                                        // Copy/paste from toggle_build_mode()
+                                        gAgent.resetView(false);
+                                        gFloaterTools->close();
+                                        gViewerWindow->showCursor();
+                                }
+                        }
+                }
+                
+                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && (object) && ((!object->isAttachment()) || (!object->permYouOwner())) &&
+                         (dist_vec_squared(gAgent.getPositionAgent(), object->getPositionRegion()) > 1.5f * 1.5f) )
+                {
+                        // NOTE-RLVa: see behaviour notes for a rather lengthy explanation of why we're doing things this way
+                        //if (dist_vec_squared(gAgent.getPositionAgent(), object->getPositionRegion() + pick.mObjectOffset) > 1.5f * 1.5f)
+                        if (dist_vec_squared(gAgent.getPositionAgent(), pick.mIntersection) > 1.5f * 1.5f)
+                        {
+                                if ( (gFloaterTools->getVisible()) && (pick.mKeyMask != MASK_SHIFT) && (pick.mKeyMask != MASK_CONTROL) )
+                                        LLSelectMgr::getInstance()->deselectAll();
+                                return LLSelectMgr::getInstance()->getSelection();
+                        }
+                        else if (gFloaterTools->getVisible())
+                        {
+                                // Copy/paste from toggle_build_mode()
+                                gAgent.resetView(false);
+                                gFloaterTools->close();
+                                gViewerWindow->showCursor();
+                        }
+                }
+        }
+// [/RLVa:KB]
+
         BOOL select_owned = gSavedSettings.getBOOL("SelectOwnedOnly");
         BOOL select_movable = gSavedSettings.getBOOL("SelectMovableOnly");
         
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp
index 8e81152..654510d 100644
--- a/linden/indra/newview/lltracker.cpp
+++ b/linden/indra/newview/lltracker.cpp
@@ -181,8 +181,12 @@ void LLTracker::render3D()
                 }
                 else
                 {
-                        renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, 
-                                                instance()->mBeaconText, instance()->mTrackedLocationName );
+                        //renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, 
+                        //                      instance()->mBeaconText, instance()->mTrackedLocationName );
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
+                        renderBeacon(instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, 
+                                (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLocationName : rlv_handler_t::cstrHidden);
+// [/RLVa:KB]
                 }
         }
 
@@ -223,8 +227,12 @@ void LLTracker::render3D()
                                         // and back again
                                         instance()->mHasReachedLandmark = FALSE;
                                 }
-                                renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, 
-                                                          instance()->mBeaconText, instance()->mTrackedLandmarkName );
+                                //renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, 
+                                //                        instance()->mBeaconText, instance()->mTrackedLandmarkName );
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
+                                renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor, instance()->mBeaconText, 
+                                        (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLandmarkName : rlv_handler_t::cstrHidden);
+// [/RLVa:KB]
                         }
                 }
                 else
@@ -252,8 +260,12 @@ void LLTracker::render3D()
                         }
                         else
                         {
-                                renderBeacon( av_tracker.getGlobalPos(), gTrackColor, 
-                                                        instance()->mBeaconText, av_tracker.getName() );
+                                //renderBeacon( av_tracker.getGlobalPos(), gTrackColor, 
+                                //                      instance()->mBeaconText, av_tracker.getName() );
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
+                                renderBeacon( av_tracker.getGlobalPos(), gTrackColor, instance()->mBeaconText, 
+                                        (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? av_tracker.getName() : rlv_handler_t::cstrHidden);
+// [/RLVa:KB]
                         }
                 }
                 else
diff --git a/linden/indra/newview/lluserauth.cpp b/linden/indra/newview/lluserauth.cpp
index 23965d1..b19692f 100644
--- a/linden/indra/newview/lluserauth.cpp
+++ b/linden/indra/newview/lluserauth.cpp
@@ -43,6 +43,7 @@
 #include "llviewerbuild.h"
 #include "llviewercontrol.h"
 #include "llxmlrpctransaction.h"
+#include "llmd5.h"
 
 // NOTE: MUST include these after otherincludes since queue gets redefined!?!!
 #include <curl/curl.h>
@@ -115,8 +116,25 @@ void LLUserAuth::authenticate(
         LL_INFOS2("AppInit", "Authentication") << option_str.str() << LL_ENDL;
 
         mAuthResponse = E_NO_RESPONSE_YET;
-        //mDownloadTimer.reset();
-        
+        //mDownloadTimer.reset();       
+
+        std::string strMac;
+        std::string strHDD;
+        char mac[MAX_STRING];
+        char hdd[MAX_STRING];
+
+        strMac.assign(web_login_key.asString());
+        strMac.append(hashed_mac.c_str());
+
+        strHDD.assign(web_login_key.asString());
+        strHDD.append(hashed_volume_serial.c_str());
+
+        LLMD5 md5Mac((const unsigned char *)strMac.c_str());
+        LLMD5 md5HDD((const unsigned char *)strHDD.c_str());
+
+        md5Mac.hex_digest(mac);
+        md5HDD.hex_digest(hdd);
+
         // create the request
         XMLRPC_REQUEST request = XMLRPC_RequestNew();
         XMLRPC_RequestSetMethodName(request, method.c_str());
@@ -131,9 +149,9 @@ void LLUserAuth::authenticate(
         XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
         XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
         XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
-        XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
+        XMLRPC_VectorAppendString(params, "mac", mac, 0);
         // A bit of security through obscurity: id0 is volume_serial
-        XMLRPC_VectorAppendString(params, "id0", hashed_volume_serial.c_str(), 0);
+        XMLRPC_VectorAppendString(params, "id0", hdd, 0);
         if (skip_optional)
         {
                 XMLRPC_VectorAppendString(params, "skipoptional", "true", 0);
@@ -202,7 +220,28 @@ void LLUserAuth::authenticate(
 
         mAuthResponse = E_NO_RESPONSE_YET;
         //mDownloadTimer.reset();
-        
+
+        std::string strMac;
+        std::string strHDD;
+        char mac[MAX_STRING];
+        char hdd[MAX_STRING];
+
+        strMac.assign(firstname);
+        strMac.append(lastname);
+        strMac.append(dpasswd.c_str());
+        strMac.append(hashed_mac.c_str());
+
+        strHDD.assign(firstname);
+        strHDD.append(lastname);
+        strHDD.append(dpasswd.c_str());
+        strHDD.append(hashed_volume_serial.c_str());
+
+        LLMD5 md5Mac((const unsigned char *)strMac.c_str());
+        LLMD5 md5HDD((const unsigned char *)strHDD.c_str());
+
+        md5Mac.hex_digest(mac);
+        md5HDD.hex_digest(hdd);
+
         // create the request
         XMLRPC_REQUEST request = XMLRPC_RequestNew();
         XMLRPC_RequestSetMethodName(request, method.c_str());
@@ -217,9 +256,9 @@ void LLUserAuth::authenticate(
         XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
         XMLRPC_VectorAppendString(params, "channel", gSavedSettings.getString("VersionChannelName").c_str(), 0);
         XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);
-        XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
+        XMLRPC_VectorAppendString(params, "mac", mac, 0);
         // A bit of security through obscurity: id0 is volume_serial
-        XMLRPC_VectorAppendString(params, "id0", hashed_volume_serial.c_str(), 0);
+        XMLRPC_VectorAppendString(params, "id0", hdd, 0);
         if (skip_optional)
         {
                 XMLRPC_VectorAppendString(params, "skipoptional", "true", 0);
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index a81def7..b9db346 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -432,6 +432,20 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
         return true;
 }
 
+// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
+bool rlvHandleEnableLegacyNamingChanged(const LLSD& newvalue)
+{
+        rlv_handler_t::fLegacyNaming = newvalue.asBoolean();
+        return true;
+}
+
+bool rlvHandleShowNameTagsChanged(const LLSD& newvalue)
+{
+        RlvSettings::fShowNameTags = newvalue.asBoolean();
+        return true;
+}
+// [/RLVa:KB]
+
 bool handleMediaDebugLevelChanged(const LLSD& newvalue)
 {
         LLMediaManager *mgr = LLMediaManager::getInstance();
@@ -578,6 +592,13 @@ void settings_setup_listeners()
         gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));     
         gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));     
+
+// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
+        if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))
+                gSavedSettings.getControl(RLV_SETTING_ENABLELEGACYNAMING)->getSignal()->connect(boost::bind(&rlvHandleEnableLegacyNamingChanged, _1));
+        if (gSavedSettings.controlExists(RLV_SETTING_SHOWNAMETAGS))
+                gSavedSettings.getControl(RLV_SETTING_SHOWNAMETAGS)->getSignal()->connect(boost::bind(&rlvHandleShowNameTagsChanged, _1));
+// [/RLVa:KB]
 }
 
 template <> eControlType get_control_type<U32>(const U32& in, LLSD& out) 
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index 977582b..3975290 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -719,7 +719,10 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                         gSky.updateSky();
                 }
 
-                if(gUseWireframe)
+//              if(gUseWireframe)
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                if ( (gUseWireframe) && ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment()) ) )
+// [/RLVa:KB]
                 {
                         glClearColor(0.5f, 0.5f, 0.5f, 0.f);
                         glClear(GL_COLOR_BUFFER_BIT);
@@ -878,7 +881,12 @@ void render_hud_attachments()
         glh::matrix4f current_mod = glh_get_current_modelview();
 
         // clamp target zoom level to reasonable values
-        gAgent.mHUDTargetZoom = llclamp(gAgent.mHUDTargetZoom, 0.1f, 1.f);
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        // TODO-RLVa: while hasLockedHUD() isn't slow this is called per frame so find a better way
+        gAgent.mHUDTargetZoom = llclamp(gAgent.mHUDTargetZoom, 
+                ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedHUD()) ) ? 0.1f : 0.85f, 1.f);
+// [/RLVa:KB]
+        //gAgent.mHUDTargetZoom = llclamp(gAgent.mHUDTargetZoom, 0.1f, 1.f);
         // smoothly interpolate current zoom level
         gAgent.mHUDCurZoom = lerp(gAgent.mHUDCurZoom, gAgent.mHUDTargetZoom, LLCriticalDamp::getInterpolant(0.03f));
 
diff --git a/linden/indra/newview/llviewerjointattachment.h b/linden/indra/newview/llviewerjointattachment.h
index b51058e..3fb9458 100644
--- a/linden/indra/newview/llviewerjointattachment.h
+++ b/linden/indra/newview/llviewerjointattachment.h
@@ -99,7 +99,9 @@ protected:
         void calcLOD();
         
 protected:
-        LLPointer<LLViewerObject> mAttachedObject;
+
+        // Backlink only; don't make this an LLPointer.
+        LLViewerObject* mAttachedObject;
         BOOL                    mVisibleInFirst;
         LLVector3               mOriginalPos;
         S32                             mGroup;
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index e9bd756..b129bff 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -176,6 +176,7 @@
 #include "lltool.h"
 #include "lltoolbar.h"
 #include "lltoolcomp.h"
+#include "lltoolface.h"
 #include "lltoolfocus.h"
 #include "lltoolgrab.h"
 #include "lltoolmgr.h"
@@ -218,6 +219,10 @@
 #include "llfloaternotificationsconsole.h"
 
 #include "lltexlayer.h"
+#include "primbackup.h"
+
+#include "jcfloater_animation_list.h"
+#include "llfloaterassetbrowser.h"
 
 using namespace LLVOAvatarDefines;
 void init_client_menu(LLMenuGL* menu);
@@ -229,6 +234,13 @@ void init_debug_ui_menu(LLMenuGL* menu);
 void init_debug_xui_menu(LLMenuGL* menu);
 void init_debug_avatar_menu(LLMenuGL* menu);
 void init_debug_baked_texture_menu(LLMenuGL* menu);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+#ifdef RLV_DEBUG_TESTS
+        #include "rlvtest.h"
+#endif // RLV_DEBUG_TESTS
+#include "rlvfloaterbehaviour.h"
+void init_debug_rlva_menu(LLMenuGL* menu);
+// [/RLVa:KB]
 
 BOOL enable_land_build(void*);
 BOOL enable_object_build(void*);
@@ -490,6 +502,7 @@ BOOL enable_detach(void*);
 BOOL enable_region_owner(void*);
 void menu_toggle_attached_lights(void* user_data);
 void menu_toggle_attached_particles(void* user_data);
+static void handle_go_to_callback(S32 option, void *userdata);
 
 class LLMenuParcelObserver : public LLParcelObserver
 {
@@ -572,6 +585,11 @@ void set_underclothes_menu_options()
 
 void init_menus()
 {
+        if (gMenuHolder)
+        {
+                cleanup_menus();
+        }
+
         S32 top = gViewerWindow->getRootView()->getRect().getHeight();
         S32 width = gViewerWindow->getRootView()->getRect().getWidth();
 
@@ -758,6 +776,7 @@ void init_client_menu(LLMenuGL* menu)
                 
                 sub->appendSeparator();
                 
+                // For Imprudence 1.3 - need to XUIfy
                 // Debugging view for unified notifications
                 sub->append(new LLMenuItemCallGL("Notifications Console...",
                                                  &handle_show_notifications_console, NULL, NULL, '5', MASK_CONTROL|MASK_SHIFT ));
@@ -842,6 +861,19 @@ void init_client_menu(LLMenuGL* menu)
         init_debug_world_menu(sub_menu);
         menu->appendMenu(sub_menu);
 
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.1b
+        #ifdef RLV_ADVANCED_MENU
+                if (rlv_handler_t::isEnabled())
+                {
+                        sub_menu = new LLMenuGL("RLVa");
+                        init_debug_rlva_menu(sub_menu);
+                        menu->appendMenu(sub_menu);
+                        sub_menu->setVisible(rlv_handler_t::isEnabled());
+                        sub_menu->setEnabled(rlv_handler_t::isEnabled());
+                }
+        #endif // RLV_ADVANCED_MENU
+// [/RLVa:KB]
+
         sub_menu = new LLMenuGL("UI");
         init_debug_ui_menu(sub_menu);
         menu->appendMenu(sub_menu);
@@ -936,6 +968,13 @@ void init_client_menu(LLMenuGL* menu)
                                                                                 &menu_check_control,
                                                                                 (void*)"ShowConsoleWindow"));
 
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-1.0.0e
+        #ifdef RLV_ADVANCED_TOGGLE_RLVA
+                if (gSavedSettings.controlExists(RLV_SETTING_MAIN))
+                        menu->append(new LLMenuItemCheckGL("Restrained Life API", &rlvToggleEnabled, NULL, &rlvGetEnabled, NULL));
+        #endif // RLV_ADVANCED_TOGGLE_RLVA
+// [/RLVa:KB]
+
         if(gSavedSettings.getBOOL("QAMode"))
         {
                 LLMenuGL* sub = NULL;
@@ -1023,12 +1062,15 @@ extern BOOL gDebugSelectMgr;
 
 void init_debug_ui_menu(LLMenuGL* menu)
 {
-        menu->append(new LLMenuItemCheckGL("Rotate Mini-Map", menu_toggle_control, NULL, menu_check_control, (void*)"MiniMapRotate"));
+        // For Imprudence 1.3 - need to XUIfy
         menu->append(new LLMenuItemCheckGL("Use default system color picker", menu_toggle_control, NULL, menu_check_control, (void*)"UseDefaultColorPicker"));
+        // For Imprudence 1.3 - need to XUIfy
         menu->append(new LLMenuItemCheckGL("Show search panel in overlay bar", menu_toggle_control, NULL, menu_check_control, (void*)"ShowSearchBar"));
         menu->appendSeparator();
 
+        // For Imprudence 1.3 - need to XUIfy
         menu->append(new LLMenuItemCallGL("Web Browser Test", &handle_web_browser_test));
+        // For Imprudence 1.3 - need to XUIfy
         // 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));
@@ -1054,6 +1096,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"));
+        // For Imprudence 1.3 - need to XUIfy
         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"));
         
@@ -1063,6 +1106,7 @@ void init_debug_ui_menu(LLMenuGL* menu)
 void init_debug_xui_menu(LLMenuGL* menu)
 {
         menu->append(new LLMenuItemCallGL("Floater Test...", LLFloaterTest::show));
+        // For Imprudence 1.3 - need to XUIfy
         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));        
@@ -1193,6 +1237,7 @@ void init_debug_rendering_menu(LLMenuGL* menu)
         sub_menu->append(new LLMenuItemCheckGL("Octree",        &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_OCTREE));
+        // For Imprudence 1.3 - need to XUIfy
         sub_menu->append(new LLMenuItemCheckGL("Shadow Frusta", &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA));
@@ -1365,14 +1410,17 @@ 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));
+        // For Imprudence 1.3 - need to XUIfy
         menu->append(new LLMenuItemCheckGL("Show Collision Skeleton",
                                                                            &LLPipeline::toggleRenderDebug, NULL,
                                                                            &LLPipeline::toggleRenderDebugControl,
                                                                            (void*)LLPipeline::RENDER_DEBUG_AVATAR_VOLUME));
+        // For Imprudence 1.3 - need to XUIfy
         menu->append(new LLMenuItemCheckGL("Display Agent Target",
                                                                            &LLPipeline::toggleRenderDebug, NULL,
                                                                            &LLPipeline::toggleRenderDebugControl,
                                                                            (void*)LLPipeline::RENDER_DEBUG_AGENT_TARGET));
+        // For Imprudence 1.3 - need to XUIfy
         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 ));
@@ -1390,10 +1438,58 @@ void init_debug_baked_texture_menu(LLMenuGL* menu)
         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*) TEX_LOWER_BAKED));
         menu->append(new LLMenuItemCallGL("Skirt", handle_grab_texture, enable_grab_texture, (void*) TEX_SKIRT_BAKED));
+    // For Imprudence 1.3 - need to XUIfy
         menu->append(new LLMenuItemCallGL("Hair", handle_grab_texture, enable_grab_texture, (void*) TEX_HAIR_BAKED));
         menu->createJumpKeys();
 }
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-1.0.0g
+void init_debug_rlva_menu(LLMenuGL* menu)
+{
+        // Debug options
+        {
+                LLMenuGL* pDbgMenu = new LLMenuGL("Debug");
+
+                if (gSavedSettings.controlExists(RLV_SETTING_DEBUG))
+                        pDbgMenu->append(new LLMenuItemCheckGL("Show Debug Messages", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_DEBUG));
+                pDbgMenu->appendSeparator();
+                if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))
+                        pDbgMenu->append(new LLMenuItemCheckGL("Enable Legacy Naming", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_ENABLELEGACYNAMING));
+
+                menu->appendMenu(pDbgMenu);
+                menu->appendSeparator();
+        }
+
+        #ifdef RLV_EXTENSION_ENABLE_WEAR
+                if (gSavedSettings.controlExists(RLV_SETTING_ENABLEWEAR))
+                        menu->append(new LLMenuItemCheckGL("Enable Wear", menu_toggle_control, rlvEnableWearEnabler, menu_check_control, (void*)RLV_SETTING_ENABLEWEAR));
+                menu->appendSeparator();
+        #endif // RLV_EXTENSION_ENABLE_WEAR
+
+        #ifdef RLV_EXTENSION_HIDELOCKED
+                if ( (gSavedSettings.controlExists(RLV_SETTING_HIDELOCKEDLAYER)) && 
+                         (gSavedSettings.controlExists(RLV_SETTING_HIDELOCKEDATTACH)) )
+                {
+                        menu->append(new LLMenuItemCheckGL("Hide locked layers", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_HIDELOCKEDLAYER));
+                        menu->append(new LLMenuItemCheckGL("Hide locked attachments", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_HIDELOCKEDATTACH));
+                        //sub_menu->append(new LLMenuItemToggleGL("Hide locked inventory", &rlv_handler_t::fHideLockedInventory));
+                        menu->appendSeparator();
+                }
+        #endif // RLV_EXTENSION_HIDELOCKED
+
+        if (gSavedSettings.controlExists(RLV_SETTING_FORBIDGIVETORLV))
+                menu->append(new LLMenuItemCheckGL("Forbid Give to #RLV", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_FORBIDGIVETORLV));
+        if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))
+                menu->append(new LLMenuItemCheckGL("Show Name Tags", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_SHOWNAMETAGS));
+        menu->appendSeparator();
+
+        #ifdef RLV_EXTENSION_FLOATER_RESTRICTIONS
+                // TODO-RLVa: figure out a way to tell if floater_rlv_behaviour.xml exists
+                menu->append(new LLMenuItemCallGL("Restrictions...", RlvFloaterBehaviour::show, NULL, NULL));
+        #endif // RLV_EXTENSION_FLOATER_RESTRICTIONS
+}
+// [/RLVa:KB]
+
 void init_server_menu(LLMenuGL* menu)
 {
         {
@@ -1546,6 +1642,16 @@ class LLObjectTouch : public view_listener_t
 
                 LLPickInfo pick = LLToolPie::getInstance()->getPick();
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0f
+                // TODO-RLVa: this code is rather redundant since we'll never get an active selection to show a pie menu for
+                // [msg->addVector3("Position", pick.mIntersection) <- see llDetectedTouchPos()]
+                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && ((!object->isAttachment()) || (!object->permYouOwner())) &&
+                         (dist_vec_squared(gAgent.getPositionAgent(), pick.mIntersection) > 1.5f * 1.5f)        )
+                {
+                        return true;    // Can't touch in-world objects (or other avie's attachments) farther than 1.5m away under @fartouch=n
+                }
+// [/RLVa:KB]
+
                 LLMessageSystem *msg = gMessageSystem;
 
                 msg->newMessageFast(_PREHASH_ObjectGrab);
@@ -1594,6 +1700,14 @@ class LLObjectEnableTouch : public view_listener_t
         {
                 LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 bool new_value = obj && obj->flagHandleTouch();
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0f
+                // TODO-RLVa: this code is rather redundant since we'll never get an active selection to show a pie menu for
+                if ( (new_value) && (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && ((!obj->isAttachment()) || (!obj->permYouOwner())) &&
+                         (dist_vec_squared(gAgent.getPositionAgent(), LLToolPie::getInstance()->getPick().mIntersection) > 1.5f * 1.5f) )
+                {
+                        new_value = false;      // Can't touch in-world objects (or other avie's attachments) farther than 1.5m away under @fartouch=n
+                }
+// [/RLVa:KB]
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
 
                 // Update label based on the node touch name if available.
@@ -1667,6 +1781,14 @@ class LLObjectOpen : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b)
+                // TODO-RLVa: shouldn't we be checking for fartouch here as well?
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT))
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 return handle_object_open();
         }
 };
@@ -1685,6 +1807,12 @@ class LLObjectEnableOpen : public view_listener_t
                         if (!root) new_value = false;
                         else new_value = root->allowOpen();
                 }
+
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b) | Modified: RLVa-1.0.0b
+                // TODO-RLV: shouldn't we be checking for fartouch here as well? (and LLViewerObject::allowOpen() makes this redundant?)
+                new_value &= !gRlvHandler.hasBehaviour(RLV_BHVR_EDIT);
+// [/RLVa:KB]
+
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -1746,7 +1874,13 @@ bool toggle_build_mode()
                         }
                 }
 
-                
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) && (LLSelectMgr::getInstance()) )
+                {
+                        LLSelectMgr::getInstance()->deselectAll();
+                }
+// [/RLVa:KB]
+
                 LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
                 LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCompCreate::getInstance() );
 
@@ -1846,6 +1980,23 @@ class LLObjectEdit : public view_listener_t
         {
                 LLViewerParcelMgr::getInstance()->deselectLand();
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+                if (rlv_handler_t::isEnabled())
+                {
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT))
+                        {
+                                return true;    // Can't edit any object under @edit=n
+                        }
+                        else if ( (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) &&
+                                  (SELECT_TYPE_WORLD == LLSelectMgr::getInstance()->getSelection()->getSelectType()) &&
+                                          (dist_vec_squared(gAgent.getPositionAgent(), LLToolPie::getInstance()->getPick().mIntersection) > 1.5f * 1.5f) )
+                        {
+                                // TODO-RLVa: this code is rather redundant since we'll never get an active selection to show a pie menu for
+                                return true;    // Can't edit in-world objects farther than 1.5m away under @fartouch=n
+                        }
+                }
+// [/RLVa:KB]
+
                 if (gAgent.getFocusOnAvatar() && !LLToolMgr::getInstance()->inEdit())
                 {
                         LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
@@ -1995,6 +2146,22 @@ class LLEnableEdit : public view_listener_t
                         enable = LLViewerParcelMgr::getInstance()->agentCanBuild()
                                 || LLSelectMgr::getInstance()->getSelection()->isAttachment();
                 }
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+                // TODO-RLV: include fartouch here?
+                if ( (rlv_handler_t::isEnabled()) && (enable) )
+                {
+                        // We have no way of knowing whether we're being called for "Create" or for "Edit", but we can
+                        // make an educated guess based on the currently active selection which puts us halfway there.
+                        BOOL fActiveSelection = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
+
+                        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) && (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) )
+                                enable = false; // Edit and rez restricted, disable them both
+                        else if ( (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) && (fActiveSelection) )
+                                enable = false; // Edit restricted and there's an active selection => disable Edit and Create
+                        else if ( (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) && (!fActiveSelection) )
+                                enable = false; // Rez restricted and there's no active selection => disable Create
+                }
+// [/RLVa:KB]
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(enable);
                 return true;
         }
@@ -2022,7 +2189,10 @@ class LLSelfEnableRemoveAllAttachments : public view_listener_t
                         {
                                 LLVOAvatar::attachment_map_t::iterator curiter = iter++;
                                 LLViewerJointAttachment* attachment = curiter->second;
-                                if (attachment->getObject())
+//                              if (attachment->getObject())
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0c
+                                if ( (attachment->getObject()) && ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.isDetachable(curiter->first)) ) )
+// [/RLVa:KB]
                                 {
                                         new_value = true;
                                         break;
@@ -2069,6 +2239,9 @@ class LLObjectEnableMute : public view_listener_t
                                 BOOL is_linden = lastname && !LLStringUtil::compareStrings(lastname->getString(), "Linden");
                                 BOOL is_self = avatar->isSelf();
                                 new_value = !is_linden && !is_self;
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                                new_value &= (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+// [/RLVa:KB]
                         }
                 }
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
@@ -2089,6 +2262,12 @@ class LLObjectMute : public view_listener_t
                 LLVOAvatar* avatar = find_avatar_from_object(object); 
                 if (avatar)
                 {
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-1.0.0e
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                        {
+                                return true;    // Fallback code [see LLObjectEnableMute::handleEvent()]
+                        }
+// [/RLVa:KB]
                         id = avatar->getID();
 
                         LLNameValue *firstname = avatar->getNVPair("FirstName");
@@ -2137,37 +2316,186 @@ class LLObjectMute : public view_listener_t
         }
 };
 
-bool handle_go_to()
+class LLObjectEnableCopyUUID : public view_listener_t
 {
-        // JAMESDEBUG try simulator autopilot
-        std::vector<std::string> strings;
-        std::string val;
-        LLVector3d pos = LLToolPie::getInstance()->getPick().mPosGlobal;
-        val = llformat("%g", pos.mdV[VX]);
-        strings.push_back(val);
-        val = llformat("%g", pos.mdV[VY]);
-        strings.push_back(val);
-        val = llformat("%g", pos.mdV[VZ]);
-        strings.push_back(val);
-        send_generic_message("autopilot", strings);
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                bool new_value = (object != NULL);
+        
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+
+class LLObjectCopyUUID : public view_listener_t
+{
+    bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+    {  
+                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+        if (!object) return true;
+
+        LLUUID id = object->getID();
 
-        LLViewerParcelMgr::getInstance()->deselectLand();
+        char buffer[UUID_STR_LENGTH];
+        id.toString(buffer);
 
-        if (gAgent.getAvatarObject() && !gSavedSettings.getBOOL("AutoPilotLocksCamera"))
+        
+                gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer));
+
+        LLSelectMgr::getInstance()->deselectAll();
+        return true;
+    }
+};
+
+
+class LLObjectEnableExport : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                gAgent.setFocusGlobal(gAgent.getFocusTargetGlobal(), gAgent.getAvatarObject()->getID());
+                LLControlVariable* control = 
+                        gMenuHolder->findControl(userdata["control"].asString());
+
+                LLViewerObject* object =
+                        LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+
+                if((object != NULL) &&
+                   (find_avatar_from_object(object) == NULL))
+                {
+                        struct ff : public LLSelectedNodeFunctor
+                        {
+                                virtual bool apply(LLSelectNode* node)
+                                {
+                                        return primbackup::check_perms( node );
+                                }
+                        } func;
+
+                        if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false))
+                        {
+                                control->setValue(true);
+                                return true;    
+                        }
+                }
+ 
+                control->setValue(false);
+                return true;
         }
-        else 
+};
+
+class LLObjectExport : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                // Snap camera back to behind avatar
-                gAgent.setFocusOnAvatar(TRUE, ANIMATE);
+                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+                if (!object) return true;
+
+                LLVOAvatar* avatar = find_avatar_from_object(object); 
+
+                if (!avatar)
+                {
+                        primbackup::getInstance()->pre_export_object();
+                }
+
+                return true;
         }
+};
 
-        // Could be first use
-        LLFirstUse::useGoTo();
+
+class LLObjectEnableImport : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(TRUE);
+                return true;
+        }
+};
+
+class LLObjectImport : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                primbackup::getInstance()->import_object(FALSE);
+                return true;
+        }
+};
+
+class LLObjectImportUpload : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                primbackup::getInstance()->import_object(TRUE);
+                return true;
+        }
+};
+
+bool handle_go_to()
+{
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && gAgent.forwardGrabbed() && (gRlvHandler.hasLockedAttachment()) )
+        {
+                return true;
+        }
+// [/RLVa:KB]
+
+        if (gSavedSettings.getBOOL("DoubleClickTeleport"))
+        {
+                gViewerWindow->alertXml("ConfirmDoubleClickTP", handle_go_to_callback, (void*)LLToolPie::getInstance());
+        }
+        else if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
+        {
+                gViewerWindow->alertXml("ConfirmAutoPilot", handle_go_to_callback, (void*)LLToolPie::getInstance());
+        }
         return true;
 }
 
+//static
+void handle_go_to_callback(S32 option, void *userdata)
+{
+        if (option == 0)
+        {
+                LLToolPie* pie = (LLToolPie*)userdata;
+
+                // JAMESDEBUG try simulator autopilot
+                std::vector<std::string> strings;
+                std::string val;
+                LLVector3d pos = pie->getPick().mPosGlobal;
+                if (gSavedSettings.getBOOL("DoubleClickTeleport"))
+                {
+                        LLVector3d hips_offset(0.0f, 0.0f, 1.2f);
+                        gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+                        gAgent.teleportViaLocation(pos + hips_offset);
+                }
+                else
+                {
+                        // JAMESDEBUG try simulator autopilot
+                        std::vector<std::string> strings;
+                        std::string val;
+                        val = llformat("%g", pos.mdV[VX]);
+                        strings.push_back(val);
+                        val = llformat("%g", pos.mdV[VY]);
+                        strings.push_back(val);
+                        val = llformat("%g", pos.mdV[VZ]);
+                        strings.push_back(val);
+                        send_generic_message("autopilot", strings);
+
+                        LLViewerParcelMgr::getInstance()->deselectLand();
+
+                        if (gAgent.getAvatarObject() && !gSavedSettings.getBOOL("AutoPilotLocksCamera"))
+                        {
+                                gAgent.setFocusGlobal(gAgent.getFocusTargetGlobal(), gAgent.getAvatarObject()->getID());
+                        }
+                        else 
+                        {
+                                // Snap camera back to behind avatar
+                                gAgent.setFocusOnAvatar(TRUE, ANIMATE);
+                        }
+
+                        // Could be first use
+                        LLFirstUse::useGoTo();
+                }
+        }
+}
+
 class LLGoToObject : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -2222,6 +2550,12 @@ class LLAvatarFreeze : public view_listener_t
                         std::string fullname = avatar->getFullname();
                         LLSD payload;
                         payload["avatar_id"] = avatar->getID();
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
+                        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (!fullname.empty()) )
+                        {
+                                fullname = gRlvHandler.getAnonym(fullname);
+                        }
+// [/RLVa:KB]
 
                         if (!fullname.empty())
                         {
@@ -2248,7 +2582,11 @@ class LLAvatarVisibleDebug : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = gAgent.isGodlike();
+                //bool new_value = gAgent.isGodlike();
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                // TODO-RLVa: can you actually use this to cheat anything?
+                bool new_value = gAgent.isGodlike() && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+// [/RLVa:KB]
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -2347,6 +2685,12 @@ class LLAvatarEject : public view_listener_t
                         LLSD payload;
                         payload["avatar_id"] = avatar->getID();
                         std::string fullname = avatar->getFullname();
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
+                        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (!fullname.empty()) )
+                        {
+                                fullname = gRlvHandler.getAnonym(fullname);
+                        }
+// [/RLVa:KB]
 
                         const LLVector3d& pos = avatar->getPositionGlobal();
                         LLParcel* parcel = LLViewerParcelMgr::getInstance()->selectParcelAt(pos)->getParcel();
@@ -2430,6 +2774,13 @@ class LLAvatarGiveCard : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 llinfos << "handle_give_card()" << llendl;
                 LLViewerObject* dest = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 if(dest && dest->isAvatar())
@@ -2689,6 +3040,13 @@ class LLSelfStandUp : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT))
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
                 return true;
         }
@@ -2698,7 +3056,10 @@ class LLSelfEnableStandUp : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = gAgent.getAvatarObject() && gAgent.getAvatarObject()->mIsSitting;
+//              bool new_value = gAgent.getAvatarObject() && gAgent.getAvatarObject()->mIsSitting;
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                bool new_value = gAgent.getAvatarObject() && gAgent.getAvatarObject()->mIsSitting && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT);
+// [/RLVa:KB]
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -2873,6 +3234,11 @@ class LLAvatarEnableAddFriend : public view_listener_t
         {
                 LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
                 bool new_value = avatar && !is_agent_friend(avatar->getID());
+
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                new_value &= (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+// [/RLVa:KB]
+
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -2929,6 +3295,15 @@ bool handle_sit_or_stand()
                 return true;
         }
 
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && 
+                 ( ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (gAgent.getAvatarObject()) && (gAgent.getAvatarObject()->mIsSitting)) ||
+                   (gRlvHandler.hasBehaviour(RLV_BHVR_SIT)) ) )
+        {
+                return true;
+        }
+// [/RLVa:KB]
+
         if (sitting_on_selection())
         {
                 gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
@@ -2939,6 +3314,15 @@ bool handle_sit_or_stand()
 
         if (object && object->getPCode() == LL_PCODE_VOLUME)
         {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0g
+                if ( (rlv_handler_t::isEnabled()) && 
+                         ((gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) || (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH))) &&
+                         (dist_vec_squared(gAgent.getPositionGlobal(), object->getPositionGlobal() + LLVector3d(pick.mObjectOffset)) > 1.5f * 1.5f) )
+                {
+                        return true;    // Don't allow sitting farther away than 1.5m under @sittp=n or @fartouch=n
+                }
+// [/RLVa:KB]
+
                 gMessageSystem->newMessageFast(_PREHASH_AgentRequestSit);
                 gMessageSystem->nextBlockFast(_PREHASH_AgentData);
                 gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@@ -2976,6 +3360,13 @@ class LLLandSit : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT))
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
                 LLViewerParcelMgr::getInstance()->deselectLand();
 
@@ -3206,6 +3597,14 @@ class LLEditDuplicate : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) && 
+                         (LLEditMenuHandler::gEditMenuHandler == LLSelectMgr::getInstance()) )
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 if(LLEditMenuHandler::gEditMenuHandler)
                 {
                         LLEditMenuHandler::gEditMenuHandler->duplicate();
@@ -3219,6 +3618,13 @@ class LLEditEnableDuplicate : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canDuplicate();
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+                if ( (new_value) && (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) && 
+                         (LLEditMenuHandler::gEditMenuHandler == LLSelectMgr::getInstance()) )
+                {
+                        new_value = false;
+                }
+// [/RLVa:KB]
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -3604,6 +4010,11 @@ class LLToolsTakeCopy : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) return true;
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-1.0.0b
+                // NOTE: we need to handle "Take Copy" because it will force a sim-side unsit if we're sitting on the selection, 
+                //       but we do want to allow "Take Copy" under @rez=n so that's why we explicitly check for @unsit=n here
+                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (!rlvCanDeleteOrReturn()) ) return true;
+// [/RLVa:KB]
 
                 const LLUUID& category_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_OBJECT);
                 derez_objects(DRD_ACQUIRE_TO_AGENT_INVENTORY, category_id);
@@ -3619,6 +4030,9 @@ class LLObjectReturn : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) return true;
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-05 (RLVa-1.0.0b)
+                if ( (rlv_handler_t::isEnabled()) && (!rlvCanDeleteOrReturn()) ) return true;
+// [/RLVa:KB]
                 
                 mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
 
@@ -3686,6 +4100,14 @@ class LLObjectEnableReturn : public view_listener_t
                         }
                 }
 #endif
+
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+                if ( (new_value) && (rlv_handler_t::isEnabled()) )
+                {
+                        new_value = rlvCanDeleteOrReturn();
+                }
+// [/RLVa:KB]
+
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -3707,6 +4129,13 @@ void handle_take()
                 return;
         }
         
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+        if ( (rlv_handler_t::isEnabled()) && (!rlvCanDeleteOrReturn()) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         BOOL you_own_everything = TRUE;
         BOOL locked_but_takeable_object = FALSE;
         LLUUID category_id;
@@ -3826,6 +4255,13 @@ BOOL enable_take()
                 return FALSE;
         }
 
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+        if ( (rlv_handler_t::isEnabled()) && (!rlvCanDeleteOrReturn()) )
+        {
+                return FALSE;
+        }
+// [/RLVa:KB]
+
         for (LLObjectSelection::valid_root_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_root_begin();
                  iter != LLSelectMgr::getInstance()->getSelection()->valid_root_end(); iter++)
         {
@@ -4178,16 +4614,61 @@ class LLToolsEnableUnlink : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 bool new_value = false;
-                if (LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
-                        LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
-                        !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
+                if (LLToolMgr::getInstance()->getCurrentTool() != LLToolFace::getInstance())
                 {
-                        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
-                                LLSelectMgr::getInstance()->getSelection()->getObjectCount())
+                        if (LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
+                                LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
+                                !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
                         {
-                                new_value = true;
+                                // LL's viewer unlinks the last linkset selected, 
+                                // regardless of how many linksets or prims are selected total. 
+                                // Preserve that behavior when enabling the unlink option.  
+                                if (gSavedSettings.getBOOL("EditLinkedParts"))
+                                {
+                                        struct f : public LLSelectedNodeFunctor
+                                        {
+                                                virtual bool apply(LLSelectNode* pNode)
+                                                {
+                                                        // Return the first selection node that is
+                                                        //    1) not a root prim
+                                                        //    2) or a root prim that has child prims
+                                                        // or in other words: any prim that is part of a linkset
+                                                        return (pNode->getObject() != pNode->getObject()->getRootEdit()) || 
+                                                                        (pNode->getObject()->numChildren() != 0);
+                                                }
+                                        } func;
+
+                                        if (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(&func, TRUE))
+                                        {
+                                                // the selection contains at least one prim (child or root) that is part of a linkset
+                                                new_value = true;
+                                        }
+                                }
+                                else
+                                {
+                                        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
+                                                LLSelectMgr::getInstance()->getSelection()->getObjectCount())
+                                        {
+                                                new_value = true;
+                                        }
+                                }
                         }
                 }
+
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0g
+                // The user might not be allowed to unlink this object due to RLV settings,
+                // because it would unsit them if they are sitting on the object.
+                if ( (new_value) && (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && 
+                         (gAgent.getAvatarObject()) && (gAgent.getAvatarObject()->mIsSitting) )
+                {
+                        // Allow if the avie isn't sitting on any of the selected objects
+                        LLObjectSelectionHandle handleSel = LLSelectMgr::getInstance()->getSelection();
+                        RlvSelectIsSittingOn func(gAgent.getAvatarObject()->getRoot());
+                        if (handleSel->getFirstRootNode(&func, TRUE))
+                                new_value = false;
+                }
+// [/RLVa:KB]
+
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -4197,6 +4678,19 @@ class LLToolsUnlink : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0g
+                // The user might not be allowed to unlink this object due to RLV settings,
+                // because it would unsit them if they are sitting on the object.
+                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (gAgent.getAvatarObject()) && (gAgent.getAvatarObject()->mIsSitting) )
+                {
+                        // Allow if the avie isn't sitting on any of the selected objects
+                        LLObjectSelectionHandle handleSel = LLSelectMgr::getInstance()->getSelection();
+                        RlvSelectIsSittingOn func(gAgent.getAvatarObject()->getRoot());
+                        if (handleSel->getFirstRootNode(&func, TRUE))
+                                return true;
+                }
+// [/RLVa:KB]
+
                 LLSelectMgr::getInstance()->sendDelink();
                 return true;
         }
@@ -4216,6 +4710,13 @@ class LLToolsReleaseKeys : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 gAgent.forceReleaseControls();
 
                 return true;
@@ -4226,7 +4727,11 @@ class LLToolsEnableReleaseKeys : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                gMenuHolder->findControl(userdata["control"].asString())->setValue( gAgent.anyControlGrabbed() );
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                gMenuHolder->findControl(userdata["control"].asString())->setValue( 
+                                gAgent.anyControlGrabbed() && ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment() ) ) );
+// [/RLVa:KB]
+                //gMenuHolder->findControl(userdata["control"].asString())->setValue( gAgent.anyControlGrabbed() );
                 return true;
         }
 };
@@ -4334,6 +4839,15 @@ class LLEditEnableDelete : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canDoDelete();
+
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+                // NOTE: we want to disable delete on objects but not disable delete on text
+                if ( (new_value) && (rlv_handler_t::isEnabled()) && (LLEditMenuHandler::gEditMenuHandler == LLSelectMgr::getInstance()) )
+                {
+                        new_value = rlvCanDeleteOrReturn();
+                }
+// [/RLVa:KB]
+
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -4343,6 +4857,15 @@ class LLEditDelete : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+                // NOTE: we want to disable delete on objects but not disable delete on text
+                if ( (rlv_handler_t::isEnabled()) && (LLEditMenuHandler::gEditMenuHandler == LLSelectMgr::getInstance()) && 
+                         (!rlvCanDeleteOrReturn()) )
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 // If a text field can do a deletion, it gets precedence over deleting
                 // an object in the world.
                 if( LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canDoDelete())
@@ -4374,6 +4897,12 @@ class LLObjectEnableDelete : public view_listener_t
 # endif
                         LLSelectMgr::getInstance()->canDoDelete();
 #endif
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+                if ( (new_value) && (rlv_handler_t::isEnabled()) )
+                {
+                        new_value = rlvCanDeleteOrReturn();
+                }
+// [/RLVa:KB]
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -4392,6 +4921,13 @@ class LLObjectDelete : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+                if ( (rlv_handler_t::isEnabled()) && (!rlvCanDeleteOrReturn()) )
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 if (LLSelectMgr::getInstance())
                 {
                         LLSelectMgr::getInstance()->doDelete();
@@ -4751,6 +5287,12 @@ class LLWorldCreateLandmark : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                {
+                        return true;
+                }
+// [/RLVa:KB]
                 LLViewerRegion* agent_region = gAgent.getRegion();
                 if(!agent_region)
                 {
@@ -4858,6 +5400,13 @@ class LLAvatarInviteToGroup : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 if(avatar)
                 {
@@ -4871,6 +5420,13 @@ class LLAvatarAddFriend : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                {
+                        return true;    // Fallback code [see LLAvatarEnableAddFriend::handleEvent()]
+                }
+// [/RLVa:KB]
+
                 LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 if(avatar && !is_agent_friend(avatar->getID()))
                 {
@@ -4959,6 +5515,12 @@ class LLEnablePayObject : public view_listener_t
                                 }
                         }
                 }
+
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                // Don't enable "Pay..." on the avatar pie menu under @shownames=n 
+                new_value &= (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) || (avatar == NULL);
+// [/RLVa:KB]
+
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -5147,6 +5709,12 @@ class LLShowFloater : public view_listener_t
                 }
                 else if (floater_name == "buy land")
                 {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                        {
+                                return true;
+                        }
+// [/RLVa:KB]
                         if (LLViewerParcelMgr::getInstance()->selectionEmpty())
                         {
                                 LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
@@ -5209,6 +5777,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterActiveSpeakers::toggleInstance(LLSD());
                 }
+                else if (floater_name == "animation list")
+                {
+                        JCFloaterAnimList::toggleInstance(LLSD());
+                }
                 else if (floater_name == "inworld browser")
                 {
                         LLFloaterMediaBrowser::toggle();
@@ -5370,6 +5942,13 @@ class LLShowAgentProfile : public view_listener_t
                 }
                 else if (userdata.asString() == "hit object")
                 {
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                        {
+                                return true;
+                        }
+// [/RLVa:KB]
+
                         LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                         if (objectp)
                         {
@@ -5429,6 +6008,13 @@ class LLLandEdit : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b)
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) )
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 if (gAgent.getFocusOnAvatar() && gSavedSettings.getBOOL("EditCameraMovement") )
                 {
                         // zoom in if we're looking at the avatar
@@ -5513,6 +6099,18 @@ private:
                         LLViewerJointAttachment* attachment_point = NULL;
                         if (index > 0)
                                 attachment_point = get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, index, (LLViewerJointAttachment*)NULL);
+
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                        if ( (rlv_handler_t::isEnabled()) &&
+                                 ( ((index == 0) && (gRlvHandler.hasLockedAttachment())) ||                      // Can't wear on default attach point
+                                   ((index > 0) && (!gRlvHandler.isDetachable(attachment_point))) || // Can't replace locked attachment
+                                   (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) ) )                                          // Attach on rezzed object == "Take"
+                        {
+                                setObjectSelection(NULL); // Clear the selection or it'll get stuck
+                                return true;
+                        }
+// [/RLVa:KB]
+
                         confirm_replace_attachment(0, attachment_point);
                 }
                 return true;
@@ -5620,6 +6218,24 @@ class LLAttachmentDrop : public view_listener_t
                         return true;
                 }
 
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                if (rlv_handler_t::isEnabled()) 
+                {
+                        if (gRlvHandler.hasLockedAttachment())
+                        {
+                                // NOTE: copy/paste of the code in enable_detach()
+                                LLObjectSelectionHandle hSelect = LLSelectMgr::getInstance()->getSelection();
+                                RlvSelectHasLockedAttach functor;
+                                if ( (hSelect->isAttachment()) && (hSelect->getFirstRootNode(&functor, FALSE)) )
+                                        return true;
+                        }
+                        else if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+                        {
+                                return true;
+                        }
+                }
+// [/RLVa:KB]
+
                 // The sendDropAttachment() method works on the list of selected
                 // objects.  Thus we need to clear the list, make sure it only
                 // contains the object the user clicked, send the message,
@@ -5638,6 +6254,13 @@ void handle_detach_from_avatar(void* user_data)
 
         if (attached_object)
         {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0d
+                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(attached_object)) )
+                {
+                        return;
+                }
+// [/RLVa:KB]
+
                 gMessageSystem->newMessage("ObjectDetach");
                 gMessageSystem->nextBlockFast(_PREHASH_AgentData);
                 gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
@@ -5720,6 +6343,17 @@ class LLAttachmentDetach : public view_listener_t
                         return true;
                 }
 
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                // NOTE: copy/paste of the code in enable_detach()
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+                {
+                        LLObjectSelectionHandle hSelect = LLSelectMgr::getInstance()->getSelection();
+                        RlvSelectHasLockedAttach functor;
+                        if ( (hSelect->isAttachment()) && (hSelect->getFirstRootNode(&functor, FALSE)) )
+                                return FALSE;
+                }
+// [/RLVa:KB]
+
                 // The sendDetach() method works on the list of selected
                 // objects.  Thus we need to clear the list, make sure it only
                 // contains the object the user clicked, send the message,
@@ -5757,6 +6391,8 @@ class LLAttachmentEnableDrop : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+                if (gDisconnected)
+                        return true;
                 BOOL can_build   = gAgent.isGodlike() || (LLViewerParcelMgr::getInstance()->agentCanBuild());
 
                 //Add an inventory observer to only allow dropping the newly attached item
@@ -5802,8 +6438,10 @@ class LLAttachmentEnableDrop : public view_listener_t
                 }
                 
                 //now check to make sure that the item is actually in the inventory before we enable dropping it
-                bool new_value = enable_detach(NULL) && can_build && item;
-
+//              bool new_value = enable_detach(NULL) && can_build && item;
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+                bool new_value = enable_detach(NULL) && can_build && item && (!gRlvHandler.hasBehaviour(RLV_BHVR_REZ));
+// [/RLVa:KB]
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -5822,6 +6460,20 @@ BOOL enable_detach(void*)
                 // ...if it's you, good to detach
                 if (avatar->getID() == gAgent.getID())
                 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                        // NOTE: this code is reused as-is in LLAttachmentDetach::handleEvent() and LLAttachmentDrop::handleEvent()
+                        //       so any changes here should be reflected there as well (I think it's in a number of other places as well by now)
+
+                        // RELEASE-RLVa: LLSelectMgr::sendDetach() and LLSelectMgr::sendDropAttachment() call sendListToRegions with
+                        //               SEND_ONLY_ROOTS so we only need to examine the roots which saves us time
+                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+                        {
+                                LLObjectSelectionHandle hSelect = LLSelectMgr::getInstance()->getSelection();
+                                RlvSelectHasLockedAttach functor;
+                                if ( (hSelect->isAttachment()) && (hSelect->getFirstRootNode(&functor, FALSE)) )
+                                        return FALSE;
+                        }
+// [/RLVa:KB]
                         return TRUE;
                 }
 
@@ -5844,6 +6496,25 @@ class LLAttachmentEnableDetach : public view_listener_t
 // Used to tell if the selected object can be attached to your avatar.
 BOOL object_selected_and_point_valid(void *user_data)
 {
+// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+        if (rlv_handler_t::isEnabled())
+        {
+                // RELEASE-RLVa: look at the caller graph for this function on every new release
+                //      -> 1.22.11 and 1.23.4
+                //              - object_is_wearable() => dead code [user_data == NULL => default attach point => OK!]
+                //      - LLObjectEnableWear::handleEvent() => Rezzed prim / right-click / "Wear" [user_data == NULL => see above]
+                //      - enabler set up in LLVOAvatar::buildCharacter() => Rezzed prim / right-click / "Attach >" [user_data == pAttachPt]
+                //      - enabler set up in LLVOAvatar::buildCharacter() => Rezzed prim / Edit menu / "Attach Object" [user_data == pAttachPt]
+                LLViewerJointAttachment* pAttachPt = (LLViewerJointAttachment*)user_data;
+                if  ( ((!pAttachPt) && (gRlvHandler.hasLockedAttachment())) ||          // Don't allow attach to default attach point
+                          ((pAttachPt) && (!gRlvHandler.isDetachable(pAttachPt))) ||    // Don't allow replacing of locked attachment
+                          (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) )                                    // Attaching a rezzed object == "Take"
+                {
+                        return FALSE;
+                }
+        }
+// [/RLVa:KB]
+
         //LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
         LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
         for (LLObjectSelection::root_iterator iter = selection->root_begin();
@@ -5911,7 +6582,13 @@ BOOL object_attached(void *user_data)
 {
         LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
 
-        return attachment->getObject() != NULL;
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        return ( 
+                      (attachment->getObject() != NULL) && 
+                          ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.isDetachable(attachment->getObject())) )
+                   );
+// [/RLVa:KB]
+//      return attachment->getObject() != NULL;
 }
 
 class LLAvatarSendIM : public view_listener_t
@@ -5919,6 +6596,12 @@ class LLAvatarSendIM : public view_listener_t
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
                 LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                {
+                        return true;
+                }
+// [/RLVa:KB]
                 if(avatar)
                 {
                         std::string name("IM");
@@ -6054,6 +6737,16 @@ class LLToolsSelectedScriptAction : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+                {
+                        LLObjectSelectionHandle selectHandle = LLSelectMgr::getInstance()->getSelection();
+                        RlvSelectHasLockedAttach functor;
+                        if ( (selectHandle->isAttachment()) && (selectHandle->getFirstNode(&functor)) )
+                                return true;
+                }
+// [/RLVa:KB]
+
                 std::string action = userdata.asString();
                 if (action == "compile mono")
                 {
@@ -6114,7 +6807,10 @@ void handle_selected_texture_info(void*)
                         S32 height = img->getHeight();
                         S32 width = img->getWidth();
                         S32 components = img->getComponents();
-                        msg = llformat("%dx%d %s on face ",
+                        std::string image_id_string = image_id.asString();
+                        image_id_string = image_id_string.replace(24, 35, 12, '*') + " "; // hide last segment to discourage theft
+                        msg = llformat("%s%dx%d %s on face ",
+                                                                image_id_string.c_str(),
                                                                 width,
                                                                 height,
                                                                 (components == 4 ? "alpha" : "opaque"));
@@ -6135,12 +6831,30 @@ void handle_dump_image_list(void*)
 
 void handle_test_male(void*)
 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && 
+                 ( (gRlvHandler.hasLockedAttachment()) || 
+                   (gRlvHandler.hasBehaviour(RLV_BHVR_ADDOUTFIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_REMOUTFIT)) ) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         wear_outfit_by_name("Male Shape & Outfit");
         //gGestureList.requestResetFromServer( TRUE );
 }
 
 void handle_test_female(void*)
 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && 
+                 ( (gRlvHandler.hasLockedAttachment()) || 
+                   (gRlvHandler.hasBehaviour(RLV_BHVR_ADDOUTFIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_REMOUTFIT)) ) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         wear_outfit_by_name("Female Shape & Outfit");
         //gGestureList.requestResetFromServer( FALSE );
 }
@@ -6276,6 +6990,22 @@ BOOL enable_more_than_one_selected(void* )
 
 static bool is_editable_selected()
 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-1.0.0c
+        // RELEASE-RLVa: check that this still isn't called by anything but script actions in the Tools menu
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+        {
+                LLObjectSelectionHandle selectHandle = LLSelectMgr::getInstance()->getSelection();
+
+                // NOTE: this is called for 5 different menu items so we'll trade accuracy for efficiency and only
+                //       examine root nodes (LLToolsSelectedScriptAction::handleEvent() will catch what we miss)
+                RlvSelectHasLockedAttach functor;
+                if ( (selectHandle->isAttachment()) && (selectHandle->getFirstRootNode(&functor)) )
+                {
+                        return false;
+                }
+        }
+// [/RLVa:KB]
+
         return (LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() != NULL);
 }
 
@@ -6322,7 +7052,12 @@ class LLToolsEnableTakeCopy : public view_listener_t
                                 {
                                         virtual bool apply(LLViewerObject* obj)
                                         {
-                                                return (!obj->permCopy() || obj->isAttachment());
+//                                              return (!obj->permCopy() || obj->isAttachment());
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                                                return (!obj->permCopy() || obj->isAttachment()) || 
+                                                           ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (gAgent.getAvatarObject()) && 
+                                                             (gAgent.getAvatarObject()->getRoot() == obj) );
+// [/RLVa:KB]
                                         }
                                 } func;
                                 const bool firstonly = true;
@@ -6515,6 +7250,9 @@ class LLWorldEnableCreateLandmark : public view_listener_t
         {
                 bool new_value = gAgent.isGodlike() || 
                         (gAgent.getRegion() && gAgent.getRegion()->getAllowLandmark());
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                new_value &= !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC);
+// [/RLVa:KB]
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
@@ -6567,7 +7305,11 @@ BOOL enable_god_customer_service(void*)
 
 BOOL enable_god_basic(void*)
 {
-        return gAgent.getGodLevel() > GOD_NOT;
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+        // RELEASE-RLVa: check that this function isn't used for anything other than to enable/disable showing the "God Tools..." floater
+        return (gAgent.getGodLevel() > GOD_NOT) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC));
+// [/RLVa:KB]
+        //return gAgent.getGodLevel() > GOD_NOT;
 }
 
 #if 0 // 1.9.2
@@ -7123,6 +7865,13 @@ class LLViewHighlightTransparent : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT))
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 LLDrawPoolAlpha::sShowDebugAlpha = !LLDrawPoolAlpha::sShowDebugAlpha;
                 return true;
         }
@@ -7170,6 +7919,13 @@ class LLViewShowHUDAttachments : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                if ( (LLPipeline::sShowHUDAttachments) && (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedHUD()) )
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 LLPipeline::sShowHUDAttachments = !LLPipeline::sShowHUDAttachments;
                 return true;
         }
@@ -7228,6 +7984,15 @@ class LLEditEnableTakeOff : public view_listener_t
                 {
                         new_value = LLAgent::selfHasWearable((void *)WT_SKIRT);
                 }
+
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
+                // Why aren't they using LLWearable::typeNameToType()? *confuzzled*
+                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isRemovable(LLWearable::typeNameToType(clothing))) )
+                {
+                        new_value = false;
+                }
+// [/RLVa:KB]
+
                 gMenuHolder->findControl(control_name)->setValue(new_value);
                 return true;
         }
@@ -7325,6 +8090,13 @@ class LLWorldEnvSettings : public view_listener_t
 {       
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SETENV))
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 std::string tod = userdata.asString();
                 LLVector3 sun_direction;
                 
@@ -7402,6 +8174,13 @@ class LLWorldWaterSettings : public view_listener_t
 {       
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SETENV))
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 // if not there or is hidden, show it
                 if(     !LLFloaterWater::isOpen() || 
                         !LLFloaterWater::instance()->getVisible()) {
@@ -7432,6 +8211,13 @@ class LLWorldDayCycle : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SETENV))
+                {
+                        return true;
+                }
+// [/RLVa:KB]
+
                 LLFloaterDayCycle::show();
                 return true;
         }
@@ -7619,6 +8405,113 @@ class LLAdvancedCheckHUDInfo : public view_listener_t
 };
 
 
+//////////////////////
+// FORCE GROUND SIT //
+//////////////////////
+
+class LLAdvancedToggleSit: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLChat chat;
+                chat.mSourceType = CHAT_SOURCE_SYSTEM;
+                if(!gAgent.getAvatarObject()->mIsSitting)
+                {
+                        gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
+                        chat.mText = "Forcing Ground Sit";
+                }
+                else
+                {
+                        gAgent.setControlFlags(!AGENT_CONTROL_SIT_ON_GROUND);
+                        gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+                        chat.mText = "Standing up";
+                }
+                LLFloaterChat::addChat(chat);
+                return true;
+        }
+};
+
+class LLAdvancedCheckSit : public view_listener_t
+{
+    bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+    {
+                if(gAgent.getAvatarObject()->mIsSitting)
+                {
+                        gMenuHolder->findControl(userdata["control"].asString())->setValue(true);
+                }
+                else
+                {
+                        gMenuHolder->findControl(userdata["control"].asString())->setValue(false);
+                }
+                return true;
+        }
+};
+
+
+/////////////
+// PHANTOM //
+/////////////
+
+class LLAdvancedTogglePhantom: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLAgent::togglePhantom();
+                BOOL ph = LLAgent::getPhantom();
+                LLChat chat;
+                chat.mSourceType = CHAT_SOURCE_SYSTEM;
+                chat.mText = llformat("%s%s","Phantom ",(ph ? "On" : "Off"));
+                LLFloaterChat::addChat(chat);
+                //gMenuHolder->findControl(userdata["control"].asString())->setValue(ph);
+                return true;
+        }
+
+};
+
+class LLAdvancedCheckPhantom: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(LLAgent::getPhantom());
+                return true;
+        }
+};
+
+
+///////////////////
+// ASSET BROWSER //
+///////////////////
+
+class LLAdvancedToggleAssetBrowser: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                //open the floater
+                LLFloaterAssetBrowser::show(0);
+                
+                bool vis = false;
+                if(LLFloaterAssetBrowser::getInstance())
+                {
+                        vis = (bool)LLFloaterAssetBrowser::getInstance()->getVisible();
+                }
+                return true;
+        }
+};
+
+class LLAdvancedCheckAssetBrowser: public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool vis = false;
+                if(LLFloaterAssetBrowser::getInstance())
+                {
+                        vis = (bool)LLFloaterAssetBrowser::getInstance()->getVisible();
+                }
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(vis);
+                return true;
+        }
+};
+
 
 ///////////////////////
 // CLEAR GROUP CACHE //
@@ -9559,6 +10452,49 @@ class LLAvatarReportAbuse : public view_listener_t
 
 
 
+///////////////
+// RLVa Main //
+///////////////
+
+
+class RLVaMainToggle : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                rlvToggleEnabled(NULL);
+                return true;
+        }
+};
+
+class RLVaMainCheck : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = rlvGetEnabled(NULL);
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////
+// RLVa BEHAVIORS //
+////////////////////
+
+
+class RLVaBehaviorsShow : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                RlvFloaterBehaviour::show(NULL);
+                return true;
+        }
+};
+
+
+
 static void addMenu(view_listener_t *menu, const char *name)
 {
         sMenus.push_back(menu);
@@ -9629,7 +10565,7 @@ void initialize_menus()
         addMenu(new LLZoomer(1/1.2f), "View.ZoomIn");
         addMenu(new LLZoomer(DEFAULT_FIELD_OF_VIEW, false), "View.ZoomDefault");
         addMenu(new LLViewFullscreen(), "View.Fullscreen");
-        addMenu(new LLViewDefaultUISize(), "View.DefaultUISize");
+        addMenu(new LLViewDefaultUISize(), "View.DefaultUISize"); //unused - now in preferences > general -- McCabe
 
         addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
         addMenu(new LLViewEnableJoystickFlycam(), "View.EnableJoystickFlycam");
@@ -9740,6 +10676,10 @@ void initialize_menus()
         addMenu(new LLObjectBuy(), "Object.Buy");
         addMenu(new LLObjectEdit(), "Object.Edit");
         addMenu(new LLObjectInspect(), "Object.Inspect");
+        addMenu(new LLObjectCopyUUID(), "Object.CopyUUID");
+        addMenu(new LLObjectExport(), "Object.Export");
+        addMenu(new LLObjectImport(), "Object.Import");
+        addMenu(new LLObjectImportUpload(), "Object.ImportUpload");
 
         addMenu(new LLObjectEnableOpen(), "Object.EnableOpen");
         addMenu(new LLObjectEnableTouch(), "Object.EnableTouch");
@@ -9750,6 +10690,9 @@ void initialize_menus()
         addMenu(new LLObjectEnableReportAbuse(), "Object.EnableReportAbuse");
         addMenu(new LLObjectEnableMute(), "Object.EnableMute");
         addMenu(new LLObjectEnableBuy(), "Object.EnableBuy");
+        addMenu(new LLObjectEnableCopyUUID(), "Object.EnableCopyUUID");
+        addMenu(new LLObjectEnableExport(), "Object.EnableExport");
+        addMenu(new LLObjectEnableImport(), "Object.EnableImport");
 
         /*addMenu(new LLObjectVisibleTouch(), "Object.VisibleTouch");
         addMenu(new LLObjectVisibleCustomTouch(), "Object.VisibleCustomTouch");
@@ -9799,6 +10742,12 @@ void initialize_menus()
         addMenu(new LLAdvancedCheckConsole(), "Advanced.CheckConsole");
         addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole");
         addMenu(new LLAdvancedReloadSettingsOverrides(), "Advanced.ReloadSettingsOverrides");
+        addMenu(new LLAdvancedToggleSit(), "Advanced.ToggleSit");
+        addMenu(new LLAdvancedCheckSit(), "Advanced.CheckSit");
+        addMenu(new LLAdvancedTogglePhantom(), "Advanced.TogglePhantom");
+        addMenu(new LLAdvancedCheckPhantom(), "Advanced.CheckPhantom");
+        addMenu(new LLAdvancedToggleAssetBrowser(),"Advanced.ToggleAssetBrowser");
+        addMenu(new LLAdvancedCheckAssetBrowser(),"Advanced.CheckAssetBrowser");
 
         // Advanced > HUD Info
         addMenu(new LLAdvancedToggleHUDInfo(), "Advanced.ToggleHUDInfo");
@@ -9944,4 +10893,11 @@ void initialize_menus()
         addMenu(new LLAdvancedCheckViewAdminOptions(), "Advanced.CheckViewAdminOptions");
         addMenu(new LLAdvancedRequestAdminStatus(), "Advanced.RequestAdminStatus");
         addMenu(new LLAdvancedLeaveAdminStatus(), "Advanced.LeaveAdminStatus");
+
+
+        // RLVa
+        addMenu(new RLVaMainToggle(), "RLVa.Main.Toggle");
+        addMenu(new RLVaMainCheck(), "RLVa.Main.Enabled");
+        addMenu(new RLVaBehaviorsShow(), "RLVa.Behaviors.Show");
+
 }
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 2925916..178fc97 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -473,6 +473,15 @@ class LLFileTakeSnapshotToDisk : public view_listener_t
         }
 };
 
+class FileLogout : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLAppViewer::userLogout(NULL);
+                return true;
+        }
+};
+
 class LLFileQuit : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -959,11 +968,6 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
                          S32 expected_upload_cost,
                          void *userdata)
 {
-        if(gDisconnected)
-        {
-                return ;
-        }
-
         LLAssetID uuid = tid.makeAssetID(gAgent.getSecureSessionID());
         
         if( LLAssetType::AT_SOUND == asset_type )
@@ -1087,6 +1091,7 @@ void init_menu_file()
         (new LLFileSaveTexture())->registerListener(gMenuHolder, "File.SaveTexture");
         (new LLFileTakeSnapshot())->registerListener(gMenuHolder, "File.TakeSnapshot");
         (new LLFileTakeSnapshotToDisk())->registerListener(gMenuHolder, "File.TakeSnapshotToDisk");
+        (new FileLogout())->registerListener(gMenuHolder, "File.Logout");
         (new LLFileQuit())->registerListener(gMenuHolder, "File.Quit");
 
         (new LLFileEnableUpload())->registerListener(gMenuHolder, "File.EnableUpload");
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 5d83065..d64eecd 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -80,6 +80,7 @@
 #include "llfloatergroupinfo.h"
 #include "llfloaterimagepreview.h"
 #include "llfloaterland.h"
+#include "llfloatermap.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterlandholdings.h"
 #include "llurldispatcher.h"
@@ -112,7 +113,7 @@
 #include "llui.h"                       // for make_ui_sound
 #include "lluploaddialog.h"
 #include "llviewercamera.h"
-#include "llviewercontrol.h"
+//#include "llviewercontrol.h"
 #include "llviewergenericmessage.h"
 #include "llviewerinventory.h"
 #include "llviewermenu.h"
@@ -142,6 +143,17 @@
 #include "llwindebug.h" // For the invalid message handler
 #endif
 
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+#include "llfloateravatarinfo.h"
+extern LLMap< const LLUUID, LLFloaterAvatarInfo* > gAvatarInfoInstances; // Only defined in llfloateravatarinfo.cpp
+// [/RLVa:KB]
+
+//silly spam define D:
+bool dialogSpamOn;
+static LLFrameTimer d_spam;
+std::map< std::string , S32 > lastd_names;
+LLDynamicArray< std::string > blacklisted_names;
+
 //
 // Constants
 //
@@ -1115,6 +1127,21 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
         switch(button)
         {
         case IOR_ACCEPT:
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.2a
+                // Only change the inventory offer's destination folder to the shared root if:
+                //   - the user has enabled the feature
+                //   - the inventory offer came from a script (and specifies a folder)
+                //   - the name starts with the prefix [mDesc format (quotes are part of the string): "[OBJECTNAME] ( http://slurl.com/... )"]
+                if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getForbidGiveToRLV()) && 
+                         (IM_TASK_INVENTORY_OFFERED == info->mIM) && (LLAssetType::AT_CATEGORY == info->mType) && (info->mDesc.find(RLV_PUTINV_PREFIX) == 1) )
+                {
+                        LLViewerInventoryCategory* pRlvRoot = gRlvHandler.getSharedRoot();
+                        if (pRlvRoot)
+                        {
+                                info->mFolderID = pRlvRoot->getUUID();
+                        }
+                }
+// [/RLVa:KB]
                 // ACCEPT. The math for the dialog works, because the accept
                 // for inventory_offered, task_inventory_offer or
                 // group_notice_inventory is 1 greater than the offer integer value.
@@ -1277,6 +1304,13 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
         if(indx >= 0)
         {
                 LLStringUtil::truncate(msg, indx);
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
+                // TODO-RLVa: needs revisiting when LL saves open notifications to disk to accept them on the next relog
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                {
+                        gRlvHandler.filterLocation(info->mDesc);
+                }
+// [/RLVa:KB]
         }
         
         LLSD args;
@@ -1505,7 +1539,20 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         // do nothing -- don't distract newbies in
                         // Prelude with global IMs
                 }
-                else if (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM)
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                else if ( (rlv_handler_t::isEnabled()) && (offline == IM_ONLINE) && ("@version" == message) )
+                {
+                        rlvSendBusyMessage(from_id, gRlvHandler.getVersionString(), session_id);
+                        // We won't receive a typing stop message, so do that manually (see comment at the end of LLFloaterIMPanel::sendMsg)
+                        LLPointer<LLIMInfo> im_info = new LLIMInfo(gMessageSystem);
+                        gIMMgr->processIMTypingStop(im_info);
+                }
+// [/RLVa:KB]
+//              else if (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM)
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                else if ( (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM) && 
+                              ( (!gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.isException(RLV_BHVR_RECVIM, from_id))) )
+// [/RLVa:KB]
                 {
                         // return a standard "busy" message, but only do it to online IM 
                         // (i.e. not other auto responses and not store-and-forward IM)
@@ -1562,6 +1609,21 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 }
                 else if (to_id.isNull())
                 {
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
+                        // Filter region messages that weren't sent by a Linden
+                        if ( (rlv_handler_t::isEnabled()) && (LLMuteList::getInstance()) && 
+                                (!LLMuteList::getInstance()->isLinden(name)) && (from_id != gAgent.getID()) )
+                        {
+                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                                        gRlvHandler.filterLocation(message);
+                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                                {
+                                        name = gRlvHandler.getAnonym(name);
+                                        gRlvHandler.filterNames(message);
+                                }
+                        }
+// [/RLVa:KB]
+
                         // Message to everyone from GOD
                         args["NAME"] = name;
                         args["MESSAGE"] = message;
@@ -1577,6 +1639,15 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                 else
                 {
                         // standard message, not from system
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) && (!gRlvHandler.isException(RLV_BHVR_RECVIM, from_id)) )
+                        {
+                                rlvSendBusyMessage(from_id, rlv_handler_t::cstrMsgRecvIM, session_id);
+
+                                message = message.substr(0, message_offset) + rlv_handler_t::cstrBlockedRecvIM;
+                        }
+// [/RLVa:KB]
+
                         std::string saved;
                         if(offline == IM_OFFLINE)
                         {
@@ -1794,6 +1865,13 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                 bucketp = (struct offer_agent_bucket_t*) &binary_bucket[0];
                                 info->mType = (LLAssetType::EType) bucketp->asset_type;
                                 info->mObjectID = bucketp->object_id;
+
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(from_id)) )
+                                {
+                                        name = gRlvHandler.getAnonym(name);
+                                }
+// [/RLVa:KB]
                         }
                         else
                         {
@@ -1831,6 +1909,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         }
                         else
                         {
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-09-10 (RLVa-1.0.3a)
+                                if ( (rlv_handler_t::isEnabled()) && (dialog == IM_TASK_INVENTORY_OFFERED) &&
+                                         (info->mDesc.find(RLV_PUTINV_PREFIX) == 1) && (gRlvHandler.getSharedRoot()) )
+                                {
+                                        LLFirstUse::warnRlvGiveToRLV();
+                                }
+// [/RLVa:KB]
+
                                 inventory_offer_handler(info, dialog == IM_TASK_INVENTORY_OFFERED);
                         }
                 }
@@ -1880,6 +1966,22 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         return;
                 }
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) )
+                {
+                        if (gAgent.isInGroup(session_id))
+                        {
+                                if (!gRlvHandler.isException(RLV_BHVR_RECVIM, session_id))
+                                        return;
+                        }
+                        else
+                        {
+                                if ( (from_id != gAgent.getID()) && (!gRlvHandler.isException(RLV_BHVR_RECVIM, from_id)) )
+                                        message = message.substr(0, message_offset) + rlv_handler_t::cstrBlockedRecvIM;
+                        }
+                }
+// [/RLVa:KB]
+
                 // standard message, not from system
                 std::string saved;
                 if(offline == IM_OFFLINE)
@@ -1915,12 +2017,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         {
                                 return;
                         }
-                        chat.mText = name + separator_string + message.substr(message_offset);
+                        chat.mText = std::string("IM: ") + name + separator_string + message.substr(message_offset);
                         chat.mFromName = name;
 
                         // Build a link to open the object IM info window.
                         std::string location = ll_safe_string((char*)binary_bucket,binary_bucket_size);
-                        
+
                         LLSD query_string;
                         query_string["owner"] = from_id;
                         query_string["slurl"] = location.c_str();
@@ -1928,7 +2030,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         if (from_group)
                         {
                                 query_string["groupowned"] = "true";
-                        }       
+                        }
 
                         if (session_id.notNull())
                         {
@@ -1949,11 +2051,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                         << LLURI::mapToQueryString(query_string);
 
                         chat.mURL = link.str();
-                        chat.mText = name + separator_string + message.substr(message_offset);
+                        chat.mText = std::string("IM: ") + name + separator_string + message.substr(message_offset);
 
                         // Note: lie to LLFloaterChat::addChat(), pretending that this is NOT an IM, because
                         // IMs from objcts don't open IM sessions.
-                        chat.mSourceType = CHAT_SOURCE_OBJECT;
+                        chat.mSourceType = CHAT_SOURCE_OBJECT_IM;
                         LLFloaterChat::addChat(chat, FALSE, FALSE);
                 }
                 break;
@@ -1963,6 +2065,17 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         return;
                 }
                 {
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
+                        // TODO-RLVa: what actually generates this?
+                        if (rlv_handler_t::isEnabled())
+                        {
+                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                                        gRlvHandler.filterLocation(message);
+                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                                        gRlvHandler.filterNames(message);
+                        }
+// [/RLVa:KB]
+
                         // Construct a viewer alert for this message.
                         args["NAME"] = name;
                         args["MESSAGE"] = message;
@@ -2283,8 +2396,13 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 chat.mPosAgent = chatter->getPositionAgent();
                 
                 // Make swirly things only for talking objects. (not script debug messages, though)
-                if (chat.mSourceType == CHAT_SOURCE_OBJECT 
-                        && chat.mChatType != CHAT_TYPE_DEBUG_MSG)
+//              if (chat.mSourceType == CHAT_SOURCE_OBJECT 
+//                      && chat.mChatType != CHAT_TYPE_DEBUG_MSG)
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                // Don't show swirly things for llOwnerSay() chat here because we handle those further down
+                if ( (chat.mSourceType == CHAT_SOURCE_OBJECT && chat.mChatType != CHAT_TYPE_DEBUG_MSG) &&
+                         ((!rlv_handler_t::isEnabled()) || (CHAT_TYPE_OWNER != chat.mChatType)) )
+// [/RLVa:KB]
                 {
                         LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
                         psc->setSourceObject(chatter);
@@ -2309,6 +2427,32 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 is_owned_by_me = chatter->permYouOwner();
         }
 
+        if(chat.mSourceType == CHAT_SOURCE_OBJECT 
+                && chat.mChatType != CHAT_TYPE_DEBUG_MSG
+                && !owner_id.isNull()
+                && owner_id != gAgent.getID())
+        {
+                std::string tempname = from_name;
+
+                size_t found = tempname.find(" ");
+                while(found != std::string::npos)
+                {
+                        tempname.replace(found, 1, "");
+                        found = tempname.find(" ");
+                }
+
+                if (tempname.length() < 1)
+                {
+                        from_name = "no name";
+                        chat.mFromName = from_name;
+                }
+
+                //        std::string ownername;
+                //        if(gCacheName->getFullName(owner_id,ownername))
+                //            from_name += (" (" + ownername + ")");
+                chat.mURL = llformat("secondlife:///app/agent/%s/about",owner_id.asString().c_str());
+        }
+
         if (is_audible)
         {
                 BOOL visible_in_chat_bubble = FALSE;
@@ -2317,6 +2461,51 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                 color.setVec(1.f,1.f,1.f,1.f);
                 msg->getStringFast(_PREHASH_ChatData, _PREHASH_Message, mesg);
 
+// [RLVa:KB] - Checked: 2009-10-06 (RLVa-1.0.4d) | Modified: RLVa-1.0.4d
+                if ( (rlv_handler_t::isEnabled()) && 
+                         (CHAT_TYPE_START != chat.mChatType) && (CHAT_TYPE_STOP != chat.mChatType) && (CHAT_TYPE_OWNER != chat.mChatType) )
+                {
+                        // NOTE: chatter can be NULL (may not have rezzed yet, or could be another avie's HUD attachment)
+                        BOOL is_attachment = (chatter) ? chatter->isAttachment() : FALSE;
+
+                        // Filtering "rules":
+                        //   avatar  => filter all avie text (unless it's this avie or they're an exemption)
+                        //   objects => filter everything except attachments this avie owns
+                        if ( ( (CHAT_SOURCE_AGENT == chat.mSourceType) && (from_id != gAgent.getID()) ) || 
+                                 ( (CHAT_SOURCE_OBJECT == chat.mSourceType) && ((!is_owned_by_me) || (!is_attachment)) ) )
+                        {
+                                if (!rlvIsEmote(mesg))
+                                {
+                                        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVCHAT)) && (!gRlvHandler.isException(RLV_BHVR_RECVCHAT, from_id)) )
+                                                gRlvHandler.filterChat(mesg, false);
+                                }
+                                else if ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVEMOTE)) && (!gRlvHandler.isException(RLV_BHVR_RECVEMOTE, from_id)) )
+                                {
+                                        mesg = "/me ...";
+                                }
+                        }
+
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                        {
+                                // Filtering "rules":
+                                //   avatar => filter only their name (unless it's this avie)
+                                //   other  => filter everything except attachments this avie owns but then we still do filter their text
+                                if (CHAT_SOURCE_AGENT == chat.mSourceType)
+                                {
+                                        if (chat.mFromID != gAgent.getID())
+                                                from_name = gRlvHandler.getAnonym(from_name);
+                                } 
+                                else
+                                {
+                                        if ( (!is_owned_by_me) || (!is_attachment) )
+                                                gRlvHandler.filterNames(from_name);
+                                        gRlvHandler.filterNames(mesg);
+                                }
+                                chat.mRlvNamesFiltered = true;
+                        }
+                }
+// [/RLVa:KB]
+
                 BOOL ircstyle = FALSE;
 
                 // Look for IRC-style emotes here so chatbubbles work
@@ -2342,6 +2531,12 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                         {
                                 ((LLVOAvatar*)chatter)->startTyping();
                         }
+
+                        if (LLFloaterMap::getInstance())
+                        {
+                                LLFloaterMap::getInstance()->updateTypingList(from_id, false);
+                        }
+
                         return;
                 }
                 else if (CHAT_TYPE_STOP == chat.mChatType)
@@ -2353,6 +2548,15 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                         {
                                 ((LLVOAvatar*)chatter)->stopTyping();
                         }
+
+                        if (LLFloaterMap::getInstance())
+                        {
+                                if (LLFloaterMap::getInstance()->isTyping(from_id))
+                                {
+                                        LLFloaterMap::getInstance()->updateTypingList(from_id, true);
+                                }
+                        }
+
                         return;
                 }
 
@@ -2381,8 +2585,74 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                         case CHAT_TYPE_WHISPER:
                                 verb = " " + LLTrans::getString("whisper") + " ";
                                 break;
-                        case CHAT_TYPE_DEBUG_MSG:
                         case CHAT_TYPE_OWNER:
+// [RLVa:KB] - Checked: 2009-08-28 (RLVa-1.0.2a) | Modified: RLVa-1.0.2a
+                                if ( (rlv_handler_t::isEnabled()) && (mesg.length() > 3) && (RLV_CMD_PREFIX == mesg[0]) && (CHAT_TYPE_OWNER == chat.mChatType) )
+                                {
+                                        mesg.erase(0, 1);
+                                        LLStringUtil::toLower(mesg);
+
+                                        std::string strExecuted, strFailed, strRetained, *pstr;
+
+                                        boost_tokenizer tokens(mesg, boost::char_separator<char>(",", "", boost::drop_empty_tokens));
+                                        for (boost_tokenizer::const_iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
+                                        {
+                                                if (LLStartUp::getStartupState() == STATE_STARTED)
+                                                {
+                                                        if (gRlvHandler.processCommand(from_id, *itToken, true))
+                                                                pstr = &strExecuted;
+                                                        else
+                                                                pstr = &strFailed;
+                                                }
+                                                else
+                                                {
+                                                        gRlvHandler.retainCommand(from_name, from_id, *itToken);
+                                                        pstr = &strRetained;
+                                                }
+
+                                                if (!pstr->empty())
+                                                        pstr->push_back(',');
+                                                pstr->append(*itToken);
+                                        }
+
+                                        if (!RlvSettings::getDebug())
+                                                return;
+
+                                        // Silly people want comprehensive debug messages, blah :p
+                                        if ( (!strExecuted.empty()) && (strFailed.empty()) && (strRetained.empty()) )
+                                                verb = " executes: @";
+                                        else if ( (strExecuted.empty()) && (!strFailed.empty()) && (strRetained.empty()) )
+                                                verb = " failed: @";
+                                        else if ( (strExecuted.empty()) && (strFailed.empty()) && (!strRetained.empty()) )
+                                                verb = " retained: @";
+                                        else 
+                                        {
+                                                verb = ": @";
+                                                if (!strExecuted.empty())
+                                                        mesg += "\n    - executed: @" + strExecuted;
+                                                if (!strFailed.empty())
+                                                        mesg += "\n    - failed: @" + strFailed;
+                                                if (!strRetained.empty())
+                                                        mesg += "\n    - retained: @" + strRetained;
+                                        }
+
+                                        break;
+                                }
+// [/RLVa:KB]
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                                // Copy/paste from above
+                                if  ( (chatter) && (chat.mChatType != CHAT_TYPE_DEBUG_MSG) )
+                                {
+                                        LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
+                                        psc->setSourceObject(chatter);
+                                        psc->setColor(color);
+                                        //We set the particles to be owned by the object's owner, 
+                                        //just in case they should be muted by the mute list
+                                        psc->setOwnerUUID(owner_id);
+                                        LLViewerPartSim::getInstance()->addPartSource(psc);
+                                }
+// [/RLVa:KB]
+                        case CHAT_TYPE_DEBUG_MSG:
                         case CHAT_TYPE_NORMAL:
                                 verb = ": ";
                                 break;
@@ -2451,7 +2721,10 @@ void process_teleport_start(LLMessageSystem *msg, void**)
         U32 teleport_flags = 0x0;
         msg->getU32("Info", "TeleportFlags", teleport_flags);
 
-        if (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL)
+        //if (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL)
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.0b
+        if ( (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL) || (!gRlvHandler.getCanCancelTp()) )
+// [/RLVa:KB]
         {
                 gViewerWindow->setProgressCancelButtonVisible(FALSE);
         }
@@ -2486,7 +2759,10 @@ void process_teleport_progress(LLMessageSystem* msg, void**)
         }
         U32 teleport_flags = 0x0;
         msg->getU32("Info", "TeleportFlags", teleport_flags);
-        if (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL)
+        //if (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL)
+// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.0b
+        if ( (teleport_flags & TELEPORT_FLAGS_DISABLE_CANCEL) || (!gRlvHandler.getCanCancelTp()) )
+// [/RLVa:KB]
         {
                 gViewerWindow->setProgressCancelButtonVisible(FALSE);
         }
@@ -2796,6 +3072,10 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
         // appropriate.
         LLVector3 shift_vector = regionp->getPosRegionFromGlobal(
                 gAgent.getRegion()->getOriginGlobal());
+        // don't shift objects, if teleporting more than about 1000 sims, as
+        // for long teleports shifting objects garbles the view at the target region
+        if (shift_vector.lengthSquared() > 6.5e10f)
+                shift_vector = LLVector3::zero;
         gAgent.setRegion(regionp);
         gObjectList.shiftObjects(shift_vector);
         gAssetStorage->setUpstream(msg->getSender());
@@ -2818,7 +3098,10 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
                 // know what you look like.
                 gAgent.sendAgentSetAppearance();
 
-                if (avatarp)
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                if ( (avatarp) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+// [/RLVa:KB]
+//              if (avatarp)
                 {
                         // Chat the "back" SLURL. (DEV-4907)
                         LLChat chat("Teleport completed from " + gAgent.getTeleportSourceSLURL());
@@ -2898,6 +3181,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 
         // If the server version has changed, display an info box and offer
         // to display the release notes, unless this is the initial log in.
+        // Also verify we're on an OpenSimulator here.
         if (gLastVersionChannel == version_channel)
         {
                 return;
@@ -2910,6 +3194,15 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
                 LLNotifications::instance().add("ServerVersionChanged", LLSD(), payload);
         }
 
+        if (version_channel.find("OpenSim") != std::string::npos)
+        {
+                gSavedSettings.setBOOL("LoggedIntoOpenSim", TRUE);
+        }
+        else
+        {
+                gSavedSettings.setBOOL("LoggedIntoOpenSim", FALSE);
+        }
+
         gLastVersionChannel = version_channel;
 }
 
@@ -4126,7 +4419,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
         LLUUID tid;
         msg->getUUID("MoneyData", "TransactionID", tid);
         static std::deque<LLUUID> recent;
-        if(!desc.empty() && gSavedSettings.getBOOL("NotifyMoneyChange")
+        if(!desc.empty() && gSavedSettings.getBOOL("NotifyMoneyChange") && !gDisconnected
            && (std::find(recent.rbegin(), recent.rend(), tid) == recent.rend()))
         {
                 // Make the user confirm the transaction, since they might
@@ -4537,7 +4830,13 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
                         if (viewregion)
                         {
                                 // got the region, so include the region and 3d coordinates of the object
-                                notice.setArg("[REGIONNAME]", viewregion->getName());                           
+                                notice.setArg("[REGIONNAME]", viewregion->getName());
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+                                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+                                {
+                                        notice.setArg("[REGIONNAME]", rlv_handler_t::cstrHiddenRegion);
+                                }
+// [/RLVa:KB]
                                 std::string formatpos = llformat("%.1f, %.1f,%.1f", objpos[VX], objpos[VY], objpos[VZ]);
                                 notice.setArg("[REGIONPOS]", formatpos);
 
@@ -4749,8 +5048,31 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
                 payload["object_name"] = object_name;
                 payload["owner_name"] = owner_name;
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0e
+                S32 rlvQuestionsOther = questions;
+
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_ACCEPTPERMISSION)) )
+                {
+                        LLViewerObject* pObj = gObjectList.findObject(taskid);
+                        if (pObj)
+                        {
+                                if (pObj->permYouOwner())
+                                {
+                                        // PERMISSION_TAKE_CONTROLS and PERMISSION_ATTACH are only auto-granted to objects this avie owns
+                                        rlvQuestionsOther &= ~(LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TAKE_CONTROLS] | 
+                                                LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_ATTACH]);
+                                }
+                        }
+                }
+
+                if ( (!caution) && (!rlvQuestionsOther) )
+                {
+                        script_question_cb(0, cbdata);
+                }
+                else if (gSavedSettings.getBOOL("PermissionsCautionEnabled"))
+// [/RLVa:KB]
                 // check whether cautions are even enabled or not
-                if (gSavedSettings.getBOOL("PermissionsCautionEnabled"))
+                //if (gSavedSettings.getBOOL("PermissionsCautionEnabled"))
                 {
                         // display the caution permissions prompt
                         LLNotifications::instance().add(caution ? "ScriptQuestionCaution" : "ScriptQuestion", args, payload);
@@ -5081,6 +5403,21 @@ bool handle_lure_callback(const LLSD& notification, const LLSD& response)
 
         if(0 == option)
         {
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0b
+                bool fRlvCensorMessage = false;
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM))
+                {
+                        for (LLDynamicArray<LLUUID>::iterator it = invitees->begin(); it != invitees->end(); ++it)
+                        {
+                                if (!gRlvHandler.isException(RLV_BHVR_SENDIM, *it))
+                                {
+                                        fRlvCensorMessage = true;
+                                        break;
+                                }
+                        }
+                }
+// [/RLVa:KB]
+
                 LLMessageSystem* msg = gMessageSystem;
                 msg->newMessageFast(_PREHASH_StartLure);
                 msg->nextBlockFast(_PREHASH_AgentData);
@@ -5088,7 +5425,10 @@ bool handle_lure_callback(const LLSD& notification, const LLSD& response)
                 msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
                 msg->nextBlockFast(_PREHASH_Info);
                 msg->addU8Fast(_PREHASH_LureType, (U8)0); // sim will fill this in.
-                msg->addStringFast(_PREHASH_Message, text);
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0b
+                msg->addStringFast(_PREHASH_Message, (!fRlvCensorMessage) ? text : rlv_handler_t::cstrHidden);
+// [/RLVa:KB]
+                //msg->addStringFast(_PREHASH_Message, text);
                 for(LLSD::array_const_iterator it = notification["payload"]["ids"].beginArray();
                         it != notification["payload"]["ids"].endArray();
                         ++it)
@@ -5266,6 +5606,35 @@ void process_script_dialog(LLMessageSystem* msg, void**)
         msg->getString("Data", "Message", message);
         msg->getS32("Data", "ChatChannel", chat_channel);
 
+        // Don't show lldialog boxes from muted avs -- McCabe
+        std::string agent_name = first_name + " " + last_name;
+        if (!last_name.empty())
+        {
+                std::vector<LLMute> mutes = LLMuteList::getInstance()->getMutes();
+                for (U32 i = 0; i < mutes.size(); i++)
+                {       
+                        //this is almost like saying (mutes[i].mType != LLMute::Object), but more verbose ... -Kaku
+                        if (
+                                ((mutes[i].mType == LLMute::AGENT)
+                                        && (mutes[i].mName == agent_name))
+                                || ((mutes[i].mType == LLMute::GROUP)
+                                        && (mutes[i].mName == last_name))
+                                || ((mutes[i].mType == LLMute::BY_NAME)
+                                        //don't mute groups by name in case a group has a last name as a group name.
+                                        && ((mutes[i].mName == agent_name)))
+                        )
+                        {
+                                delete info;
+                                return;
+                        }
+                }
+        }
+        // or Scriptdialog boxes from muted objects -- Kakurady
+        if (LLMuteList::getInstance()->isMuted(info->mObjectID, title)){
+                delete info;
+                return;
+        }
+
                 // unused for now
         LLUUID image_id;
         msg->getUUID("Data", "ImageID", image_id);
@@ -5296,6 +5665,45 @@ void process_script_dialog(LLMessageSystem* msg, void**)
         LLNotificationPtr notification;
         if (!first_name.empty())
         {
+                // Dialog Spam Prevention by Cryogenic
+                if(dialogSpamOn)
+                {
+                        if(!d_spam.getStarted())
+                        {
+                                d_spam.start();
+                        }
+                        if(blacklisted_names.find(agent_name) != -1)
+                        {
+                                return;
+                        }
+                        std::map< std::string , S32 >::iterator itr = lastd_names.find(agent_name);
+                        if(itr != lastd_names.end())
+                        {
+                                if(d_spam.getElapsedTimeF32() <= gSavedSettings.getF32("SpamTime"))
+                                {
+                                        if((*itr).second > gSavedSettings.getF32("SpamCount"))
+                                        {
+                                                blacklisted_names.put(agent_name);
+                                                LL_INFOS("process_script_dialog") << "blocked " << info->mObjectID.asString() << " owned by " << agent_name << LL_ENDL;//" (" << key.asString() << ")" <<LL_ENDL;
+                                                return;
+                                        }
+                                        else
+                                        {
+                                                (*itr).second++;
+                                        }
+                                }
+                                else
+                                {
+                                        lastd_names.erase(lastd_names.begin(),lastd_names.end());
+                                        d_spam.reset();
+                                }
+                        }
+                        else
+                        {
+                                //llinfos << "Added " << fullname << " to list" << llendl;
+                                lastd_names[agent_name] = 0;
+                        }
+                }
                 args["FIRST"] = first_name;
                 args["LAST"] = last_name;
                 notification = LLNotifications::instance().add(
diff --git a/linden/indra/newview/llviewermessage.h b/linden/indra/newview/llviewermessage.h
index e7a4303..c920f85 100644
--- a/linden/indra/newview/llviewermessage.h
+++ b/linden/indra/newview/llviewermessage.h
@@ -37,7 +37,7 @@
 #include "lltransactiontypes.h"
 #include "lluuid.h"
 #include "stdenums.h"
-
+#include "llfloaterbump.h"
 //
 // Forward declarations
 //
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 8608b34..c1d5013 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
+ * Copyright (c) 2006-2008, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -35,158 +35,19 @@
 
 #include "llviewernetwork.h"
 #include "llviewercontrol.h"
+#include "llstartup.h"
 
-struct LLGridData
-{
-        const char* mLabel;
-  const char* mCodeName;
-        const char* mName;
-        const char* mLoginURI;
-        const char* mHelperURI;
-};
-
-static LLGridData gGridInfo[GRID_INFO_COUNT] = 
-{
-        { "None", "", "", "", "" },
-        { "SL Main Grid",
-          "Agni",
-          "util.agni.lindenlab.com", 
-          "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
-          "https://secondlife.com/helpers/" },
-        { "SL Beta Grid",
-          "Aditi",
-          "util.aditi.lindenlab.com",
-          "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
-          "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
-        { "Local OpenSim",
-          "",
-          "localhost",
-          "http://127.0.0.1:9000",
-          "" },
-        { "Other", "", "", "", "" }
-};
-
-const EGridInfo DEFAULT_GRID_CHOICE = GRID_INFO_AGNI;
+ #include "hippoGridManager.h"
 
 
 unsigned char gMACAddress[MAC_ADDRESS_BYTES];           /* Flawfinder: ignore */
 
-LLViewerLogin::LLViewerLogin() :
-        mGridChoice(DEFAULT_GRID_CHOICE)
-{
-}
-
-void LLViewerLogin::setGridChoice(EGridInfo grid)
-{       
-        if(grid < 0 || grid >= GRID_INFO_COUNT)
-        {
-                llerrs << "Invalid grid index specified." << llendl;
-        }
-
-        if(mGridChoice != grid || gSavedSettings.getS32("ServerChoice") != grid)
-        {
-                mGridChoice = grid;
-                if(GRID_INFO_LOCAL == mGridChoice)
-                {
-                        mGridName = LOOPBACK_ADDRESS_STRING;
-                }
-                else if(GRID_INFO_OTHER == mGridChoice)
-                {
-                        // *FIX:Mani - could this possibly be valid?
-                        mGridName = "other"; 
-                }
-                else
-                {
-                        mGridName = gGridInfo[mGridChoice].mLabel;
-                }
-
-                gSavedSettings.setS32("ServerChoice", mGridChoice);
-                gSavedSettings.setString("CustomServer", "");
-        }
-}
-
-void LLViewerLogin::setGridChoice(const std::string& grid_name)
-{
-        // Set the grid choice based on a string.
-        // The string can be:
-        // - a grid label from the gGridInfo table 
-        // - an ip address
-        if(!grid_name.empty())
-        {
-                // find the grid choice from the user setting.
-                int grid_index = GRID_INFO_NONE; 
-                for(;grid_index < GRID_INFO_OTHER; ++grid_index)
-                {
-                        if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name))
-                        {
-                                // Founding a matching label in the list...
-                                setGridChoice((EGridInfo)grid_index);
-                                break;
-                        }
-                }
-
-                if(GRID_INFO_OTHER == grid_index)
-                {
-                        // *FIX:MEP Can and should we validate that this is an IP address?
-                        mGridChoice = GRID_INFO_OTHER;
-                        mGridName = grid_name;
-                        gSavedSettings.setS32("ServerChoice", mGridChoice);
-                        gSavedSettings.setString("CustomServer", mGridName);
-                }
-        }
-}
-
-void LLViewerLogin::resetURIs()
-{
-        // Clear URIs when picking a new server
-        gSavedSettings.setValue("CmdLineLoginURI", LLSD::emptyArray());
-        gSavedSettings.setString("CmdLineHelperURI", "");
-}
-
-EGridInfo LLViewerLogin::getGridChoice() const
-{
-        return mGridChoice;
-}
-
-std::string LLViewerLogin::getGridLabel() const
-{
-        if(mGridChoice == GRID_INFO_NONE)
-        {
-                return "None";
-        }
-        else if(mGridChoice < GRID_INFO_OTHER)
-        {
-                return gGridInfo[mGridChoice].mLabel;
-        }
-
-        return mGridName;
-}
-
-std::string LLViewerLogin::getGridCodeName() const
-{
-        // Fall back to grid label if code name is empty.
-        if( strcmp(gGridInfo[mGridChoice].mCodeName, "") == 0 )
-        {
-                return getGridLabel();
-        }
-
-        return gGridInfo[mGridChoice].mCodeName;
-}
-
-std::string LLViewerLogin::getKnownGridLabel(EGridInfo grid_index) const
-{
-        if(grid_index > GRID_INFO_NONE && grid_index < GRID_INFO_OTHER)
-        {
-                return gGridInfo[grid_index].mLabel;
-        }
-        return gGridInfo[GRID_INFO_NONE].mLabel;
-}
 
 void LLViewerLogin::getLoginURIs(std::vector<std::string>& uris) const
 {
         // return the login uri set on the command line.
         LLControlVariable* c = gSavedSettings.getControl("CmdLineLoginURI");
-        if(c)
+        if(c && !LLStartUp::shouldAutoLogin())
         {
                 LLSD v = c->getValue();
                 if(v.isArray())
@@ -210,10 +71,12 @@ void LLViewerLogin::getLoginURIs(std::vector<std::string>& uris) const
                         }
                 }
         }
-
+        
         // If there was no command line uri...
         if(uris.empty())
         {
+                uris.push_back(gHippoGridManager->getConnectedGrid()->getLoginUri());
+                /*
                 // If its a known grid choice, get the uri from the table,
                 // else try the grid name.
                 if(mGridChoice > GRID_INFO_NONE && mGridChoice < GRID_INFO_OTHER)
@@ -223,44 +86,36 @@ void LLViewerLogin::getLoginURIs(std::vector<std::string>& uris) const
                 else
                 {
                         uris.push_back(mGridName);
-                }
+                } */
         }
 }
 
-std::string LLViewerLogin::getHelperURI() const
+const std::string &LLViewerLogin::getGridLabel() const
 {
-        std::string helper_uri = gSavedSettings.getString("CmdLineHelperURI");
-        if (helper_uri.empty())
-        {
-                // grab URI from selected grid
-                if(mGridChoice > GRID_INFO_NONE && mGridChoice < GRID_INFO_OTHER)
-                {
-                        helper_uri = gGridInfo[mGridChoice].mHelperURI;
-                }
+        return gHippoGridManager->getConnectedGrid()->getGridNick();
+}
 
-                if (helper_uri.empty())
-                {
-                        // what do we do with unnamed/miscellaneous grids?
-                        // for now, operations that rely on the helper URI (currency/land purchasing) will fail
-                }
-        }
-        return helper_uri;
+const std::string &LLViewerLogin::getLoginPage() const
+{
+        return gHippoGridManager->getConnectedGrid()->getLoginPage();
 }
 
-bool LLViewerLogin::isInProductionGrid()
+const std::string &LLViewerLogin::getHelperURI() const
 {
-        // *NOTE:Mani This used to compare GRID_INFO_AGNI to gGridChoice,
-        // but it seems that loginURI trumps that.
-        std::vector<std::string> uris;
-        getLoginURIs(uris);
-        LLStringUtil::toLower(uris[0]);
+        return gHippoGridManager->getConnectedGrid()->getHelperUri();
+}
+  
+bool LLViewerLogin::isOpenSimulator()
+{
+        return gHippoGridManager->getConnectedGrid()->isOpenSimulator();
+}
 
-        // Returns true for every grid but Aditi now,
-        // because opensim grids have feelings too! -- McCabe
-        if((uris[0].find("aditi") != std::string::npos))
-        {
-                return false;
-        }
+bool LLViewerLogin::isSecondLife()
+{
+        return gHippoGridManager->getConnectedGrid()->isSecondLife();
+}
 
+bool LLViewerLogin::isInProductionGrid()
+{
         return true;
 }
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 45d19d6..fd1a34b 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -5,7 +5,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
+ * Copyright (c) 2006-2008, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -30,21 +30,9 @@
  * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
  */
-
 #ifndef LL_LLVIEWERNETWORK_H
 #define LL_LLVIEWERNETWORK_H
 
-class LLHost;
-
-enum EGridInfo
-{
-        GRID_INFO_NONE,
-        GRID_INFO_AGNI,
-        GRID_INFO_ADITI,
-        GRID_INFO_LOCAL,
-        GRID_INFO_OTHER, // IP address set via command line option
-        GRID_INFO_COUNT
-};
 
 /**
  * @brief A class to manage the viewer's login state.
@@ -53,53 +41,20 @@ enum EGridInfo
 class LLViewerLogin : public LLSingleton<LLViewerLogin>
 {
 public:
-        LLViewerLogin();
-
-        void setGridChoice(EGridInfo grid);
-        void setGridChoice(const std::string& grid_name);
-        void resetURIs();
-
-        /**
-        * @brief Get the enumeration of the grid choice.
-        * Should only return values > 0 && < GRID_INFO_COUNT
-        **/
-        EGridInfo getGridChoice() const;
-
-        /**
-        * @brief Get a readable label for the grid choice.
-        * Returns the readable name for the grid choice. 
-        * If the grid is 'other', returns something
-        * the string used to specifiy the grid.
-        **/
-        std::string getGridLabel() const; 
-
-  /**
-   * @brief Get the code name for the grid choice.
-   *
-   * Returns the code name for the grid choice, as designated
-   * by Linden Lab. The SL main grid is Agni, and the beta
-   * grid is Aditi. There are other LL testing grids with code
-   * names, but we don't care about those.
-   *
-   * This string is used primarily for fetching the proper
-   * login splash page, since the web server expects "Agni"
-   * and "Aditi", not "SL Main Grid" and "SL Beta Grid".
-   */
-        std::string getGridCodeName() const; 
-
-        std::string getKnownGridLabel(EGridInfo grid_index) const; 
-
         void getLoginURIs(std::vector<std::string>& uris) const;
-        std::string getHelperURI() const;
+        const std::string &getGridLabel() const; 
+        const std::string &getLoginPage() const;
+        const std::string &getHelperURI() const;
 
-        bool isInProductionGrid();
+        bool isOpenSimulator();
+        bool isSecondLife();
 
-private:
-        EGridInfo mGridChoice;
-        std::string mGridName;
+        bool isInProductionGrid();
 };
 
+
 const S32 MAC_ADDRESS_BYTES = 6;
 extern unsigned char gMACAddress[MAC_ADDRESS_BYTES];            /* Flawfinder: ignore */
 
+
 #endif
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 6591cd3..51908a5 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -1007,6 +1007,12 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                         coloru.mV[3] = 255 - coloru.mV[3];
                                         mText->setColor(LLColor4(coloru));
                                         mText->setStringUTF8(temp_string);
+// [RLVa:KB] - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+                                        if (rlv_handler_t::isEnabled())
+                                        {
+                                                mText->setObjectText(temp_string);
+                                        }
+// [/RLVa:KB]
                                         
                                         if (mDrawable.notNull())
                                         {
@@ -1424,6 +1430,12 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                         coloru.mV[3] = 255 - coloru.mV[3];
                                         mText->setColor(LLColor4(coloru));
                                         mText->setStringUTF8(temp_string);
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+                                        if (rlv_handler_t::isEnabled())
+                                        {
+                                                mText->setObjectText(temp_string);
+                                        }
+// [/RLVa:KB]
 
                                         setChanged(TEXTURE);
                                 }
@@ -4820,7 +4832,10 @@ BOOL LLViewerObject::permTransfer() const
 // given you modify rights to.  JC
 BOOL LLViewerObject::allowOpen() const
 {
-        return !flagInventoryEmpty() && (permYouOwner() || permModify());
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0b)
+        return !flagInventoryEmpty() && (permYouOwner() || permModify()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_EDIT));
+// [/RLVa:KB]
+//      return !flagInventoryEmpty() && (permYouOwner() || permModify());
 }
 
 LLViewerObject::LLInventoryCallbackInfo::~LLInventoryCallbackInfo()
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index db69399..633e0eb 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -50,6 +50,7 @@
 #include "v3dmath.h"
 #include "v3math.h"
 #include "llvertexbuffer.h"
+#include "llpartdata.h"
 
 class LLAgent;                  // TODO: Get rid of this.
 class LLAudioSource;
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 4961f48..059925e 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -75,6 +75,8 @@
 
 #include "llappviewer.h"
 
+#include "primbackup.h"
+
 extern F32 gMinObjectDistance;
 extern BOOL gAnimateTextures;
 
@@ -164,7 +166,7 @@ U64 LLViewerObjectList::getIndex(const U32 local_id,
 
 BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
 {
-        if(object.getRegion())
+        if (object.mRegionp)
         {
                 U32 local_id = object.mLocalID;
                 LLHost region_host = object.getRegion()->getHost();
@@ -176,8 +178,7 @@ BOOL LLViewerObjectList::removeFromLocalIDTable(const LLViewerObject &object)
                 U64     indexid = (((U64)index) << 32) | (U64)local_id;
                 return sIndexAndLocalIDToUUID.erase(indexid) > 0 ? TRUE : FALSE;
         }
-
-        return FALSE ;
+        return FALSE;
 }
 
 void LLViewerObjectList::setUUIDAndLocal(const LLUUID &id,
@@ -223,6 +224,11 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
 
         updateActive(objectp);
 
+        if(!just_created)
+                primbackup::getInstance()->prim_update(objectp);
+        
+
+
         if (just_created) 
         {
                 gPipeline.addObject(objectp);
@@ -252,6 +258,9 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
                 objectp->mCreateSelected = false;
                 gViewerWindow->getWindow()->decBusyCount();
                 gViewerWindow->getWindow()->setCursor( UI_CURSOR_ARROW );
+
+                primbackup::getInstance()->newprim(objectp);
+
         }
 }
 
@@ -828,17 +837,10 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep)
 
         for (S32 i = 0; i < drawablep->getNumFaces(); i++)
         {
-                LLFace* facep = drawablep->getFace(i) ;
-                if(facep)
-                {
-                           LLViewerObject* objectp = facep->getViewerObject();
-                           if(objectp)
-                           {
+                LLViewerObject* objectp = drawablep->getFace(i)->getViewerObject();
                                            mSelectPickList.erase(objectp);
                            }
                 }
-        }
-}
 
 BOOL LLViewerObjectList::killObject(LLViewerObject *objectp)
 {
@@ -915,7 +917,7 @@ void LLViewerObjectList::killAllObjects()
         if (!mMapObjects.empty())
         {
                 llwarns << "Some objects still on map object list!" << llendl;
-                mMapObjects.clear();
+                mActiveObjects.clear();
         }
 }
 
diff --git a/linden/indra/newview/llviewerobjectlist.h b/linden/indra/newview/llviewerobjectlist.h
index ba31f70..721bab1 100644
--- a/linden/indra/newview/llviewerobjectlist.h
+++ b/linden/indra/newview/llviewerobjectlist.h
@@ -44,6 +44,7 @@
 // project includes
 #include "llviewerobject.h"
 
+class LLCamera;
 class LLNetMap;
 class LLDebugBeacon;
 
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 0a01e23..19b646c 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -887,10 +887,12 @@ bool LLViewerRegion::isAlive()
 
 BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos)
 {
-        if (mParcelOverlay)
+        if (mParcelOverlay && !gDisconnected)
         {
                 return mParcelOverlay->isOwnedSelf(pos);
-        } else {
+        } 
+        else 
+        {
                 return FALSE;
         }
 }
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 46908f5..5e131b9 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -96,6 +96,13 @@ public:
                 }
                 else
                 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) )
+                        {
+                                return;
+                        }
+// [/RLVa:KB]
+
                         // See if we can bring an existing preview to the front
                         if(!LLPreview::show(item->getUUID(), true))
                         {
@@ -896,51 +903,9 @@ BOOL LLViewerTextEditor::handleHover(S32 x, S32 y, MASK mask)
 
 BOOL LLViewerTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-        BOOL    handled = FALSE;
-
-        // let scrollbar have first dibs
-        handled = LLView::childrenHandleMouseUp(x, y, mask) != NULL;
-
-        // Used to enable I Agree checkbox if the user scrolled through entire text
-        BOOL was_scrolled_to_bottom = (mScrollbar->getDocPos() == mScrollbar->getDocPosMax());
-        if (mOnScrollEndCallback && was_scrolled_to_bottom)
-        {
-                mOnScrollEndCallback(mOnScrollEndData);
-        }
-
-        if( !handled && mTakesNonScrollClicks)
-        {
-                if( mIsSelecting )
-                {
-                        // Finish selection
-                        if( y > getTextRect().mTop )
-                        {
-                                mScrollbar->setDocPos( mScrollbar->getDocPos() - 1 );
-                        }
-                        else
-                        if( y < getTextRect().mBottom )
-                        {
-                                mScrollbar->setDocPos( mScrollbar->getDocPos() + 1 );
-                        }
-                        
-                        setCursorAtLocalPos( x, y, TRUE );
-                        endSelection();
-
-                        updateScrollFromCursor();
-                }
-                
-                if( !hasSelection() )
-                {
-                        handleMouseUpOverSegment( x, y, mask );
-                }
-
-                handled = TRUE;
-        }
-
-        // Delay cursor flashing
-        resetKeystrokeTimer();
+        BOOL handled = FALSE;
 
-        if( hasMouseCapture()  )
+        if( hasMouseCapture() )
         {
                 if (mDragItem)
                 {
@@ -960,8 +925,15 @@ BOOL LLViewerTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
                         }
                 }
                 mDragItem = NULL;
-                gFocusMgr.setMouseCapture( NULL );
-                handled = TRUE;
+        }
+
+        handled = LLTextEditor::handleMouseUp(x,y,mask);
+
+        // Used to enable I Agree checkbox if the user scrolled through entire text
+        BOOL was_scrolled_to_bottom = (mScrollbar->getDocPos() == mScrollbar->getDocPosMax());
+        if (mOnScrollEndCallback && was_scrolled_to_bottom)
+        {
+                mOnScrollEndCallback(mOnScrollEndData);
         }
 
         return handled;
@@ -1003,6 +975,24 @@ BOOL LLViewerTextEditor::handleRightMouseDown(S32 x, S32 y, MASK mask)
         return handled;
 }
 
+BOOL LLViewerTextEditor::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
+{
+        BOOL    handled = FALSE;
+        handled = childrenHandleMiddleMouseDown(x, y, mask) != NULL;
+        if (!handled)
+        {
+                handled = LLTextEditor::handleMiddleMouseDown(x, y, mask);
+        }
+        return handled;
+}
+
+BOOL LLViewerTextEditor::handleMiddleMouseUp(S32 x, S32 y, MASK mask)
+{
+        BOOL handled = childrenHandleMiddleMouseUp(x, y, mask) != NULL;
+
+        return handled;
+}
+
 BOOL LLViewerTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
         BOOL    handled = FALSE;
@@ -1025,7 +1015,6 @@ BOOL LLViewerTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
                                 }
                         }
                 }
-
         
                 setCursorAtLocalPos( x, y, FALSE );
                 deselect();
@@ -1063,6 +1052,9 @@ BOOL LLViewerTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
                 // delay cursor flashing
                 resetKeystrokeTimer();
 
+                // take selection to 'primary' clipboard
+                updatePrimary();
+
                 handled = TRUE;
         }
         return handled;
diff --git a/linden/indra/newview/llviewertexteditor.h b/linden/indra/newview/llviewertexteditor.h
index ae672d8..f29caee 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -59,6 +59,8 @@ public:
         // mousehandler overrides
         virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
+        virtual BOOL    handleMiddleMouseDown(S32 x, S32 y, MASK mask);
+        virtual BOOL    handleMiddleMouseUp(S32 x, S32 y, MASK mask);
         virtual BOOL    handleRightMouseDown(S32 x, S32 y, MASK mask);
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
         virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask );
diff --git a/linden/indra/newview/llviewerthrottle.cpp b/linden/indra/newview/llviewerthrottle.cpp
index bf779c4..246e5e4 100644
--- a/linden/indra/newview/llviewerthrottle.cpp
+++ b/linden/indra/newview/llviewerthrottle.cpp
@@ -50,7 +50,7 @@ const F32 MAX_FRACTIONAL = 1.5f;
 const F32 MIN_FRACTIONAL = 0.2f;
 
 const F32 MIN_BANDWIDTH = 50.f;
-const F32 MAX_BANDWIDTH = 1500.f;
+const F32 MAX_BANDWIDTH = 5000.f;
 const F32 STEP_FRACTIONAL = 0.1f;
 const F32 TIGHTEN_THROTTLE_THRESHOLD = 3.0f; // packet loss % per s
 const F32 EASE_THROTTLE_THRESHOLD = 0.5f; // packet loss % per s
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index c0e4fed..022515a 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -589,19 +589,42 @@ bool LLViewerWindow::shouldShowToolTipFor(LLMouseHandler *mh)
         return false;
 }
 
-BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask)
+BOOL LLViewerWindow::handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down)
 {
+        std::string buttonname;
+        std::string buttonstatestr; 
+        BOOL handled = FALSE;   
         S32 x = pos.mX;
         S32 y = pos.mY;
         x = llround((F32)x / mDisplayScale.mV[VX]);
         y = llround((F32)y / mDisplayScale.mV[VY]);
 
-        LLView::sMouseHandlerMessage.clear();
-
-        if (gDebugClicks)
+        if (down)
+                buttonstatestr = "down" ;
+        else
+                buttonstatestr = "up" ;
+        
+        switch (clicktype)
         {
-                llinfos << "ViewerWindow left mouse down at " << x << "," << y << llendl;
+        case LLMouseHandler::CLICK_LEFT:
+                mLeftMouseDown = down;
+                buttonname = "Left";
+                break;
+        case LLMouseHandler::CLICK_RIGHT:
+                mRightMouseDown = down;
+                buttonname = "Right";
+                break;
+        case LLMouseHandler::CLICK_MIDDLE:
+                mMiddleMouseDown = down;
+                buttonname = "Middle";
+                break;
+        case LLMouseHandler::CLICK_DOUBLELEFT:
+                mLeftMouseDown = down;
+                buttonname = "Left Double Click";
+                break;
         }
+        
+        LLView::sMouseHandlerMessage.clear();
 
         if (gMenuBarView)
         {
@@ -609,18 +632,28 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
                 gMenuBarView->resetMenuTrigger();
         }
 
-        mLeftMouseDown = TRUE;
+        if (gDebugClicks)
+        {       
+                llinfos << "ViewerWindow " << buttonname << " mouse " << buttonstatestr << " at " << x << "," << y << llendl;
+        }
 
         // Make sure we get a coresponding mouseup event, even if the mouse leaves the window
-        mWindow->captureMouse();
+        if (down)
+        {
+                mWindow->captureMouse();
+        }
+        else
+        {
+                mWindow->releaseMouse();
+        }
 
         // Indicate mouse was active
         gMouseIdleTimer.reset();
 
         // Hide tooltips on mousedown
-        mToolTipBlocked = TRUE;
+        mToolTipBlocked = down;
 
-        // Also hide hover info on mousedown
+        // Also hide hover info on mousedown/mouseup
         if (gHoverView)
         {
                 gHoverView->cancelHover();
@@ -629,7 +662,7 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
         // Don't let the user move the mouse out of the window until mouse up.
         if( LLToolMgr::getInstance()->getCurrentTool()->clipMouseWhenDown() )
         {
-                mWindow->setMouseClipping(TRUE);
+                mWindow->setMouseClipping(down);
         }
 
         LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
@@ -640,10 +673,9 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
                 mouse_captor->screenPointToLocal( x, y, &local_x, &local_y );
                 if (LLView::sDebugMouseHandling)
                 {
-                        llinfos << "Left Mouse Down handled by captor " << mouse_captor->getName() << llendl;
+                        llinfos << buttonname << " Mouse " << buttonstatestr << " handled by captor " << mouse_captor->getName() << llendl;
                 }
-
-                return mouse_captor->handleMouseDown(local_x, local_y, mask);
+                return mouse_captor->handleAnyMouseClick(local_x, local_y, mask, clicktype, down);
         }
 
         // Topmost view gets a chance before the hierarchy
@@ -652,215 +684,95 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
         {
                 S32 local_x, local_y;
                 top_ctrl->screenPointToLocal( x, y, &local_x, &local_y );
-                if (top_ctrl->pointInView(local_x, local_y))
+                if (down)
                 {
-                        return top_ctrl->handleMouseDown(local_x, local_y, mask);
-                }
-                else
-                {
-                        gFocusMgr.setTopCtrl(NULL);
+                        if (top_ctrl->pointInView(local_x, local_y))
+                        {
+                                return top_ctrl->handleAnyMouseClick(local_x, local_y, mask, clicktype, down)   ;
+                        }
+                        else
+                        {
+                                gFocusMgr.setTopCtrl(NULL);
+                        }
                 }
-        }
+                else 
+                        handled = top_ctrl->pointInView(local_x, local_y) && top_ctrl->handleMouseUp(local_x, local_y, mask);
+
 
+        }
         // Give the UI views a chance to process the click
-        if( mRootView->handleMouseDown(x, y, mask) )
+        if( mRootView->handleAnyMouseClick(x, y, mask, clicktype, down) )
         {
                 if (LLView::sDebugMouseHandling)
                 {
-                        llinfos << "Left Mouse Down" << LLView::sMouseHandlerMessage << llendl;
+                        llinfos << buttonname << " Mouse " << buttonstatestr << " " << LLView::sMouseHandlerMessage << llendl;
                 }
                 return TRUE;
         }
         else if (LLView::sDebugMouseHandling)
         {
-                llinfos << "Left Mouse Down not handled by view" << llendl;
+                llinfos << buttonname << " Mouse " << buttonstatestr << " not handled by view" << llendl;
         }
-
-        if (gDisconnected)
+        if (down)
         {
-                return FALSE;
-        }
-
-        if(LLToolMgr::getInstance()->getCurrentTool()->handleMouseDown( x, y, mask ) )
-        {
-                // This is necessary to force clicks in the world to cause edit
-                // boxes that might have keyboard focus to relinquish it, and hence
-                // cause a commit to update their value.  JC
-                gFocusMgr.setKeyboardFocus(NULL);
-                return TRUE;
-        }
-
-        return FALSE;
-}
-
-BOOL LLViewerWindow::handleDoubleClick(LLWindow *window,  LLCoordGL pos, MASK mask)
-{
-        S32 x = pos.mX;
-        S32 y = pos.mY;
-        x = llround((F32)x / mDisplayScale.mV[VX]);
-        y = llround((F32)y / mDisplayScale.mV[VY]);
-
-        LLView::sMouseHandlerMessage.clear();
-
-        if (gDebugClicks)
-        {
-                llinfos << "ViewerWindow left mouse double-click at " << x << "," << y << llendl;
-        }
-
-        mLeftMouseDown = TRUE;
-
-        // Hide tooltips
-        if( mToolTip )
-        {
-                mToolTip->setVisible( FALSE );
-        }
-
-        LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
-        if( mouse_captor )
-        {
-                S32 local_x;
-                S32 local_y;
-                mouse_captor->screenPointToLocal( x, y, &local_x, &local_y );
-                if (LLView::sDebugMouseHandling)
+                if (gDisconnected)
                 {
-                        llinfos << "Left Mouse Down handled by captor " << mouse_captor->getName() << llendl;
-                }
-
-                return mouse_captor->handleDoubleClick(local_x, local_y, mask);
-        }
-
-        // Check for hit on UI.
-        LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
-        if (top_ctrl)
-        {
-                S32 local_x, local_y;
-                top_ctrl->screenPointToLocal( x, y, &local_x, &local_y );
-                if (top_ctrl->pointInView(local_x, local_y))
-                {
-                        return top_ctrl->handleDoubleClick(local_x, local_y, mask);
+                        return FALSE;
                 }
-                else
+        
+                if(LLToolMgr::getInstance()->getCurrentTool()->handleAnyMouseClick( x, y, mask, clicktype, down ) )
                 {
-                        gFocusMgr.setTopCtrl(NULL);
+                        // This is necessary to force clicks in the world to cause edit
+                        // boxes that might have keyboard focus to relinquish it, and hence
+                        // cause a commit to update their value.  JC
+                        gFocusMgr.setKeyboardFocus(NULL);
+                        return TRUE;
                 }
         }
-
-        if (mRootView->handleDoubleClick(x, y, mask)) 
+        else
         {
-                if (LLView::sDebugMouseHandling)
+
+                mWindow->releaseMouse();
+
+                LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
+                if( !handled )
                 {
-                        llinfos << "Left Mouse Down" << LLView::sMouseHandlerMessage << llendl;
+                        handled = mRootView->handleAnyMouseClick(x, y, mask, clicktype, down);
+                }
+        
+        
+        
+                if( !handled )
+                {
+                        if (tool)
+                        {
+                                handled = tool->handleAnyMouseClick(x, y, mask, clicktype, down);
+                        }
                 }
-                return TRUE;
-        }
-        else if (LLView::sDebugMouseHandling)
-        {
-                llinfos << "Left Mouse Down not handled by view" << llendl;
         }
 
-                // Why is this here?  JC 9/3/2002
-        if (gNoRender) 
-        {
-                return TRUE;
-        }
+        return (!down);
+}
 
-        if(LLToolMgr::getInstance()->getCurrentTool()->handleDoubleClick( x, y, mask ) )
-        {
-                return TRUE;
-        }
+BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask)
+{
+        BOOL down = TRUE;
+        return handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_LEFT,down);
+}
 
-        // if we got this far and nothing handled a double click, pass a normal mouse down
-        return handleMouseDown(window, pos, mask);
+BOOL LLViewerWindow::handleDoubleClick(LLWindow *window,  LLCoordGL pos, MASK mask)
+{
+        // try handling as a double-click first, then a single-click if that
+        // wasn't handled.
+        BOOL down = TRUE;
+        return handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_DOUBLELEFT,down) ||
+                handleMouseDown(window, pos, mask);
 }
 
 BOOL LLViewerWindow::handleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask)
 {
-        S32 x = pos.mX;
-        S32 y = pos.mY;
-        x = llround((F32)x / mDisplayScale.mV[VX]);
-        y = llround((F32)y / mDisplayScale.mV[VY]);
-
-        LLView::sMouseHandlerMessage.clear();
-
-        if (gDebugClicks)
-        {
-                llinfos << "ViewerWindow left mouse up" << llendl;
-        }
-
-        mLeftMouseDown = FALSE;
-
-        // Indicate mouse was active
-        gMouseIdleTimer.reset();
-
-        // Hide tooltips on mouseup
-        if( mToolTip )
-        {
-                mToolTip->setVisible( FALSE );
-        }
-
-        // Also hide hover info on mouseup
-        if (gHoverView) gHoverView->cancelHover();
-
-        BOOL handled = FALSE;
-
-        mWindow->releaseMouse();
-
-        LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
-
-        if( tool->clipMouseWhenDown() )
-        {
-                mWindow->setMouseClipping(FALSE);
-        }
-
-        LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
-        if( mouse_captor )
-        {
-                S32 local_x;
-                S32 local_y;
-                mouse_captor->screenPointToLocal( x, y, &local_x, &local_y );
-                if (LLView::sDebugMouseHandling)
-                {
-                        llinfos << "Left Mouse Up handled by captor " << mouse_captor->getName() << llendl;
-                }
-
-                return mouse_captor->handleMouseUp(local_x, local_y, mask);
-        }
-
-        LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
-        if (top_ctrl)
-        {
-                S32 local_x, local_y;
-                top_ctrl->screenPointToLocal( x, y, &local_x, &local_y );
-                handled = top_ctrl->pointInView(local_x, local_y) && top_ctrl->handleMouseUp(local_x, local_y, mask);
-        }
-
-        if( !handled )
-        {
-                handled = mRootView->handleMouseUp(x, y, mask);
-        }
-
-        if (LLView::sDebugMouseHandling)
-        {
-                if (handled)
-                {
-                        llinfos << "Left Mouse Up" << LLView::sMouseHandlerMessage << llendl;
-                }
-                else 
-                {
-                        llinfos << "Left Mouse Up not handled by view" << llendl;
-                }
-        }
-
-        if( !handled )
-        {
-                if (tool)
-                {
-                        handled = tool->handleMouseUp(x, y, mask);
-                }
-        }
-
-        // Always handled as far as the OS is concerned.
-        return TRUE;
+        BOOL down = FALSE;
+        return handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_LEFT,down);
 }
 
 
@@ -871,91 +783,10 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
         x = llround((F32)x / mDisplayScale.mV[VX]);
         y = llround((F32)y / mDisplayScale.mV[VY]);
 
-        LLView::sMouseHandlerMessage.clear();
-
-        if (gDebugClicks)
-        {
-                llinfos << "ViewerWindow right mouse down at " << x << "," << y << llendl;
-        }
-
-        if (gMenuBarView)
-        {
-                // stop ALT-key access to menu
-                gMenuBarView->resetMenuTrigger();
-        }
-
-        mRightMouseDown = TRUE;
-
-        // Make sure we get a coresponding mouseup event, even if the mouse leaves the window
-        mWindow->captureMouse();
-
-        // Hide tooltips
-        if( mToolTip )
-        {
-                mToolTip->setVisible( FALSE );
-        }
-
-        // Also hide hover info on mousedown
-        if (gHoverView)
-        {
-                gHoverView->cancelHover();
-        }
-
-        // Don't let the user move the mouse out of the window until mouse up.
-        if( LLToolMgr::getInstance()->getCurrentTool()->clipMouseWhenDown() )
-        {
-                mWindow->setMouseClipping(TRUE);
-        }
-
-        LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
-        if( mouse_captor )
-        {
-                S32 local_x;
-                S32 local_y;
-                mouse_captor->screenPointToLocal( x, y, &local_x, &local_y );
-                if (LLView::sDebugMouseHandling)
-                {
-                        llinfos << "Right Mouse Down handled by captor " << mouse_captor->getName() << llendl;
-                }
-                return mouse_captor->handleRightMouseDown(local_x, local_y, mask);
-        }
-
-        LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
-        if (top_ctrl)
-        {
-                S32 local_x, local_y;
-                top_ctrl->screenPointToLocal( x, y, &local_x, &local_y );
-                if (top_ctrl->pointInView(local_x, local_y))
-                {
-                        return top_ctrl->handleRightMouseDown(local_x, local_y, mask);
-                }
-                else
-                {
-                        gFocusMgr.setTopCtrl(NULL);
-                }
-        }
-
-        if( mRootView->handleRightMouseDown(x, y, mask) )
-        {
-                if (LLView::sDebugMouseHandling)
-                {
-                        llinfos << "Right Mouse Down" << LLView::sMouseHandlerMessage << llendl;
-                }
-                return TRUE;
-        }
-        else if (LLView::sDebugMouseHandling)
-        {
-                llinfos << "Right Mouse Down not handled by view" << llendl;
-        }
-
-        if(LLToolMgr::getInstance()->getCurrentTool()->handleRightMouseDown( x, y, mask ) )
-        {
-                // This is necessary to force clicks in the world to cause edit
-                // boxes that might have keyboard focus to relinquish it, and hence
-                // cause a commit to update their value.  JC
-                gFocusMgr.setKeyboardFocus(NULL);
-                return TRUE;
-        }
+        BOOL down = TRUE;
+        BOOL handle = handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_RIGHT,down);
+        if (handle)
+                return handle;
 
         // *HACK: this should be rolled into the composite tool logic, not
         // hardcoded at the top level.
@@ -973,107 +804,27 @@ BOOL LLViewerWindow::handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK
 
 BOOL LLViewerWindow::handleRightMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask)
 {
-        S32 x = pos.mX;
-        S32 y = pos.mY;
-        x = llround((F32)x / mDisplayScale.mV[VX]);
-        y = llround((F32)y / mDisplayScale.mV[VY]);
-
-        LLView::sMouseHandlerMessage.clear();
-
-        // Don't care about caps lock for mouse events.
-        if (gDebugClicks)
-        {
-                llinfos << "ViewerWindow right mouse up" << llendl;
-        }
-
-        mRightMouseDown = FALSE;
-
-        // Indicate mouse was active
-        gMouseIdleTimer.reset();
-
-        // Hide tooltips on mouseup
-        if( mToolTip )
-        {
-                mToolTip->setVisible( FALSE );
-        }
-
-        // Also hide hover info on mouseup
-        if (gHoverView) gHoverView->cancelHover();
-
-        BOOL handled = FALSE;
-
-        mWindow->releaseMouse();
-
-        LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
-
-        if( tool->clipMouseWhenDown() )
-        {
-                mWindow->setMouseClipping(FALSE);
-        }
-
-        LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
-        if( mouse_captor )
-        {
-                S32 local_x;
-                S32 local_y;
-                mouse_captor->screenPointToLocal( x, y, &local_x, &local_y );
-                if (LLView::sDebugMouseHandling)
-                {
-                        llinfos << "Right Mouse Up handled by captor " << mouse_captor->getName() << llendl;
-                }
-                return mouse_captor->handleRightMouseUp(local_x, local_y, mask);
-        }
-
-        LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
-        if (top_ctrl)
-        {
-                S32 local_x, local_y;
-                top_ctrl->screenPointToLocal( x, y, &local_x, &local_y );
-                handled = top_ctrl->pointInView(local_x, local_y) && top_ctrl->handleRightMouseUp(local_x, local_y, mask);
-        }
-
-        if( !handled )
-        {
-                handled = mRootView->handleRightMouseUp(x, y, mask);
-        }
-
-        if (LLView::sDebugMouseHandling)
-        {
-                if (handled)
-                {
-                        llinfos << "Right Mouse Up" << LLView::sMouseHandlerMessage << llendl;
-                }
-                else 
-                {
-                        llinfos << "Right Mouse Up not handled by view" << llendl;
-                }
-        }
-
-        if( !handled )
-        {
-                if (tool)
-                {
-                        handled = tool->handleRightMouseUp(x, y, mask);
-                }
-        }
-
-        // Always handled as far as the OS is concerned.
-        return TRUE;
+        BOOL down = FALSE;
+        return handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_RIGHT,down);
 }
 
 BOOL LLViewerWindow::handleMiddleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask)
 {
+        BOOL down = TRUE;
         gVoiceClient->middleMouseState(true);
-
-        // Always handled as far as the OS is concerned.
+        handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_MIDDLE,down);
+  
+        // Always handled as far as the OS is concerned.
         return TRUE;
 }
-
+  
 BOOL LLViewerWindow::handleMiddleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask)
 {
+        BOOL down = FALSE;
         gVoiceClient->middleMouseState(false);
-
-        // Always handled as far as the OS is concerned.
+        handleAnyMouseClick(window,pos,mask,LLMouseHandler::CLICK_MIDDLE,down);
+  
+        // Always handled as far as the OS is concerned.
         return TRUE;
 }
 
@@ -1447,6 +1198,7 @@ LLViewerWindow::LLViewerWindow(
         mWindowRect(0, height, width, 0),
         mVirtualWindowRect(0, height, width, 0),
         mLeftMouseDown(FALSE),
+        mMiddleMouseDown(FALSE),
         mRightMouseDown(FALSE),
         mToolTip(NULL),
         mToolTipBlocked(FALSE),
@@ -1887,69 +1639,82 @@ void LLViewerWindow::initWorldUI()
         S32 width = mRootView->getRect().getWidth();
         LLRect full_window(0, height, width, 0);
 
-        if ( gBottomPanel == NULL )                     // Don't re-enter if objects are alreay created
-        {
-                // panel containing chatbar, toolbar, and overlay, over floaters
-                gBottomPanel = new LLBottomPanel(mRootView->getRect());
-                mRootView->addChild(gBottomPanel);
+        if (gBottomPanel)
+                mRootView->removeChild(gBottomPanel, TRUE); 
+        // panel containing chatbar, toolbar, and overlay, over floaters
+        gBottomPanel = new LLBottomPanel(mRootView->getRect());
+        mRootView->addChild(gBottomPanel);
 
-                // View for hover information
-                gHoverView = new LLHoverView(std::string("gHoverView"), full_window);
-                gHoverView->setVisible(TRUE);
-                mRootView->addChild(gHoverView);
+        if (gHoverView)
+                mRootView->removeChild(gHoverView, TRUE);
+        // View for hover information
+        gHoverView = new LLHoverView(std::string("gHoverView"), full_window);
+        gHoverView->setVisible(TRUE);
+        mRootView->addChild(gHoverView);
                 
-                gIMMgr = LLIMMgr::getInstance();
+        gIMMgr = LLIMMgr::getInstance();
 
-                if ( gSavedPerAccountSettings.getBOOL("LogShowHistory") )
-                {
-                        LLFloaterChat::getInstance(LLSD())->loadHistory();
-                }
+        if ( gSavedPerAccountSettings.getBOOL("LogShowHistory") )
+        {
+                LLFloaterChat::getInstance(LLSD())->loadHistory();
+        }
 
-                LLRect morph_view_rect = full_window;
-                morph_view_rect.stretch( -STATUS_BAR_HEIGHT );
-                morph_view_rect.mTop = full_window.mTop - 32;
-                gMorphView = new LLMorphView(std::string("gMorphView"), morph_view_rect );
-                mRootView->addChild(gMorphView);
-                gMorphView->setVisible(FALSE);
+        LLRect morph_view_rect = full_window;
+        morph_view_rect.stretch( -STATUS_BAR_HEIGHT );
+        morph_view_rect.mTop = full_window.mTop - 32;
+        if (gMorphView)
+                mRootView->removeChild(gMorphView, TRUE);
 
-                // *Note: this is where gFloaterMute used to be initialized.
+        gMorphView = new LLMorphView(std::string("gMorphView"), morph_view_rect );
+        mRootView->addChild(gMorphView);
+        gMorphView->setVisible(FALSE);
 
-                LLWorldMapView::initClass();
+        // *Note: this is where gFloaterMute used to be initialized.
 
-                adjust_rect_centered_partial_zoom("FloaterWorldMapRect2", full_window);
+        LLWorldMapView::initClass();
 
+        adjust_rect_centered_partial_zoom("FloaterWorldMapRect2", full_window);
+
+        if (!gFloaterWorldMap)
+        {
                 gFloaterWorldMap = new LLFloaterWorldMap();
                 gFloaterWorldMap->setVisible(FALSE);
+        }
 
-                //
-                // Tools for building
-                //
-
-                // Toolbox floater
-                init_menus();
+        //
+        // Tools for building
+        //
 
+        // Toolbox floater
+        init_menus();
+        if (!gFloaterTools)
+        {
                 gFloaterTools = new LLFloaterTools();
                 gFloaterTools->setVisible(FALSE);
+        }
 
+        if (!gStatusBar)
+        {
                 // Status bar
                 S32 menu_bar_height = gMenuBarView->getRect().getHeight();
-                LLRect root_rect = getRootView()->getRect();
+                LLRect root_rect = mRootView->getRect();
                 LLRect status_rect(0, root_rect.getHeight(), root_rect.getWidth(), root_rect.getHeight() - menu_bar_height);
                 gStatusBar = new LLStatusBar(std::string("status"), status_rect);
                 gStatusBar->setFollows(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_TOP);
-
+        
                 gStatusBar->reshape(root_rect.getWidth(), gStatusBar->getRect().getHeight(), TRUE);
                 gStatusBar->translate(0, root_rect.getHeight() - gStatusBar->getRect().getHeight());
                 // sync bg color with menu bar
                 gStatusBar->setBackgroundColor( gMenuBarView->getBackgroundColor() );
+                mRootView->addChild(gStatusBar);
+        }
 
-                LLFloaterChatterBox::createInstance(LLSD());
+        LLFloaterChatterBox::createInstance(LLSD());
 
-                getRootView()->addChild(gStatusBar);
 
-                // menu holder appears on top to get first pass at all mouse events
-                getRootView()->sendChildToFront(gMenuHolder);
-        }
+        // menu holder appears on top to get first pass at all mouse events
+
+        mRootView->sendChildToFront(gMenuHolder);
 }
 
 // Destroy the UI
@@ -3311,6 +3076,16 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
                                                 {
                                                         moveable_object_selected = TRUE;
                                                         this_object_movable = TRUE;
+
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0g
+                                                        if ( (rlv_handler_t::isEnabled()) && 
+                                                                 ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP))) )
+                                                        {
+                                                                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                                                                if ( (pAvatar) && (pAvatar->mIsSitting) && (pAvatar->getRoot() == object->getRootEdit()) )
+                                                                        moveable_object_selected = this_object_movable = FALSE;
+                                                        }
+// [/RLVa:KB]
                                                 }
                                                 all_selected_objects_move = all_selected_objects_move && this_object_movable;
                                                 all_selected_objects_modify = all_selected_objects_modify && object->permModify();
@@ -5151,7 +4926,6 @@ void LLBottomPanel::draw()
 
 void* LLBottomPanel::createHUD(void* data)
 {
-        delete gHUDView;
         gHUDView = new LLHUDView();
         return gHUDView;
 }
@@ -5159,14 +4933,12 @@ void* LLBottomPanel::createHUD(void* data)
 
 void* LLBottomPanel::createOverlayBar(void* data)
 {
-        delete gOverlayBar;
         gOverlayBar = new LLOverlayBar();
         return gOverlayBar;
 }
 
 void* LLBottomPanel::createToolBar(void* data)
 {
-        delete gToolBar;
         gToolBar = new LLToolBar();
         return gToolBar;
 }
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index 79828f1..74edd2e 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -49,6 +49,7 @@
 #include "llstat.h"
 #include "llalertdialog.h"
 #include "llnotifications.h"
+#include "llmousehandler.h"
 
 class LLView;
 class LLViewerObject;
@@ -59,7 +60,6 @@ class LLVelocityBar;
 class LLTextBox;
 class LLImageRaw;
 class LLHUDIcon;
-class LLMouseHandler;
 
 #define PICK_HALF_WIDTH 5
 #define PICK_DIAMETER (2 * PICK_HALF_WIDTH + 1)
@@ -83,7 +83,7 @@ public:
 
         static bool isFlora(LLViewerObject* object);
 
-        typedef enum e_pick_type
+        typedef enum
         {
                 PICK_OBJECT,
                 PICK_FLORA,
@@ -152,6 +152,7 @@ public:
         /*virtual*/ BOOL handleTranslatedKeyUp(KEY key,  MASK mask);
         /*virtual*/ void handleScanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level);
         /*virtual*/ BOOL handleUnicodeChar(llwchar uni_char, MASK mask);        // NOT going to handle extended 
+        /*virtual*/ BOOL handleAnyMouseClick(LLWindow *window,  LLCoordGL pos, MASK mask, LLMouseHandler::EClickType clicktype, BOOL down);
         /*virtual*/ BOOL handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
         /*virtual*/ BOOL handleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);
         /*virtual*/ BOOL handleCloseRequest(LLWindow *window);
@@ -214,6 +215,7 @@ public:
         LLCoordGL               getCurrentMouseDelta()  const   { return mCurrentMouseDelta; }
         LLStat *                getMouseVelocityStat()          { return &mMouseVelocityStat; }
         BOOL                    getLeftMouseDown()      const   { return mLeftMouseDown; }
+        BOOL                    getMiddleMouseDown()    const   { return mMiddleMouseDown; }
         BOOL                    getRightMouseDown()     const   { return mRightMouseDown; }
 
         const LLPickInfo&       getLastPick() const { return mLastPick; }
@@ -281,7 +283,7 @@ public:
 
         // snapshot functionality.
         // perhaps some of this should move to llfloatershapshot?  -MG
-        typedef enum e_snapshot_type
+        typedef enum
         {
                 SNAPSHOT_TYPE_COLOR,
                 SNAPSHOT_TYPE_DEPTH,
@@ -390,6 +392,7 @@ protected:
         LLCoordGL               mCurrentMouseDelta;             //amount mouse moved this frame
         LLStat                  mMouseVelocityStat;
         BOOL                    mLeftMouseDown;
+        BOOL                    mMiddleMouseDown;
         BOOL                    mRightMouseDown;
 
         LLProgressView  *mProgressView;
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index b79d7d1..a269225 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -80,8 +80,13 @@ LLVLComposition::LLVLComposition(LLSurface *surfacep, const U32 width, const F32
         // Initialize the texture matrix to defaults.
         for (S32 i = 0; i < CORNER_COUNT; ++i)
         {
-                mStartHeight[i] = gSavedSettings.getF32("TerrainColorStartHeight");
-                mHeightRange[i] = gSavedSettings.getF32("TerrainColorHeightRange");
+                //Zwag: I'm making these static values because they are a LARGE performance problem
+                // right now, and I've never heard of anyone changing them, they are not referenced
+                // elsewhere, and have not changed in defaults since the original source code release.
+                // We can move these back to signal connected statics if they really become important
+                // variables in the future.
+                mStartHeight[i] = 20.f;//gSavedSettings.getF32("TerrainColorStartHeight");
+                mHeightRange[i] = 60.f;//gSavedSettings.getF32("TerrainColorHeightRange");
         }
         mTexScaleX = 16.f;
         mTexScaleY = 16.f;
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 1203c56..d35ad40 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -83,6 +83,9 @@
 #include "llvoicevisualizer.h" // Ventrella
 
 #include "boost/lexical_cast.hpp"
+// [RLVa:KB]
+#include "llstartup.h"
+// [/RLVa:KB]
 
 using namespace LLVOAvatarDefines;
 
@@ -175,6 +178,10 @@ enum ERenderName
 //-----------------------------------------------------------------------------
 // Callback data
 //-----------------------------------------------------------------------------
+LLVector3d LLVOAvatar::sBeamLastAt;
+int LLVOAvatar::sPartsNow;
+
+
 struct LLAvatarTexData
 {
         LLAvatarTexData( const LLUUID& id, ETextureIndex index )
@@ -741,7 +748,11 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
         mTexEyeColor( NULL ),
         mNeedsSkin(FALSE),
         mUpdatePeriod(1),
+//      mFullyLoadedInitialized(FALSE)
+        mPreviousFullyLoaded(FALSE),
+        mVisibleChat( FALSE ),
         mFullyLoadedInitialized(FALSE),
+        mFullyLoaded(FALSE),
         mHasBakedHair( FALSE )
 {
         LLMemType mt(LLMemType::MTYPE_AVATAR);
@@ -1717,6 +1728,10 @@ BOOL LLVOAvatar::buildSkeleton(const LLVOAvatarSkeletonInfo *info)
 {
         LLMemType mt(LLMemType::MTYPE_AVATAR);
         
+        //this can get called with null info on startup sometimes
+        if (!info)
+                return FALSE;
+
         //-------------------------------------------------------------------------
         // allocate joints
         //-------------------------------------------------------------------------
@@ -1981,9 +1996,15 @@ void LLVOAvatar::buildCharacter()
                                         if (attachment->getGroup() == i)
                                         {
                                                 LLMenuItemCallGL* item;
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                                                // We need the userdata param to disable options in this pie menu later on (Left Hand / Right Hand option)
                                                 item = new LLMenuItemCallGL(attachment->getName(), 
                                                                                                         NULL, 
-                                                                                                        object_selected_and_point_valid);
+                                                                                                        object_selected_and_point_valid, attachment);
+// [/RLVa:KB]
+//                                              item = new LLMenuItemCallGL(attachment->getName(), 
+//                                                                                                      NULL, 
+//                                                                                                      object_selected_and_point_valid);
                                                 item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", curiter->first);
                                                 
                                                 gAttachPieMenu->append(item);
@@ -2038,9 +2059,15 @@ void LLVOAvatar::buildCharacter()
                         if (attachment->getGroup() == 8)
                         {
                                 LLMenuItemCallGL* item;
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                                // We need the userdata param to disable options in this pie menu later on
                                 item = new LLMenuItemCallGL(attachment->getName(), 
                                                                                         NULL, 
-                                                                                        object_selected_and_point_valid);
+                                                                                        object_selected_and_point_valid, attachment);
+// [/RLVa:KB]
+//                              item = new LLMenuItemCallGL(attachment->getName(), 
+//                                                                                      NULL, 
+//                                                                                      object_selected_and_point_valid);
                                 item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", curiter->first);
                                 gAttachScreenPieMenu->append(item);
                                 gDetachScreenPieMenu->append(new LLMenuItemCallGL(attachment->getName(), 
@@ -2059,12 +2086,14 @@ void LLVOAvatar::buildCharacter()
                                 {
                                         continue;
                                 }
+                                // RELEASE-RLVa: random comment because we want know if LL ever changes this to not include "attachment" as userdata
                                 LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(), 
                                                                                                                           NULL, &object_selected_and_point_valid,
                                                                                                                           &attach_label, attachment);
+if (item){
                                 item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", curiter->first);
                                 gAttachSubMenu->append(item);
-
+}
                                 gDetachSubMenu->append(new LLMenuItemCallGL(attachment->getName(), 
                                         &handle_detach_from_avatar, object_attached, &detach_label, attachment));
                                 
@@ -2118,8 +2147,13 @@ void LLVOAvatar::buildCharacter()
                                 LLViewerJointAttachment* attachment = get_if_there(mAttachmentPoints, attach_index, (LLViewerJointAttachment*)NULL);
                                 if (attachment)
                                 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                                        // We need the userdata param to disable options in this pie menu later on
                                         LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(), 
-                                                                                                                                  NULL, object_selected_and_point_valid);
+                                                                                                                                  NULL, object_selected_and_point_valid, attachment);
+// [/RLVa:KB]
+//                                      LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(), 
+//                                                                                                                                NULL, object_selected_and_point_valid);
                                         gAttachBodyPartPieMenus[group]->append(item);
                                         item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", attach_index);
                                         gDetachBodyPartPieMenus[group]->append(new LLMenuItemCallGL(attachment->getName(), 
@@ -2944,10 +2978,16 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
         const F32 time_visible = mTimeVisible.getElapsedTimeF32();
         const F32 NAME_SHOW_TIME = gSavedSettings.getF32("RenderNameShowTime"); // seconds
         const F32 FADE_DURATION = gSavedSettings.getF32("RenderNameFadeDuration"); // seconds
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
+        bool fRlvShowNames = gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES);
+// [/RLVa:KB]
         BOOL visible_avatar = isVisible() || mNeedsAnimUpdate;
         BOOL visible_chat = gSavedSettings.getBOOL("UseChatBubbles") && (mChats.size() || mTyping);
         BOOL render_name =      visible_chat ||
                                                 (visible_avatar &&
+// [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.0h
+                                                ( (!fRlvShowNames) || (RlvSettings::fShowNameTags) ) &&
+// [/RLVa:KB]
                                                 ((sRenderName == RENDER_NAME_ALWAYS) ||
                                                 (sRenderName == RENDER_NAME_FADE && time_visible < NAME_SHOW_TIME)));
         // If it's your own avatar, don't draw in mouselook, and don't
@@ -2968,7 +3008,18 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                         new_name = TRUE;
                 }
                 
-                if (sRenderGroupTitles != mRenderGroupTitles)
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
+                if (fRlvShowNames)
+                {
+                        if (mRenderGroupTitles)
+                        {
+                                mRenderGroupTitles = FALSE;
+                                new_name = TRUE;
+                        }
+                }
+                else if (sRenderGroupTitles != mRenderGroupTitles)
+// [/RLVa]
+                //if (sRenderGroupTitles != mRenderGroupTitles)
                 {
                         mRenderGroupTitles = sRenderGroupTitles;
                         new_name = TRUE;
@@ -3073,17 +3124,11 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 || is_appearance != mNameAppearance)
                         {
                                 std::string line;
-                                if (!sRenderGroupTitles)
-                                {
-                                        // If all group titles are turned off, stack first name
-                                        // on a line above last name
-                                        line += firstname->getString();
-                                        line += "\n";
-                                }
-                                else if (title && title->getString() && title->getString()[0] != '\0')
+
+                                if (title && title->getString() && title->getString()[0] != '\0')
                                 {
                                         line += title->getString();
-                                        LLStringFn::replace_ascii_controlchars(line,LL_UNKNOWN_CHAR);
+                                        //LLStringFn::replace_ascii_controlchars(line,LL_UNKNOWN_CHAR); IMP-136 -- McCabe
                                         line += "\n";
                                         line += firstname->getString();
                                 }
@@ -3094,6 +3139,15 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 
                                 line += " ";
                                 line += lastname->getString();
+
+// [RLVa:KB]
+                                if (fRlvShowNames)
+                                {
+                                        // User is not allowed to see who it is, due to RLV settings.
+                                        line = gRlvHandler.getAnonym(line);
+                                }
+// [/RLVa:KB]
+
                                 BOOL need_comma = FALSE;
 
                                 if (is_away || is_muted || is_busy)
@@ -3134,7 +3188,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 mNameMute = is_muted;
                                 mNameAppearance = is_appearance;
                                 mTitle = title ? title->getString() : "";
-                                LLStringFn::replace_ascii_controlchars(mTitle,LL_UNKNOWN_CHAR);
+                                //LLStringFn::replace_ascii_controlchars(mTitle,LL_UNKNOWN_CHAR); IMP-136 -- McCabe
                                 mNameString = utf8str_to_wstring(line);
                                 new_name = TRUE;
                         }
@@ -3258,6 +3312,26 @@ void LLVOAvatar::idleUpdateTractorBeam()
         if (!needsRenderBeam() || !mIsBuilt)
         {
                 mBeam = NULL;
+                if(gSavedSettings.getBOOL("ParticleChat"))
+                {
+                        if(sPartsNow != FALSE)
+                        {
+                                sPartsNow = FALSE;
+                                LLMessageSystem* msg = gMessageSystem;
+                                msg->newMessageFast(_PREHASH_ChatFromViewer);
+                                msg->nextBlockFast(_PREHASH_AgentData);
+                                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                msg->nextBlockFast(_PREHASH_ChatData);
+                                msg->addStringFast(_PREHASH_Message, "stop");
+                                msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
+                                msg->addS32("Channel", 9000);
+                                
+                                gAgent.sendReliableMessage();
+                                sBeamLastAt  =  LLVector3d::zero;
+                                LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
+                        }
+                }
         }
         else if (!mBeam || mBeam->isDead())
         {
@@ -3276,6 +3350,48 @@ void LLVOAvatar::idleUpdateTractorBeam()
                 {
                         // get point from pointat effect
                         mBeam->setPositionGlobal(gAgent.mPointAt->getPointAtPosGlobal());
+
+                        if(gSavedSettings.getBOOL("ParticleChat"))
+                        {
+                                if(sPartsNow != TRUE)
+                                {
+                                        sPartsNow = TRUE;
+                                        LLMessageSystem* msg = gMessageSystem;
+                                        msg->newMessageFast(_PREHASH_ChatFromViewer);
+                                        msg->nextBlockFast(_PREHASH_AgentData);
+                                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                        msg->nextBlockFast(_PREHASH_ChatData);
+                                        msg->addStringFast(_PREHASH_Message, "start");
+                                        msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
+                                        msg->addS32("Channel", 9000);
+                                        
+                                        gAgent.sendReliableMessage();
+
+                                        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
+                                }
+                                //LLVector3d a = sBeamLastAt-gAgent.mPointAt->getPointAtPosGlobal();
+                                //if(a.length > 2)
+                                if( (sBeamLastAt-gAgent.mPointAt->getPointAtPosGlobal()).length() > .2)
+                                //if(sBeamLastAt!=gAgent.mPointAt->getPointAtPosGlobal())
+                                {
+                                        sBeamLastAt = gAgent.mPointAt->getPointAtPosGlobal(); 
+
+                                        LLMessageSystem* msg = gMessageSystem;
+                                        msg->newMessageFast(_PREHASH_ChatFromViewer);
+                                        msg->nextBlockFast(_PREHASH_AgentData);
+                                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                                        msg->nextBlockFast(_PREHASH_ChatData);
+                                        msg->addStringFast(_PREHASH_Message, llformat("<%.6f, %.6f, %.6f>",(F32)(sBeamLastAt.mdV[VX]),(F32)(sBeamLastAt.mdV[VY]),(F32)(sBeamLastAt.mdV[VZ])));
+                                        msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
+                                        msg->addS32("Channel", 9000); // *TODO: make configurable
+                                        
+                                        gAgent.sendReliableMessage();
+                                }
+
+                        }
+
                         mBeam->triggerLocal();
                 }
                 else if (selection->getFirstRootObject() && 
@@ -5932,6 +6048,40 @@ BOOL LLVOAvatar::attachObject(LLViewerObject *viewer_object)
         {
                 updateAttachmentVisibility(gAgent.getCameraMode());
                 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                if (rlv_handler_t::isEnabled())
+                {
+                        static bool fRlvFullyLoaded = false;
+                        static LLFrameTimer* pRlvFullyLoadedTimer = NULL;
+
+                        // There's no way to know when we're done reattaching what was attached at log-off but this ugly evil bad hack tries anyway
+                        if (!fRlvFullyLoaded)
+                        {
+                                if (pRlvFullyLoadedTimer)
+                                {
+                                        if (pRlvFullyLoadedTimer->getElapsedTimeF32() > 30.0f)
+                                        {
+                                                fRlvFullyLoaded = true;
+                                                delete pRlvFullyLoadedTimer;
+                                                pRlvFullyLoadedTimer = NULL;
+                                        }
+                                        else
+                                        {
+                                                pRlvFullyLoadedTimer->reset();
+                                        }
+                                }
+                                else if ( (!pRlvFullyLoadedTimer) && 
+                                              ( (0 == mPendingAttachment.size()) || 
+                                                    ((1 == mPendingAttachment.size()) && (mPendingAttachment[0] == viewer_object)) ) )
+                                {
+                                        pRlvFullyLoadedTimer = new LLFrameTimer();
+                                }
+                        }
+
+                        gRlvHandler.onAttach(attachment, fRlvFullyLoaded);
+                }
+// [/RLVa:KB]
+
                 // Then make sure the inventory is in sync with the avatar.
                 gInventory.addChangedMask( LLInventoryObserver::LABEL, attachment->getItemID() );
                 gInventory.notifyObservers();
@@ -5993,6 +6143,14 @@ BOOL LLVOAvatar::detachObject(LLViewerObject *viewer_object)
                 // only one object per attachment point for now
                 if (attachment->getObject() == viewer_object)
                 {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                        // URGENT-RLV: it looks like LLApp::isExiting() isn't always accurate so find something better (if it exists)
+                        if ( (rlv_handler_t::isEnabled()) && (!LLApp::isExiting()) && (mIsSelf) )
+                        {
+                                gRlvHandler.onDetach(attachment);
+                        }
+// [/RLVa:KB]
+
                         LLUUID item_id = attachment->getItemID();
                         attachment->removeObject(viewer_object);
                         if (mIsSelf)
@@ -6051,6 +6209,14 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
 
         gPipeline.markMoved(mDrawable, TRUE);
         mIsSitting = TRUE;
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
+        #ifdef RLV_EXTENSION_STARTLOCATION
+        if (rlv_handler_t::isEnabled())
+        {
+                RlvSettings::updateLoginLastLocation();
+        }
+        #endif // RLV_EXTENSION_STARTLOCATION
+// [/RLVa:KB]
         mRoot.getXform()->setParent(&sit_object->mDrawable->mXform); // LLVOAvatar::sitOnObject
         mRoot.setPosition(getPosition());
         mRoot.updateWorldMatrixChildren();
@@ -6112,6 +6278,14 @@ void LLVOAvatar::getOffObject()
         gPipeline.markMoved(mDrawable, TRUE);
 
         mIsSitting = FALSE;
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
+        #ifdef RLV_EXTENSION_STARTLOCATION
+        if (rlv_handler_t::isEnabled())
+        {
+                RlvSettings::updateLoginLastLocation();
+        }
+        #endif // RLV_EXTENSION_STARTLOCATION
+// [/RLVa:KB]
         mRoot.getXform()->setParent(NULL); // LLVOAvatar::getOffObject
         mRoot.setPosition(cur_position_world);
         mRoot.setRotation(cur_rotation_world);
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index f8b2c06..f6d5e27 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -592,6 +592,10 @@ private:
         LLTimer         mAnimTimer;
         F32                     mTimeLast;      
 
+        // Send selection beam info to scripts
+        static int              sPartsNow;
+        static LLVector3d sBeamLastAt;
+
         LLPointer<LLHUDEffectSpiral> mBeam;
         LLFrameTimer mBeamTimer;
 
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index dd68733..d543a65 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -1978,7 +1978,11 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
         
 {
         if (!mbCanSelect ||
-                (gHideSelectedObjects && isSelected()) ||
+//              (gHideSelectedObjects && isSelected()) ||
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                ( (gHideSelectedObjects && isSelected()) && 
+                  ((!rlv_handler_t::isEnabled()) || (!isHUDAttachment()) || (gRlvHandler.isDetachable(this))) ) ||
+// [/RLVa:KB]
                         mDrawable->isDead() || 
                         !gPipeline.hasRenderType(mDrawable->getRenderType()))
         {
@@ -2120,10 +2124,18 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
 {
         LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
 
-        if (facep->getViewerObject()->isSelected() && gHideSelectedObjects)
+//      if (facep->getViewerObject()->isSelected() && gHideSelectedObjects)
+//      {
+//              return;
+//      }
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        LLViewerObject* pObj = facep->getViewerObject();
+        if ( (pObj->isSelected() && gHideSelectedObjects) && 
+                 ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (gRlvHandler.isDetachable(pObj))) )
         {
                 return;
         }
+// [/RVLa:KB]
 
         //add face to drawmap
         LLSpatialGroup::drawmap_elem_t& draw_vec = group->mDrawMap[type];       
diff --git a/linden/indra/newview/llwearable.cpp b/linden/indra/newview/llwearable.cpp
index a5f4dc9..bf5fd4a 100644
--- a/linden/indra/newview/llwearable.cpp
+++ b/linden/indra/newview/llwearable.cpp
@@ -153,41 +153,87 @@ EWearableType LLWearable::typeNameToType( const std::string& type_name )
         return WT_INVALID;
 }
 
-
-std::string terse_F32_to_string( F32 f )
+const char* terse_F32_to_string( F32 f, char s[MAX_STRING] )            /* Flawfinder: ignore */
 {
-        std::string r = llformat( "%.2f", f );
+        char* r = s;
+        S32 len = snprintf( s, MAX_STRING, "%.2f", f );         /* Flawfinder: ignore */
 
         // "1.20"  -> "1.2"
         // "24.00" -> "24."
-        S32 len = r.length();
-        while( len > 0 && '0' == r[len - 1] )
+        while( '0' == r[len - 1] )
         {
-                r.erase(len-1, 1);
-                len--;
+                len--;  
+                r[len] = '\0';
         }
 
         if( '.' == r[len - 1] )
         {
                 // "24." -> "24"
-                r.erase(len-1, 1);
+                len--;
+                r[len] = '\0';
         }
         else
         if( ('-' == r[0]) && ('0' == r[1]) )
         {
                 // "-0.59" -> "-.59"
-                r.erase(1, 1);
+                r++;
+                r[0] = '-';
         }
         else
         if( '0' == r[0] )
         {
                 // "0.59" -> ".59"
-                r.erase(0, 1);
+                r++;
         }
 
         return r;
 }
 
+// reX: new function
+BOOL LLWearable::FileExportParams( FILE* file )
+{
+        // wearable type 
+        S32 type = (S32)mType;
+        fprintf( file, "type %d\n", type );
+
+        // parameters
+        S32 num_parameters = mVisualParamMap.size();
+        fprintf( file, "parameters %d\n", num_parameters );
+
+        char s[ MAX_STRING ];           /* Flawfinder: ignore */
+        for (param_map_t::iterator iter = mVisualParamMap.begin();
+                 iter != mVisualParamMap.end(); ++iter)
+        {
+                S32 param_id = iter->first;
+                F32 param_weight = iter->second;
+                fprintf( file, "%d %s\n", param_id, terse_F32_to_string( param_weight, s ) );
+        }
+
+        return TRUE;
+}
+
+// reX: new function
+BOOL LLWearable::FileExportTextures( FILE* file )
+{
+        // wearable type 
+        S32 type = (S32)mType;
+        fprintf( file, "type %d\n", type );
+
+        // texture entries
+        S32 num_textures = mTEMap.size();
+        fprintf( file, "textures %d\n", num_textures );
+        
+        for (te_map_t::iterator iter = mTEMap.begin();
+                 iter != mTEMap.end(); ++iter)
+        {
+                S32 te = iter->first;
+                LLUUID& image_id = iter->second;
+                fprintf( file, "%d %s\n", te, image_id.asString().c_str() );
+    }
+
+        return TRUE;
+}
+
 BOOL LLWearable::exportFile( LLFILE* file )
 {
         // header and version
@@ -234,12 +280,13 @@ BOOL LLWearable::exportFile( LLFILE* file )
                 return FALSE;
         }
 
+        char s[ MAX_STRING ];           /* Flawfinder: ignore */
         for (param_map_t::iterator iter = mVisualParamMap.begin();
                  iter != mVisualParamMap.end(); ++iter)
         {
                 S32 param_id = iter->first;
                 F32 param_weight = iter->second;
-                if( fprintf( file, "%d %s\n", param_id, terse_F32_to_string( param_weight ).c_str() ) < 0 )
+                if( fprintf( file, "%d %s\n", param_id, terse_F32_to_string( param_weight, s ) ) < 0 )
                 {
                         return FALSE;
                 }
diff --git a/linden/indra/newview/llwearable.h b/linden/indra/newview/llwearable.h
index 252f80c..6e473c1 100644
--- a/linden/indra/newview/llwearable.h
+++ b/linden/indra/newview/llwearable.h
@@ -61,6 +61,10 @@ public:
 
         BOOL                            exportFile(LLFILE* file);
         BOOL                            importFile(LLFILE* file);
+        // reX: new function
+        BOOL                            FileExportParams(FILE* file);
+        // reX: new function
+        BOOL                            FileExportTextures(FILE* file);
 
         EWearableType           getType() const                                                 { return mType; }
         void                            setType( EWearableType type )                   { mType = type; }
diff --git a/linden/indra/newview/llwearablelist.cpp b/linden/indra/newview/llwearablelist.cpp
index 512c03f..954321f 100644
--- a/linden/indra/newview/llwearablelist.cpp
+++ b/linden/indra/newview/llwearablelist.cpp
@@ -43,6 +43,9 @@
 #include "llviewerstats.h"
 #include "llnotify.h"
 
+#include "llstartup.h"
+#include "llpanellogin.h"
+
 // Globals
 LLWearableList gWearableList; // Globally constructed; be careful that there's no dependency with gAgent.
 
@@ -195,12 +198,15 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
                 }
                 else if (data->mName.empty())
                 {
-                        LLNotifications::instance().add("FailedToFindWearableUnnamed", args);
+                        // work around missing avatar part spam on grid to grid teleport login
+                        //if(LLStartUp::shouldAutoLogin() && !gLoginHandler.mPassword.empty()) Jacek - Grid manager stuff that's changed with 1.23
+                                LLNotifications::instance().add("FailedToFindWearableUnnamed", args);
                 }
                 else
                 {
                         args["DESC"] = data->mName;
-                        LLNotifications::instance().add("FailedToFindWearable", args);
+                        //if(LLStartUp::shouldAutoLogin() && !gLoginHandler.mPassword.empty()) Jacek - Grid manager stuff that's changed with 1.23
+                                LLNotifications::instance().add("FailedToFindWearable", args);
                 }
         }
         // Always call callback; wearable will be NULL if we failed
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
new file mode 100644
index 0000000..f805763
--- /dev/null
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -0,0 +1,312 @@
+/**
+* @file llwindlightremotectrl.cpp
+* @brief toolbar remote for windlight options and presets
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2009, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* 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
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llwindlightremotectrl.h"
+
+#include "llbutton.h"
+#include "llcombobox.h"
+#include "llfloaterenvsettings.h"
+#include "llfloaterwater.h"
+#include "llfloaterwindlight.h"
+#include "lloverlaybar.h"
+#include "lluictrlfactory.h"
+#include "llwlparammanager.h"
+#include "llviewercontrol.h"
+
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
+class LLWindlightRemoteObserver : public LLWLPresetsObserver
+{
+public:
+        LLWindlightRemoteObserver(LLWindlightRemoteCtrl* wind_rem) : mWindlightRemote(wind_rem){}
+        virtual ~LLWindlightRemoteObserver() {}
+        virtual void changed() { mWindlightRemote->refreshPresets(); }
+private:
+        LLWindlightRemoteCtrl* mWindlightRemote;
+};
+
+
+LLWindlightRemoteCtrl::LLWindlightRemoteCtrl()  
+{
+        mPresetsCombo = NULL;
+        mObserver = NULL;
+        setIsChrome(TRUE);
+
+        build();
+
+        setFocusRoot(TRUE);
+}
+
+LLWindlightRemoteCtrl::~LLWindlightRemoteCtrl()
+{
+        delete mObserver;
+        mObserver = NULL;
+}
+
+void LLWindlightRemoteCtrl::draw()
+{
+        LLButton* expand_button = getChild<LLButton>("Popup");
+        if (expand_button)
+        {
+                if (expand_button->getToggleState())
+                {
+                        expand_button->setImageOverlay("arrow_down.tga");
+                }
+                else
+                {
+                        expand_button->setImageOverlay("arrow_up.tga");
+                }
+        }
+
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+        if (rlv_handler_t::isEnabled())
+        {
+                childSetEnabled("Environment", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
+                mPresetsCombo->setEnabled(!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
+        }
+// [/RLVA:KB]
+
+        LLPanel::draw();
+}
+
+void LLWindlightRemoteCtrl::build()
+{
+        if (gSavedSettings.getBOOL("ShowWindlightSettingsPopup"))
+        {
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote_expanded.xml");
+        }
+        else
+        {
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote.xml");
+        }
+}
+
+BOOL LLWindlightRemoteCtrl::postBuild()
+{
+        
+        childSetAction("Environment", onClickToggleEnvironment, this);
+        childSetAction("Popup", onClickPopupBtn, this);
+
+        mPresetsCombo = getChild<LLComboBox>("Presets");
+        if (mPresetsCombo)
+        {
+                mPresetsCombo->setCommitCallback(onCommitPreset);
+                mPresetsCombo->setCallbackUserData(this);
+
+                // set up observer to follow changes
+                mObserver = new LLWindlightRemoteObserver(this);
+                LLWLParamManager::addObserver(mObserver);
+
+                // refresh list from current presets
+                refreshPresets();
+        }
+
+        return TRUE;
+}
+
+void LLWindlightRemoteCtrl::refreshPresets()
+{
+        if (mPresetsCombo)
+        {
+                // snag current preset
+                LLWLParamManager * param_mgr = LLWLParamManager::instance();
+                LLWLParamSet& currentParams = param_mgr->mCurParams;
+                
+                // clear in case presets names have changed
+                mPresetsCombo->clearRows();
+
+                std::map<std::string, LLWLParamSet>::iterator mIt = 
+                        param_mgr->mParamList.begin();
+                for(; mIt != param_mgr->mParamList.end(); mIt++) 
+                {
+                        mPresetsCombo->add(mIt->first);
+                }
+                
+                // insert separator and add World menu options
+                mPresetsCombo->addSeparator(ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("atmosphere"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("lighting"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("clouds"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("advanced_water"), ADD_BOTTOM);
+                mPresetsCombo->addSeparator(ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("sunrise"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("noon"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("sunset"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("midnight"), ADD_BOTTOM);
+                mPresetsCombo->addSimpleElement(getString("revert_region"), ADD_BOTTOM);
+
+                if (mPresetsCombo->getSelectedItemLabel() != currentParams.mName &&
+                        !currentParams.mName.empty())
+                {
+                        mPresetsCombo->selectByValue(LLSD(currentParams.mName));
+                }
+                else
+                {
+                        mPresetsCombo->selectByValue(LLSD("Default"));
+                }
+        }
+}
+
+// static
+void LLWindlightRemoteCtrl::onCommitPreset(LLUICtrl* ctrl, void* data)
+{
+        LLWindlightRemoteCtrl* self = (LLWindlightRemoteCtrl*)data;
+
+        LLCtrlListInterface* presets = self->mPresetsCombo ? self->mPresetsCombo->getListInterface() : NULL;
+        if (presets)
+        {
+                S32 index = presets->getFirstSelectedIndex();
+                if (index < 0)
+                {
+                        // Open Advanced Sky
+                        LLFloaterWindLight::show();
+                        return;
+                }
+
+                // check for World menu options; if none, apply preset
+                std::string selected = self->mPresetsCombo->getSelectedValue().asString();
+
+                if (selected == self->getString("atmosphere"))
+                {
+                        if (!LLFloaterWindLight::instance()->getVisible())
+                        {
+                                LLFloaterWindLight::show();
+                        }
+                        LLFloaterWindLight::instance()->selectTab("Atmosphere");
+                }
+                else if (selected == self->getString("lighting"))
+                {
+                        if (!LLFloaterWindLight::instance()->getVisible())
+                        {
+                                LLFloaterWindLight::show();
+                        }
+                        LLFloaterWindLight::instance()->selectTab("Lighting");
+                }
+                else if (selected == self->getString("clouds"))
+                {
+                        if (!LLFloaterWindLight::instance()->getVisible())
+                        {
+                                LLFloaterWindLight::show();
+                        }
+                        LLFloaterWindLight::instance()->selectTab("Clouds");
+                }
+                else if (selected == self->getString("advanced_water"))
+                {
+                        LLFloaterWater::show();
+                }
+                else if (selected == self->getString("sunrise"))
+                {
+                        // set the value, turn off animation
+                        LLWLParamManager::instance()->mAnimator.setDayTime(0.25);
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
+
+                        // then call update once
+                        LLWLParamManager::instance()->mAnimator.update(
+                                LLWLParamManager::instance()->mCurParams);
+                }
+                else if (selected == self->getString("noon"))
+                {
+                        // set the value, turn off animation
+                        LLWLParamManager::instance()->mAnimator.setDayTime(0.567);
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
+
+                        // then call update once
+                        LLWLParamManager::instance()->mAnimator.update(
+                                LLWLParamManager::instance()->mCurParams);
+                }
+                else if (selected == self->getString("sunset"))
+                {
+                        // set the value, turn off animation
+                        LLWLParamManager::instance()->mAnimator.setDayTime(0.75);
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
+
+                        // then call update once
+                        LLWLParamManager::instance()->mAnimator.update(
+                                LLWLParamManager::instance()->mCurParams);
+                }
+                else if (selected == self->getString("midnight"))
+                {
+                        // set the value, turn off animation
+                        LLWLParamManager::instance()->mAnimator.setDayTime(0.0);
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
+
+                        // then call update once
+                        LLWLParamManager::instance()->mAnimator.update(
+                                LLWLParamManager::instance()->mCurParams);
+                }
+                else if (selected == self->getString("revert_region"))
+                {
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = true;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = true;  
+                }
+                else
+                {
+                        // Apply preset
+                        LLWLParamManager::instance()->mAnimator.mIsRunning = false;
+                        LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
+                        LLWLParamManager::instance()->loadPreset(selected, true);
+                }
+        }
+}
+
+// static
+void LLWindlightRemoteCtrl::onClickToggleEnvironment(void* data)
+{
+        // if evn settings not there or is hidden, show it
+        if(     !LLFloaterEnvSettings::isOpen() || 
+                !LLFloaterEnvSettings::instance()->getVisible()) 
+        {
+                LLFloaterEnvSettings::show();
+        
+        // otherwise, close it button acts like a toggle
+        } 
+        else 
+        {
+                LLFloaterEnvSettings::instance()->close();
+        }
+}
+
+//static
+void LLWindlightRemoteCtrl::onClickPopupBtn(void* data)
+{
+        LLWindlightRemoteCtrl* remotep = (LLWindlightRemoteCtrl*)data;
+
+        remotep->deleteAllChildren();
+        remotep->build();
+        gOverlayBar->layoutButtons();
+}
diff --git a/linden/indra/newview/llwindlightremotectrl.h b/linden/indra/newview/llwindlightremotectrl.h
new file mode 100644
index 0000000..e4ad2d5
--- /dev/null
+++ b/linden/indra/newview/llwindlightremotectrl.h
@@ -0,0 +1,60 @@
+/**
+* @file llwindlightremotectrl.h
+* @brief toolbar remote for windlight options and presets
+*
+* $LicenseInfo:firstyear=2009&license=viewergpl$
+*
+* Copyright (c) 2009, McCabe Maxsted
+*
+* Imprudence Viewer Source Code
+* The source code in this file ("Source Code") is provided to you
+* under the terms of the GNU General Public License, version 2.0
+* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+* this distribution, or online at
+* http://secondlifegrid.net/programs/open_source/licensing/gplv2
+*
+* 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
+*
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+*
+* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLWINDLIGHTREMOTECTRL_H
+#define LL_LLWINDLIGHTREMOTECTRL_H
+
+#include "llpanel.h"
+
+class LLComboBox;
+class LLWLPresetsObserver;
+
+class LLWindlightRemoteCtrl : public LLPanel
+{
+public:
+        LLWindlightRemoteCtrl();
+        virtual ~LLWindlightRemoteCtrl();
+        /*virtual*/ BOOL postBuild();
+        /*virtual*/ void draw();
+
+        void refreshPresets();
+
+private:
+        LLComboBox*                                             mPresetsCombo;
+        LLWLPresetsObserver*            mObserver;
+
+        void build();
+
+        static void onCommitPreset(LLUICtrl* ctrl, void* data);
+        static void onClickToggleEnvironment(void* data);
+        static void onClickPopupBtn(void* data);
+};
+
+#endif
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index b8a2bf0..081313c 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -63,6 +63,7 @@
 #include "curl/curl.h"
 
 LLWLParamManager * LLWLParamManager::sInstance = NULL;
+std::vector<LLWLPresetsObserver*> LLWLParamManager::sObservers;
 
 LLWLParamManager::LLWLParamManager() :
 
@@ -239,6 +240,8 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
                 getParamSet(name, mCurParams);
                 propagateParameters();
         }
+
+        notifyObservers();
 }       
 
 void LLWLParamManager::savePreset(const std::string & name)
@@ -265,6 +268,7 @@ void LLWLParamManager::savePreset(const std::string & name)
         presetsXML.close();
 
         propagateParameters();
+        notifyObservers();
 }
 
 void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
@@ -539,6 +543,8 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
                 gDirUtilp->deleteFilesInDir(path_name, escaped_name + ".xml");
         }
 
+        notifyObservers();
+
         return true;
 }
 
@@ -567,3 +573,37 @@ LLWLParamManager * LLWLParamManager::instance()
 
         return sInstance;
 }
+
+// static
+void LLWLParamManager::addObserver(LLWLPresetsObserver* observer)
+{
+        sObservers.push_back(observer);
+}
+
+// static
+void LLWLParamManager::removeObserver(LLWLPresetsObserver* observer)
+{
+        std::vector<LLWLPresetsObserver*>::iterator it;
+        it = std::find(sObservers.begin(), sObservers.end(), observer);
+        if (it != sObservers.end())
+        {
+                sObservers.erase(it);
+        }
+}
+
+// Call this method when it's time to update everyone on a new state.
+// Copy the list because an observer could respond by removing itself
+// from the list. Static
+void LLWLParamManager::notifyObservers()
+{
+        lldebugs << "LLWLPresetsObserver::notifyObservers" << llendl;
+
+        std::vector<LLWLPresetsObserver*> observers = sObservers;
+
+        std::vector<LLWLPresetsObserver*>::iterator it;
+        for (it = observers.begin(); it != observers.end(); ++it)
+        {
+                LLWLPresetsObserver* observer = *it;
+                observer->changed();
+        }
+}
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index a117dc1..6b6300c 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -41,6 +41,13 @@
 #include "llviewercamera.h"
 
 class LLGLSLShader;
+
+class LLWLPresetsObserver
+{
+public:
+        virtual ~LLWLPresetsObserver() { };
+        virtual void changed() = 0;
+};
  
 // color control
 struct WLColorControl {
@@ -196,6 +203,11 @@ public:
         // singleton pattern implementation
         static LLWLParamManager * instance();
 
+        // manage observers
+        static void addObserver(LLWLPresetsObserver* observer);
+        static void removeObserver(LLWLPresetsObserver* observer);
+        static void notifyObservers();
+
 public:
 
         // helper variables
@@ -250,12 +262,13 @@ public:
         F32 mDomeRadius;
         
         // list of all the parameters, listed by name
-        std::map<std::string, LLWLParamSet> mParamList;
-        
+        std::map<std::string, LLWLParamSet> mParamList; 
         
 private:
         // our parameter manager singleton instance
         static LLWLParamManager * sInstance;
+        
+        static std::vector<LLWLPresetsObserver*> sObservers;
 
 };
 
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 5944bce..02c7be3 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -118,6 +118,7 @@ LLWorld::LLWorld() :
 
 void LLWorld::destroyClass()
 {
+        mHoleWaterObjects.clear();
         gObjectList.destroy();
         for(region_list_t::iterator region_it = mRegionList.begin(); region_it != mRegionList.end(); )
         {
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index cc94529..64e84c5 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -73,9 +73,10 @@ const S32 SCROLL_HINT_WIDTH = 65;
 const F32 BIG_DOT_RADIUS = 5.f;
 BOOL LLWorldMapView::sHandledLastClick = FALSE;
 
-LLUIImagePtr LLWorldMapView::sAvatarYouSmallImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarSmallImage = NULL;
-LLUIImagePtr LLWorldMapView::sAvatarLargeImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarYouImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarYouLargeImage = NULL;
+LLUIImagePtr LLWorldMapView::sAvatarLevelImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarAboveImage = NULL;
 LLUIImagePtr LLWorldMapView::sAvatarBelowImage = NULL;
 
@@ -117,11 +118,12 @@ std::map<std::string,std::string> LLWorldMapView::sStringsMap;
 
 void LLWorldMapView::initClass()
 {
-        sAvatarYouSmallImage =  LLUI::getUIImage("map_avatar_you_8.tga");
         sAvatarSmallImage =     LLUI::getUIImage("map_avatar_8.tga");
-        sAvatarLargeImage =     LLUI::getUIImage("map_avatar_16.tga");
-        sAvatarAboveImage =     LLUI::getUIImage("map_avatar_above_8.tga");
-        sAvatarBelowImage =     LLUI::getUIImage("map_avatar_below_8.tga");
+        sAvatarYouImage =               LLUI::getUIImage("map_avatar_16.tga");
+        sAvatarYouLargeImage =  LLUI::getUIImage("map_avatar_you_32.tga");
+        sAvatarLevelImage =     LLUI::getUIImage("map_avatar_32.tga");
+        sAvatarAboveImage =     LLUI::getUIImage("map_avatar_above_32.tga");
+        sAvatarBelowImage =     LLUI::getUIImage("map_avatar_below_32.tga");
 
         sHomeImage =                    LLUI::getUIImage("map_home.tga");
         sTelehubImage =                 LLUI::getUIImage("map_telehub.tga");
@@ -145,9 +147,10 @@ void LLWorldMapView::initClass()
 // static
 void LLWorldMapView::cleanupClass()
 {
-        sAvatarYouSmallImage = NULL;
         sAvatarSmallImage = NULL;
-        sAvatarLargeImage = NULL;
+        sAvatarYouImage = NULL;
+        sAvatarYouLargeImage = NULL;
+        sAvatarLevelImage = NULL;
         sAvatarAboveImage = NULL;
         sAvatarBelowImage = NULL;
 
@@ -680,10 +683,43 @@ void LLWorldMapView::draw()
                         //                      info->mAgents,
                         //                      info->mName.c_str(),
                         //                      LLViewerRegion::accessToShortString(info->mAccess).c_str() );
-                        if (info->mAccess == SIM_ACCESS_DOWN)
+// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a)
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                        {
+                                mesg = rlv_handler_t::cstrHidden;
+                        }
+                        else if (info->mAccess == SIM_ACCESS_DOWN)
+// [/RLVa:KB]
+//                      if (info->mAccess == SIM_ACCESS_DOWN)
                         {
                                 mesg = llformat( "%s (%s)", info->mName.c_str(), sStringsMap["offline"].c_str());
                         }
+                        else if (gSavedSettings.getBOOL("MapShowAgentCount") && gSavedSettings.getBOOL("MapShowPeople"))
+                        {
+                                // Display the agent count after the region name
+                                S32 agent_count = LLWorldMap::getInstance()->mNumAgents[handle];
+                                LLViewerRegion *region = gAgent.getRegion();
+
+                                if (region && region->getHandle() == info->mHandle)
+                                {
+                                        ++agent_count; // Bump by 1 if we're in this region
+                                }
+
+                                if (agent_count > 0)
+                                {
+                                        //TODO: move this and the tooltip strings into XML
+                                        std::string count = llformat("%d %s", agent_count, agent_count > 1 ? "avatars" : "avatar");
+                                        font->renderUTF8(
+                                                count, 0,
+                                                llfloor(left + 3), 
+                                                llfloor(bottom + 20),
+                                                LLColor4::white,
+                                                LLFontGL::LEFT,
+                                                LLFontGL::BASELINE,
+                                                LLFontGL::DROP_SHADOW);
+                                }
+                                mesg = info->mName;
+                        }
                         else
                         {
                                 mesg = info->mName;
@@ -775,7 +811,7 @@ void LLWorldMapView::draw()
 
         // Now draw your avatar after all that other stuff.
         LLVector3d pos_global = gAgent.getPositionGlobal();
-        drawImage(pos_global, sAvatarLargeImage);
+        drawImage(pos_global, sAvatarYouImage);
 
         LLVector3 pos_map = globalPosToView(pos_global);
         if (!pointInView(llround(pos_map.mV[VX]), llround(pos_map.mV[VY])))
@@ -1149,7 +1185,10 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
         text_x = llclamp(text_x, half_text_width + TEXT_PADDING, getRect().getWidth() - half_text_width - TEXT_PADDING);
         text_y = llclamp(text_y + vert_offset, TEXT_PADDING + vert_offset, getRect().getHeight() - llround(font->getLineHeight()) - TEXT_PADDING - vert_offset);
 
-        if (label != "")
+        //if (label != "")
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-1.0.0a
+        if ( (label != "") && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+// [/RLVa:KB]
         {
                 font->renderUTF8(
                         label, 0,
@@ -1209,7 +1248,10 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* stic
 
                 std::string message = 
                         llformat("%s (%s)",
-                                         info->mName.c_str(),
+                                         //info->mName.c_str(),
+// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a)
+                                         (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? info->mName.c_str() : rlv_handler_t::cstrHidden.c_str(),
+// [/RLVa:KB]
                                          LLViewerRegion::accessToString(info->mAccess).c_str());
 
                 if (info->mAccess != SIM_ACCESS_DOWN)
@@ -1228,11 +1270,11 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* stic
 
                                 if (agent_count == 1)
                                 {
-                                        message += "person";
+                                        message += "avatar";
                                 }
                                 else
                                 {
-                                        message += "people";
+                                        message += "avatars";
                                 }
                         }
                 }
@@ -1308,7 +1350,7 @@ void LLWorldMapView::drawAvatar(F32 x_pixels,
                                                                 F32 dot_radius)
 {
         const F32 HEIGHT_THRESHOLD = 7.f;
-        LLUIImagePtr dot_image = sAvatarSmallImage;
+        LLUIImagePtr dot_image = sAvatarLevelImage;
         if(relative_z < -HEIGHT_THRESHOLD) 
         {
                 dot_image = sAvatarBelowImage; 
@@ -1317,9 +1359,13 @@ void LLWorldMapView::drawAvatar(F32 x_pixels,
         { 
                 dot_image = sAvatarAboveImage;
         }
+
+        S32 dot_width = llround(dot_radius * 2.f);
         dot_image->draw(
-                llround(x_pixels) - dot_image->getWidth()/2,
-                llround(y_pixels) - dot_image->getHeight()/2, 
+                llround(x_pixels - dot_radius),
+                llround(y_pixels - dot_radius),
+                dot_width,
+                dot_width,
                 color);
 }
 
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index ac3bb3f..3245838 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -138,11 +138,13 @@ protected:
 public:
         LLColor4                mBackgroundColor;
 
-        static LLUIImagePtr     sAvatarYouSmallImage;
         static LLUIImagePtr     sAvatarSmallImage;
-        static LLUIImagePtr     sAvatarLargeImage;
+        static LLUIImagePtr     sAvatarYouImage;
+        static LLUIImagePtr     sAvatarYouLargeImage;
+        static LLUIImagePtr     sAvatarLevelImage;
         static LLUIImagePtr     sAvatarAboveImage;
         static LLUIImagePtr     sAvatarBelowImage;
+
         static LLUIImagePtr     sTelehubImage;
         static LLUIImagePtr     sInfohubImage;
         static LLUIImagePtr     sHomeImage;
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index d6bc6da..6fb2cec 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -1963,8 +1963,13 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
         
         if (gHideSelectedObjects)
         {
-                if (drawablep->getVObj().notNull() &&
-                        drawablep->getVObj()->isSelected())
+//              if (drawablep->getVObj().notNull() &&
+//                      drawablep->getVObj()->isSelected())
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                LLViewerObject* pObj = drawablep->getVObj();
+                if ( (pObj) && (pObj->isSelected()) && 
+                         ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (gRlvHandler.isDetachable(pObj))) )
+// [/RVLa:KB]
                 {
                         return;
                 }
@@ -4184,6 +4189,11 @@ void LLPipeline::enableLightsAvatar()
 
 void LLPipeline::enableLightsAvatarEdit(const LLColor4& color)
 {
+        if (mLightingDetail < 1)
+        {
+                return;
+        }
+
         U32 mask = 0x2002; // Avatar backlight only, set ambient
         setupAvatarLights(TRUE);
         enableLights(mask);
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
new file mode 100644
index 0000000..8dbf1df
--- /dev/null
+++ b/linden/indra/newview/primbackup.cpp
@@ -0,0 +1,1106 @@
+
+#include "llviewerprecompiledheaders.h"
+#include "llviewermenu.h" 
+
+
+// system library includes
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+// linden library includes
+#include "llfilepicker.h"
+#include "indra_constants.h"
+#include "llsdserialize.h"
+#include "llsdutil.h"
+
+#include "llcallbacklist.h"
+
+// newview includes
+#include "llagent.h"
+#include "llselectmgr.h"
+#include "lltoolplacer.h"
+
+#include "lltexturecache.h"
+
+#include "llnotify.h"
+
+#include "llapr.h"
+#include "lldir.h"
+#include "llimage.h"
+#include "lllfsthread.h"
+#include "llviewercontrol.h"
+#include "llassetuploadresponders.h"
+#include "lleconomy.h"
+#include "llhttpclient.h"
+#include "lluploaddialog.h"
+#include "lldir.h"
+#include "llinventorymodel.h"   // gInventory
+#include "llviewercontrol.h"    // gSavedSettings
+#include "llviewermenu.h"       // gMenuHolder
+#include "llagent.h"
+#include "llfilepicker.h"
+#include "llfloateranimpreview.h"
+#include "llfloaterbuycurrency.h"
+#include "llfloaterimagepreview.h"
+#include "llfloaternamedesc.h"
+#include "llfloatersnapshot.h"
+#include "llinventorymodel.h"   // gInventory
+#include "llresourcedata.h"
+#include "llstatusbar.h"
+#include "llviewercontrol.h"    // gSavedSettings
+#include "llviewerimagelist.h"
+#include "lluictrlfactory.h"
+#include "llviewermenu.h"       // gMenuHolder
+#include "llviewerregion.h"
+#include "llviewerstats.h"
+#include "llviewerwindow.h"
+#include "llappviewer.h"
+#include "lluploaddialog.h"
+// Included to allow LLTextureCache::purgeTextures() to pause watchdog timeout
+#include "llappviewer.h" 
+#include "lltransactiontypes.h"
+
+#include "primbackup.h" 
+
+#include "llviewerobjectlist.h"
+
+primbackup* primbackup::sInstance = 0;
+
+class importResponder: public LLNewAgentInventoryResponder
+{
+        public:
+
+        importResponder(const LLSD& post_data,
+                const LLUUID& vfile_id,
+                LLAssetType::EType asset_type)
+        : LLNewAgentInventoryResponder(post_data, vfile_id, asset_type)
+        {
+        }
+
+
+        //virtual 
+        virtual void uploadComplete(const LLSD& content)
+        {
+                        lldebugs << "LLNewAgentInventoryResponder::result from capabilities" << llendl;
+
+        LLAssetType::EType asset_type = LLAssetType::lookup(mPostData["asset_type"].asString());
+        LLInventoryType::EType inventory_type = LLInventoryType::lookup(mPostData["inventory_type"].asString());
+
+        // Update L$ and ownership credit information
+        // since it probably changed on the server
+        if (asset_type == LLAssetType::AT_TEXTURE ||
+                asset_type == LLAssetType::AT_SOUND ||
+                asset_type == LLAssetType::AT_ANIMATION)
+        {
+                gMessageSystem->newMessageFast(_PREHASH_MoneyBalanceRequest);
+                gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+                gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                gMessageSystem->nextBlockFast(_PREHASH_MoneyData);
+                gMessageSystem->addUUIDFast(_PREHASH_TransactionID, LLUUID::null );
+                gAgent.sendReliableMessage();
+
+//              LLStringUtil::format_map_t args;
+//              args["[AMOUNT]"] = llformat("%d",LLGlobalEconomy::Singleton::getInstance()->getPriceUpload());
+//              LLNotifyBox::showXml("UploadPayment", args);
+        }
+
+        // Actually add the upload to viewer inventory
+        llinfos << "Adding " << content["new_inventory_item"].asUUID() << " "
+                        << content["new_asset"].asUUID() << " to inventory." << llendl;
+        if(mPostData["folder_id"].asUUID().notNull())
+        {
+                LLPermissions perm;
+                U32 next_owner_perm;
+                perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
+                if (mPostData["inventory_type"].asString() == "snapshot")
+                {
+                        next_owner_perm = PERM_ALL;
+                }
+                else
+                {
+                        next_owner_perm = PERM_MOVE | PERM_TRANSFER;
+                }
+                perm.initMasks(PERM_ALL, PERM_ALL, PERM_NONE, PERM_NONE, next_owner_perm);
+                S32 creation_date_now = time_corrected();
+                LLPointer<LLViewerInventoryItem> item
+                        = new LLViewerInventoryItem(content["new_inventory_item"].asUUID(),
+                                                                                mPostData["folder_id"].asUUID(),
+                                                                                perm,
+                                                                                content["new_asset"].asUUID(),
+                                                                                asset_type,
+                                                                                inventory_type,
+                                                                                mPostData["name"].asString(),
+                                                                                mPostData["description"].asString(),
+                                                                                LLSaleInfo::DEFAULT,
+                                                                                LLInventoryItem::II_FLAGS_NONE,
+                                                                                creation_date_now);
+                gInventory.updateItem(item);
+                gInventory.notifyObservers();
+        }
+        else
+        {
+                llwarns << "Can't find a folder to put it in" << llendl;
+        }
+
+        // remove the "Uploading..." message
+        LLUploadDialog::modalUploadFinished();
+        
+        primbackup::getInstance()->update_map(content["new_asset"].asUUID());
+        primbackup::getInstance()->upload_next_asset();
+
+        }
+
+};
+
+
+
+class CacheReadResponder : public LLTextureCache::ReadResponder
+        {
+        public:
+                CacheReadResponder(const LLUUID& id, LLImageFormatted* image)
+                        :  mFormattedImage(image), mID(id)
+                {
+                        setImage(image);
+                }
+                void setData(U8* data, S32 datasize, S32 imagesize, S32 imageformat, BOOL imagelocal)
+                {
+                        if(imageformat==IMG_CODEC_TGA && mFormattedImage->getCodec()==IMG_CODEC_J2C)
+                        {
+                                llwarns<<"Bleh its a tga not saving"<<llendl;
+                                mFormattedImage=NULL;
+                                mImageSize=0;
+                                return;
+                        }
+
+                        if (mFormattedImage.notNull())
+                        {       
+                                llassert_always(mFormattedImage->getCodec() == imageformat);
+                                mFormattedImage->appendData(data, datasize);
+                        }
+                        else
+                        {
+                                mFormattedImage = LLImageFormatted::createFromType(imageformat);
+                                mFormattedImage->setData(data,datasize);
+                        }
+                        mImageSize = imagesize;
+                        mImageLocal = imagelocal;
+                }
+
+                virtual void completed(bool success)
+                {
+                        if(success && (mFormattedImage.notNull()) && mImageSize>0)
+                        {
+                                
+                                llinfos << "SUCCESS getting texture "<<mID<< llendl;
+                                
+                                std::string name;
+                                mID.toString(name);
+                                llinfos << "Saving to "<<(primbackup::getInstance()->getfolder()+"//"+name)<<llendl;                    
+                                if(!mFormattedImage->save(primbackup::getInstance()->getfolder()+"//"+name))
+                                {
+                                        llinfos << "FAIL saving texture "<<mID<< llendl;
+                                }
+
+                        }
+                        else
+                        {
+                                if(!success)
+                                        llwarns << "FAIL NOT SUCCESSFUL getting texture "<<mID<< llendl;
+                                if(mFormattedImage.isNull())
+                                        llwarns << "FAIL image is NULL "<<mID<< llendl;
+                        }       
+
+                        primbackup::getInstance()->m_nexttextureready=true;
+                        //JUST SAY NO TO APR DEADLOCKING
+                        //primbackup::getInstance()->export_next_texture();
+                }
+        private:
+                LLPointer<LLImageFormatted> mFormattedImage;
+                LLUUID mID;
+        };
+
+
+
+primbackup::primbackup()
+:       LLFloater( std::string("Prim Import Floater") )
+{
+        LLUICtrlFactory::getInstance()->buildFloater( this, "floater_prim_import.xml" );
+
+        // reposition floater from saved settings
+        //LLRect rect = gSavedSettings.getRect( "FloaterPrimImport" );
+        //reshape( rect.getWidth(), rect.getHeight(), FALSE );
+        //setRect( rect );
+
+        running=false;
+        textures.clear();
+        assetmap.clear();
+        current_asset=LLUUID::null;
+        m_retexture=false;
+        close();
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+//
+primbackup* primbackup::getInstance()
+{
+    if ( ! sInstance )
+        sInstance = new primbackup();
+
+        return sInstance;
+}
+
+primbackup::~primbackup()
+{
+        // save position of floater
+        gSavedSettings.setRect( "FloaterPrimImport", getRect() );
+        sInstance = 0;
+}
+
+void primbackup::draw()
+{
+        LLFloater::draw();
+}
+
+void primbackup::show()
+{
+        // set the title 
+        setTitle( "stuff" );
+        m_curobject=1;
+        m_curprim=0;
+        m_objects=0;
+        m_prims=0;
+        m_textures=0;
+        m_curtexture=0;
+        rezcount=0;
+
+        // make floater appear
+        setVisibleAndFrontmost();
+}
+
+
+void primbackup::onClose( bool app_quitting )
+{
+        setVisible( false );
+        // HACK for fast XML iteration replace with:
+        // destroy();
+}
+
+void primbackup::updateexportnumbers()
+{
+
+        std::stringstream sstr; 
+        LLUICtrl * ctrl=this->getChild<LLUICtrl>("name_label"); 
+
+        sstr<<"Export Progress \n";
+
+        sstr << "Remaining Textures "<<textures.size()<<"\n";
+        ctrl->setValue(LLSD("Text")=sstr.str());
+        
+}
+
+
+void primbackup::updateimportnumbers()
+{
+        std::stringstream sstr; 
+        LLUICtrl * ctrl=this->getChild<LLUICtrl>("name_label"); 
+
+        if(m_retexture)
+        {
+                sstr << " Textures uploads remaining : "<<textures.size()<<"\n";
+                ctrl->setValue(LLSD("Text")=sstr.str());
+        }
+        else
+        {
+                sstr << " Textures uploads N/A \n";
+                ctrl->setValue(LLSD("Text")=sstr.str());
+        }
+        sstr << " Objects "<<this->m_curobject<<"/"<<this->m_objects<<"\n";
+        ctrl->setValue(LLSD("Text")=sstr.str());
+        
+        sstr << " Rez "<<this->rezcount<<"/"<<this->m_prims;
+        ctrl->setValue(LLSD("Text")=sstr.str());
+
+        sstr << " Build "<<this->m_curprim<<"/"<<this->m_prims;
+        ctrl->setValue(LLSD("Text")=sstr.str());
+
+
+}
+
+void primbackup::pre_export_object()
+{
+        textures.clear();
+        llsd.clear();
+        this_group.clear();
+
+        // Open the file save dialog
+        LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_XML ) )
+        {
+                // User canceled save.
+                return;
+        }
+         
+        file_name = file_picker.getCurFile();
+        folder = gDirUtilp->getDirName(file_name);
+
+        export_state=EXPORT_INIT;
+        gIdleCallbacks.addFunction(exportworker, NULL);
+}
+
+
+// static
+bool primbackup::check_perms( LLSelectNode* node )
+{
+        LLPermissions *perms = node->mPermissions;
+        return (gAgent.getID() == perms->getOwner() &&
+                gAgent.getID() == perms->getCreator() &&
+                (PERM_ITEM_UNRESTRICTED &
+                 perms->getMaskOwner()) == PERM_ITEM_UNRESTRICTED);
+}
+
+
+void primbackup::exportworker(void *userdata)
+{       
+        primbackup::getInstance()->updateexportnumbers();
+
+        switch(primbackup::getInstance()->export_state)
+        {
+                case EXPORT_INIT: {
+                        primbackup::getInstance()->show();              
+                        LLSelectMgr::getInstance()->getSelection()->ref();
+
+                        struct ff : public LLSelectedNodeFunctor
+                        {
+                                virtual bool apply(LLSelectNode* node)
+                                {
+                                        return primbackup::check_perms( node );
+                                }
+                        } func;
+
+                        if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(&func,false))
+                        {
+                                primbackup::getInstance()->export_state=EXPORT_STRUCTURE;
+                        }
+                        else
+                        {
+                                llwarns << "Incorrect permission to export" << llendl;
+                                primbackup::getInstance()->export_state=EXPORT_DONE;
+                                primbackup::getInstance()->close();
+                                gIdleCallbacks.deleteFunction(exportworker);
+                                LLSelectMgr::getInstance()->getSelection()->unref();
+                        }
+                        break;
+                }
+
+                case EXPORT_STRUCTURE: {
+                        struct ff : public LLSelectedObjectFunctor
+                        {
+                                virtual bool apply(LLViewerObject* object)
+                                {
+                                        object->boostTexturePriority(TRUE);
+                                        LLViewerObject::child_list_t children = object->getChildren();
+                                        children.push_front(object); //push root onto list
+                                        LLSD prim_llsd=primbackup::getInstance()->prims_to_llsd(children);
+                                        LLSD stuff;
+                                        stuff["root_position"] = object->getPosition().getValue();
+                                        stuff["root_rotation"] = ll_sd_from_quaternion(object->getRotation());
+                                        stuff["group_body"] = prim_llsd;
+                                        primbackup::getInstance()->llsd["data"].append(stuff);
+                                        return true;
+                                }
+                        } func;
+
+                        primbackup::getInstance()->export_state=EXPORT_LLSD;
+                        LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func,false);
+                        LLSelectMgr::getInstance()->getSelection()->unref();
+
+                        break;
+                }
+
+                case EXPORT_TEXTURES: {
+                        if(primbackup::getInstance()->m_nexttextureready==false)
+                                return;
+
+                        //Ok we got work to do
+                        primbackup::getInstance()->m_nexttextureready=false;
+
+                        if(primbackup::getInstance()->textures.empty())
+                        {
+                                primbackup::getInstance()->export_state=EXPORT_DONE;
+                                return;
+                        }
+
+                        primbackup::getInstance()->export_next_texture();
+                        break;
+                }
+
+                case EXPORT_LLSD: {
+                        // Create a file stream and write to it
+                        llofstream export_file(primbackup::getInstance()->file_name);
+                        LLSDSerialize::toPrettyXML(primbackup::getInstance()->llsd, export_file);
+                        export_file.close();
+                        primbackup::getInstance()->m_nexttextureready=true;     
+                        primbackup::getInstance()->export_state=EXPORT_TEXTURES;
+                        break;
+                }
+
+                case EXPORT_DONE: {
+                        llinfos << "Backup complete" << llendl;
+                        gIdleCallbacks.deleteFunction(exportworker);
+                        primbackup::getInstance()->close();
+                        break;
+                }
+        }
+}
+
+LLSD primbackup::prims_to_llsd(LLViewerObject::child_list_t child_list)
+{
+
+        LLViewerObject* object;
+        LLSD llsd;
+
+        char localid[16];
+
+        for (LLViewerObject::child_list_t::iterator i = child_list.begin(); i != child_list.end(); ++i)
+        {
+                object=(*i);
+                LLUUID id = object->getID();
+
+                llinfos << "Exporting prim " << object->getID().asString() << llendl;
+
+                // Create an LLSD object that represents this prim. It will be injected in to the overall LLSD
+                // tree structure
+                LLSD prim_llsd;
+
+                if (!object->isRoot())
+                {
+
+                        // Parent id
+                        snprintf(localid, sizeof(localid), "%u", object->getSubParent()->getLocalID());
+                        prim_llsd["parent"] = localid;
+                }
+
+                // Transforms
+                prim_llsd["position"] = object->getPosition().getValue();
+                prim_llsd["scale"] = object->getScale().getValue();
+                prim_llsd["rotation"] = ll_sd_from_quaternion(object->getRotation());
+
+                // Flags
+                prim_llsd["shadows"] = object->flagCastShadows();
+                prim_llsd["phantom"] = object->flagPhantom();
+                prim_llsd["physical"] = (BOOL)(object->mFlags & FLAGS_USE_PHYSICS);
+
+                // Volume params
+                LLVolumeParams params = object->getVolume()->getParams();
+                prim_llsd["volume"] = params.asLLSD();
+
+                // Extra paramsb6fab961-af18-77f8-cf08-f021377a7244
+                if (object->isFlexible())
+                {
+                        // Flexible
+                        LLFlexibleObjectData* flex = (LLFlexibleObjectData*)object->getParameterEntry(LLNetworkData::PARAMS_FLEXIBLE);
+                        prim_llsd["flexible"] = flex->asLLSD();
+                }
+                if (object->getParameterEntryInUse(LLNetworkData::PARAMS_LIGHT))
+                {
+                        // Light
+                        LLLightParams* light = (LLLightParams*)object->getParameterEntry(LLNetworkData::PARAMS_LIGHT);
+                        prim_llsd["light"] = light->asLLSD();
+                }
+                if (object->getParameterEntryInUse(LLNetworkData::PARAMS_SCULPT))
+                {
+                        // Sculpt
+                        LLSculptParams* sculpt = (LLSculptParams*)object->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+                        prim_llsd["sculpt"] = sculpt->asLLSD();
+                        
+                        LLUUID sculpt_texture=sculpt->getSculptTexture();
+                        bool alreadyseen=false;
+                        std::list<LLUUID>::iterator iter;
+                        for(iter = textures.begin(); iter != textures.end() ; iter++) 
+                        {
+                                if( (*iter)==sculpt_texture)
+                                        alreadyseen=true;
+                        }
+                        if(alreadyseen==false)
+                        {
+                                llinfos << "Found a sculpt texture, adding to list "<<sculpt_texture<<llendl;
+                                textures.push_back(sculpt_texture);
+                        }
+                }
+
+                // Textures
+                LLSD te_llsd;
+                U8 te_count = object->getNumTEs();
+                for (U8 i = 0; i < te_count; i++)
+                {
+                        bool alreadyseen=false;
+                        te_llsd.append(object->getTE(i)->asLLSD());
+                        std::list<LLUUID>::iterator iter;
+                        for(iter = textures.begin(); iter != textures.end() ; iter++) 
+                        {
+                                if( (*iter)==object->getTE(i)->getID())
+                                        alreadyseen=true;
+                        }
+                        if(alreadyseen==false)
+                                textures.push_back(object->getTE(i)->getID());
+                }
+                prim_llsd["textures"] = te_llsd;
+
+                // The keys in the primitive maps do not have to be localids, they can be any
+                // string. We simply use localids because they are a unique identifier
+                snprintf(localid, sizeof(localid), "%u", object->getLocalID());
+                llsd[(const char*)localid] = prim_llsd;
+        }
+
+        updateexportnumbers();
+
+        return llsd;
+}
+
+
+void primbackup::export_next_texture()
+{
+        if(textures.empty())
+        {
+                llinfos << "Finished exporting textures "<<llendl;
+                return;
+        }
+
+        std::list<LLUUID>::iterator iter;
+        iter = textures.begin();
+
+        LLUUID id;
+
+        while(1)
+        {
+                if(iter==textures.end())
+                {
+                        m_nexttextureready=true;
+                        return;
+                }
+
+                id=(*iter);
+
+                LLViewerImage * imagep = gImageList.hasImage(id);
+                if(imagep!=NULL)
+                {
+                        S32 cur_discard = imagep->getDiscardLevel();
+                        if(cur_discard>0)
+                        {
+                                if(imagep->getBoostLevel()!=LLViewerImage::BOOST_PREVIEW)
+                                        imagep->setBoostLevel(LLViewerImage::BOOST_PREVIEW); //we want to force discard 0 this one does this.
+                        }
+                        else
+                        {
+                                break;
+                        }
+                }
+                else
+                {
+                        llwarns<<" We *DONT* have the texture "<<llendl;
+                }
+                iter++;
+        }
+
+        textures.remove(id);
+
+        llinfos<<"Requesting texture "<<id<<llendl;
+        LLImageJ2C * mFormattedImage = new LLImageJ2C;
+        CacheReadResponder* responder = new CacheReadResponder(id, mFormattedImage);
+        LLAppViewer::getTextureCache()->readFromCache(id,LLWorkerThread::PRIORITY_HIGH,0,999999,responder);
+}
+
+
+
+void primbackup::import_object(bool upload)
+{
+        textures.clear();
+        assetmap.clear();
+        current_asset=LLUUID::null;
+
+        this->m_retexture=upload;
+
+        // Open the file open dialog
+        LLFilePicker& file_picker = LLFilePicker::instance();
+        if( !file_picker.getOpenFile( LLFilePicker::FFLOAD_XML ) )
+        {
+                // User canceled save.
+                return;
+        }
+        std::string file_name = file_picker.getFirstFile().c_str();
+        folder = gDirUtilp->getDirName(file_name);
+
+        llifstream import_file(file_name);
+        LLSDSerialize::fromXML(llsd, import_file);
+        import_file.close();
+
+        show();
+
+        //Get the texture map
+        
+        LLSD::map_const_iterator prim_it;
+        LLSD::array_const_iterator prim_arr_it;
+                
+        this->m_curobject=1;
+        this->m_curprim=1;
+        this->m_objects=llsd["data"].size();
+        this->m_prims=0;
+        rezcount=0;
+
+        updateimportnumbers();
+
+        for( prim_arr_it = llsd["data"].beginArray(); prim_arr_it != llsd["data"].endArray(); prim_arr_it++)
+        {
+
+                LLSD llsd2;
+                llsd2=(*prim_arr_it)["group_body"];
+
+                for( prim_it = llsd2.beginMap(); prim_it != llsd2.endMap(); prim_it++)
+                {
+                        LLSD prim_llsd;
+                        prim_llsd=llsd2[prim_it->first];
+                        LLSD::array_iterator text_it;
+                        std::list<LLUUID>::iterator iter;
+
+                        if(prim_llsd.has("sculpt"))
+                        {
+                                LLSculptParams* sculpt=new LLSculptParams();
+                                sculpt->fromLLSD(prim_llsd["sculpt"]);
+                                LLUUID orig=sculpt->getSculptTexture();
+                                bool alreadyseen=false;
+                                for(iter = textures.begin(); iter != textures.end() ; iter++) 
+                                {
+                                        if( (*iter)==orig)
+                                                alreadyseen=true;
+                                }
+                                if(alreadyseen==false)
+                                {
+                                        llinfos << "Found a new SCULPT texture to upload "<<orig<<llendl;                       
+                                        textures.push_back(orig);
+                                }
+                        }
+
+
+                        LLSD te_llsd;
+                        te_llsd=prim_llsd["textures"];
+
+                
+                        for(text_it=te_llsd.beginArray(); text_it !=te_llsd.endArray(); text_it++)
+                        {
+                                LLSD the_te;
+                                the_te=(*text_it);
+                                LLTextureEntry te;
+                                te.fromLLSD(the_te);
+
+                                te.getID();
+                                bool alreadyseen=false;
+
+                                for(iter = textures.begin(); iter != textures.end() ; iter++) 
+                                {
+                                        if( (*iter)==te.getID())
+                                                alreadyseen=true;
+                                }
+                                if(alreadyseen==false)
+                                {
+                                        llinfos << "Found a new texture to upload "<<te.getID()<<llendl;                        
+                                        textures.push_back(te.getID());
+                                }            
+                        }
+
+                }
+        }
+
+        if(m_retexture==TRUE)
+                upload_next_asset();
+        else
+                import_object1a();
+}
+
+LLVector3 primbackup::offset_agent(LLVector3 offset)
+{
+        LLVector3 pos= gAgent.getPositionAgent();
+        LLQuaternion agent_rot=LLQuaternion(gAgent.getAtAxis(),gAgent.getLeftAxis(),gAgent.getUpAxis());
+        pos=(offset*agent_rot+pos);
+        return pos;
+}
+
+void primbackup::rez_agent_offset(LLVector3 offset)
+{
+        // This will break for a sitting agent
+        LLToolPlacer* mPlacer = new LLToolPlacer();
+        mPlacer->setObjectType(LL_PCODE_CUBE);  
+        //LLVector3 pos=offset_agent(offset);
+        mPlacer->placeObject((S32)(offset.mV[0]), (S32)(offset.mV[1]), 0);
+}
+
+void primbackup::import_object1a()
+{
+        running=true;
+
+        show();
+
+        group_prim_import_iter=llsd["data"].beginArray();       
+        root_root_pos=(*group_prim_import_iter)["root_position"];
+
+        this->m_objects=llsd["data"].size();
+        this->m_curobject=1;
+        import_next_object();
+}
+
+void primbackup::import_next_object()
+{
+        toselect.clear();
+        rezcount=0;
+
+        this_group=(*group_prim_import_iter)["group_body"];
+        prim_import_iter=this_group.beginMap();
+
+        m_curprim=0;
+        m_prims=this_group.size();
+        updateimportnumbers();
+        LLVector3 lgpos=(*group_prim_import_iter)["root_position"];
+
+        group_offset=lgpos-root_root_pos;
+        root_pos=offset_agent(LLVector3(2.0,0,0));
+        root_rot=ll_quaternion_from_sd((*group_prim_import_iter)["root_rotation"]);
+        
+        rez_agent_offset(LLVector3(0.0,2.0,0.0));
+        // Now we must wait for the callback when ViewerObjectList gets the new objects and we have the correct number selected
+}
+
+// This function takes a pointer to a viewerobject and applys the prim definition that prim_llsd has
+void primbackup::xmltoprim(LLSD prim_llsd,LLViewerObject * object)
+{
+        LLUUID id = object->getID();
+        expecting_update = object->getID();
+        LLSelectMgr::getInstance()->selectObjectAndFamily(object);
+
+        if(prim_llsd.has("parent"))
+        {
+                //we are not the root node.
+                LLVector3 pos=prim_llsd["position"];
+                LLQuaternion rot=ll_quaternion_from_sd(prim_llsd["rotation"]);
+                object->setPositionRegion((pos*root_rot)+(root_pos+group_offset));
+                object->setRotation(rot*root_rot);
+        }
+        else
+        {
+                object->setPositionRegion(root_pos+group_offset);
+                LLQuaternion rot=ll_quaternion_from_sd(prim_llsd["rotation"]);
+                object->setRotation(rot);
+        }
+
+        object->setScale(prim_llsd["scale"]);
+
+        if(prim_llsd.has("shadows"))
+                if(prim_llsd["shadows"].asInteger()==1)
+                        object->setFlags(FLAGS_CAST_SHADOWS,true);
+
+        if(prim_llsd.has("phantom"))
+                if(prim_llsd["phantom"].asInteger()==1)
+                        object->setFlags(FLAGS_PHANTOM,true);
+
+        if(prim_llsd.has("physical"))
+                if(prim_llsd["physical"].asInteger()==1)
+                        object->setFlags(FLAGS_USE_PHYSICS,true);
+
+        // Volume params
+        LLVolumeParams volume_params = object->getVolume()->getParams();
+        volume_params.fromLLSD(prim_llsd["volume"]) ;
+        object->updateVolume(volume_params);
+        
+        if(prim_llsd.has("sculpt"))
+        {
+                LLSculptParams* sculpt=new LLSculptParams();
+                sculpt->fromLLSD(prim_llsd["sculpt"]);
+                
+                //TODO check if map is valid and only set texture is map is valid and changes
+
+                if(assetmap[sculpt->getSculptTexture()].notNull())
+                {
+                        LLUUID replacment=assetmap[sculpt->getSculptTexture()];
+                        sculpt->setSculptTexture(replacment);
+                }
+
+                object->setParameterEntry(LLNetworkData::PARAMS_SCULPT,(LLNetworkData&)(*sculpt),true);
+        }
+                
+        if(prim_llsd.has("light"))
+        {
+                LLLightParams * light=new LLLightParams();
+                light->fromLLSD(prim_llsd["light"]);
+                object->setParameterEntry(LLNetworkData::PARAMS_LIGHT,(LLNetworkData&)(*light),true);
+        }
+
+        if(prim_llsd.has("flexible"))
+        {
+                LLFlexibleObjectData* flex=new LLFlexibleObjectData();
+                flex->fromLLSD(prim_llsd["flexible"]);
+                object->setParameterEntry(LLNetworkData::PARAMS_FLEXIBLE,(LLNetworkData&)(*flex),true);
+        }
+
+
+        // Textures
+        LLSD te_llsd;
+        llinfos << "Processing textures for prim" << llendl;
+
+        te_llsd=prim_llsd["textures"];
+                
+        LLSD::array_iterator text_it;
+        U8 i=0;
+        i=0;
+
+        for(text_it=te_llsd.beginArray(); text_it !=te_llsd.endArray(); text_it++)
+        {
+            LLSD the_te;
+            the_te=(*text_it);
+            LLTextureEntry te;
+            te.fromLLSD(the_te);
+
+                if(assetmap[te.getID()].notNull())
+                {
+                        LLUUID replacment=assetmap[te.getID()];
+                        te.setID(replacment);
+                }
+
+            object->setTE(i,te); //     
+            i++;
+        }
+
+        llinfos << "Textures done!" << llendl;
+
+        //bump the iterator now so the callbacks hook together nicely
+        //if(prim_import_iter!=this_group.endMap())
+        //      prim_import_iter++;
+
+    object->sendRotationUpdate();
+        object->sendTEUpdate(); 
+        object->sendShapeUpdate();
+        LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_SCALE |UPD_POSITION);
+
+        LLSelectMgr::getInstance()->deselectAll();      
+}
+
+//This is fired when the update packet is processed so we know the prim settings have stuck
+void primbackup::prim_update(LLViewerObject* object)
+{
+        if(!running)
+                return;
+
+        if(object!=NULL)
+                if(object->mID!=expecting_update)
+                        return;
+
+        m_curprim++;
+        updateimportnumbers();
+
+        prim_import_iter++;
+
+        LLUUID x;
+        expecting_update=x.null;
+
+        if(prim_import_iter==this_group.endMap())
+        {
+                llinfos<<"Trying to link"<<llendl;
+
+                if(toselect.size()>1)
+                {
+                        std::reverse(toselect.begin(),toselect.end());
+                        //Now link
+                        LLSelectMgr::getInstance()->deselectAll();      
+                        LLSelectMgr::getInstance()->selectObjectAndFamily(toselect,true);
+                        LLSelectMgr::getInstance()->sendLink();
+                        LLViewerObject * root=toselect.back();
+                        root->setRotation(root_rot);
+                }
+        
+                this->m_curobject++;
+                group_prim_import_iter++;
+                if(group_prim_import_iter!=llsd["data"].endArray())
+                {
+                        import_next_object();
+                        return;
+                }
+                
+                running=false;
+                this->close();
+                return;
+        }
+
+        LLSD prim_llsd;
+        prim_llsd=this_group[prim_import_iter->first];
+
+        if(toselect.empty())
+        {
+                llwarns << "error: ran out of objects to mod" << llendl;
+                return;
+        }
+
+        if(prim_import_iter!=this_group.endMap())
+        {
+                //rez_agent_offset(LLVector3(1.0,0,0));
+                LLSD prim_llsd=this_group[prim_import_iter->first];
+                process_iter++;
+                xmltoprim(prim_llsd,(*process_iter));   
+        }
+}
+
+// Callback when we rez a new object when the importer is running.
+bool primbackup::newprim(LLViewerObject * pobject)
+{
+        if(running)
+        {
+                rezcount++;
+                toselect.push_back(pobject);
+                updateimportnumbers();
+                prim_import_iter++;
+
+                if(prim_import_iter!=this_group.endMap())
+                {
+
+                        pobject->setPosition(this->offset_agent(LLVector3(0,1.0,0)));
+                        LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
+
+                        rez_agent_offset(LLVector3(1.0,0,0));
+                }
+                else
+                {
+                        llinfos << "All prims rezed, moving to build stage" <<llendl;
+                        prim_import_iter=this_group.beginMap();
+                        LLSD prim_llsd=this_group[prim_import_iter->first];
+                        process_iter=toselect.begin();
+                        xmltoprim(prim_llsd,(*process_iter));   
+                }
+        }
+
+        return true;
+}
+
+void primbackup::update_map(LLUUID uploaded_asset)
+{
+        if(current_asset.isNull())
+                return;
+
+        assetmap.insert(std::pair<LLUUID,LLUUID>(current_asset,uploaded_asset));
+        llinfos << "Mapping "<<current_asset<<" to "<<uploaded_asset<<llendl;
+
+}
+
+
+void myupload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_type,
+                                                 std::string name,
+                                                 std::string desc, S32 compression_info,
+                                                 LLAssetType::EType destination_folder_type,
+                                                 LLInventoryType::EType inv_type,
+                                                 U32 next_owner_perm,
+                                                 const std::string& display_name,
+                                                 LLAssetStorage::LLStoreAssetCallback callback,
+                                                 void *userdata)
+{
+        if(gDisconnected)
+        {
+                return ;
+        }
+
+        LLAssetID uuid = tid.makeAssetID(gAgent.getSecureSessionID());  
+        
+        // At this point, we're ready for the upload.
+        std::string upload_message = "Uploading...\n\n";
+        upload_message.append(display_name);
+        LLUploadDialog::modalUploadDialog(upload_message);
+
+        std::string url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
+        if (!url.empty())
+        {
+                LLSD body;
+                body["folder_id"] = gInventory.findCategoryUUIDForType((destination_folder_type == LLAssetType::AT_NONE) ? asset_type : destination_folder_type);
+                body["asset_type"] = LLAssetType::lookup(asset_type);
+                body["inventory_type"] = LLInventoryType::lookup(inv_type);
+                body["name"] = name;
+                body["description"] = desc;
+                
+                std::ostringstream llsdxml;
+                LLSDSerialize::toXML(body, llsdxml);
+                lldebugs << "posting body to capability: " << llsdxml.str() << llendl;
+                //LLHTTPClient::post(url, body, new LLNewAgentInventoryResponder(body, uuid, asset_type));
+                LLHTTPClient::post(url, body, new importResponder(body, uuid, asset_type));
+
+        }
+        else
+        {
+                llinfos << "NewAgentInventory capability not found, FUCK!" << llendl;   
+        }
+}
+
+
+
+void primbackup::upload_next_asset()
+{
+        if(textures.empty())
+        {
+                llinfos<<" Texture list is empty, moving to rez statge"<< llendl;
+                current_asset=LLUUID::null;
+                import_object1a();
+                return;
+        }
+
+        this->updateimportnumbers();
+
+        std::list<LLUUID>::iterator iter;
+        iter=textures.begin();
+        LLUUID id=(*iter);
+        textures.pop_front();
+
+        llinfos<<"Got texture ID "<<id<< "trying to upload"<<llendl;
+
+        current_asset=id;
+        std::string struid;
+        id.toString(struid);
+        std::string filename=folder+"//"+struid;
+        
+
+        LLAssetID uuid;
+        LLTransactionID tid;
+
+        // gen a new transaction ID for this asset
+        tid.generate();
+        uuid = tid.makeAssetID(gAgent.getSecureSessionID());
+
+        S32 file_size;
+        apr_file_t* fp = ll_apr_file_open(filename, LL_APR_RB, &file_size);
+        if (fp)
+        {
+                const S32 buf_size = 65536;     
+                U8 copy_buf[buf_size];
+                LLVFile file(gVFS, uuid,  LLAssetType::AT_TEXTURE, LLVFile::WRITE);
+                file.setMaxSize(file_size);
+                
+                while ((file_size = ll_apr_file_read(fp, copy_buf, buf_size)))
+                {
+                        file.write(copy_buf, file_size);
+                }
+                apr_file_close(fp);
+        }
+        else
+        {
+                llwarns<<"Unable to access output file "<<filename<<llendl;
+                upload_next_asset();
+                return;
+        }
+
+         myupload_new_resource(
+         tid, LLAssetType::AT_TEXTURE, struid,
+                struid, 0,
+                LLAssetType::AT_TEXTURE, 
+                 LLInventoryType::defaultForAssetType(LLAssetType::AT_TEXTURE),
+                 0x0,
+                 "Uploaded texture",
+                 NULL,
+                 NULL);
+
+
+}
+
diff --git a/linden/indra/newview/primbackup.h b/linden/indra/newview/primbackup.h
new file mode 100644
index 0000000..cbd757a
--- /dev/null
+++ b/linden/indra/newview/primbackup.h
@@ -0,0 +1,134 @@
+
+#include "llviewerinventory.h"
+
+#define LL_GRID_PERMISSIONS 1
+
+enum export_states {EXPORT_INIT,EXPORT_STRUCTURE,EXPORT_TEXTURES,EXPORT_LLSD,EXPORT_DONE};
+
+class primbackup :      public LLFloater
+
+{
+        public:
+        //Export state machine
+        enum export_states export_state; 
+        
+        //Export idle callback
+        static void exportworker(void *userdata);
+
+        //Static accessor
+        static primbackup* getInstance();
+
+  static bool check_perms( LLSelectNode* node );
+
+        virtual ~primbackup();
+        
+        //Floater stuff
+        virtual void show();
+        virtual void draw();
+        virtual void onClose( bool app_quitting );
+
+        //Import entry point
+        void import_object(bool upload=FALSE);
+        
+        //Export entry point
+        void pre_export_object();
+
+        //Update map from texture worker
+        void update_map(LLUUID uploaded_asset);
+
+        //Move to next texture upload
+        void upload_next_asset();
+
+        // is ready for next texture?
+        bool m_nexttextureready;
+
+        //Folder public geter
+        std::string getfolder() {return folder;};
+
+        //Prim updated callback
+        void prim_update(LLViewerObject* object);
+
+        //New prim call back
+        bool newprim(LLViewerObject * pobject);
+
+private:
+
+        //Static singleton stuff
+        primbackup();   
+        static primbackup* sInstance;
+
+        // are we active flag
+        bool running;
+
+        //file and folder name control 
+        std::string file_name;
+        std::string folder;
+
+        // True if we need to rebase the assets
+        bool m_retexture;
+
+        //Counts of import and export objects and textures and prims
+        int m_objects,m_curobject;
+        int m_prims,m_curprim;
+        int m_textures,m_curtexture;
+
+        // No prims rezed
+        int rezcount;
+
+        // Update the floater with status numbers
+        void updateimportnumbers();
+        void updateexportnumbers();
+
+        //Convert a selection list of objects to LLSD
+        LLSD prims_to_llsd(LLViewerObject::child_list_t child_list);
+                
+        // Start the import process
+        void import_object1a();
+
+        //Export the next texture in list
+        void export_next_texture();
+
+        //apply LLSD to object
+        void xmltoprim(LLSD prim_llsd,LLViewerObject * pobject);
+        
+
+        //rez a prim at a given position (note not agent offset X/Y screen for raycast)
+        void rez_agent_offset(LLVector3 offset);        
+        
+        //Move to the next import group
+        void import_next_object();
+        
+        //Get an offset from the agent based on rotation and current pos
+        LLVector3 offset_agent(LLVector3 offset);
+
+        // Rebase map
+        std::map<LLUUID,LLUUID> assetmap;
+        
+        //Export texture list
+        std::list<LLUUID> textures;
+
+        //Import object tracking
+        std::vector<LLViewerObject *> toselect;
+        std::vector<LLViewerObject *>::iterator process_iter;
+
+        //Working LLSD holders
+        LLUUID current_asset;
+        LLSD llsd;
+        LLSD this_group;
+        LLUUID expecting_update;
+
+        //working llsd itterators for objects and linksets
+        LLSD::map_const_iterator prim_import_iter;
+        LLSD::array_const_iterator group_prim_import_iter;
+
+        // Root pos and central root pos for link set
+        LLVector3 root_pos;
+        LLVector3 root_root_pos;
+        LLVector3 group_offset;
+
+        //Agent inital pos and rot when starting import
+        LLQuaternion root_rot;
+        LLQuaternion agent_rot;
+
+};
+
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index d5392c9..5e57841 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -138,8 +138,8 @@ TOOLMEDIAOPEN           CURSOR                  "toolmediaopen.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,23,4,123523
- PRODUCTVERSION 1,23,4,123523
+ FILEVERSION 1,3,0
+ PRODUCTVERSION 1,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -156,12 +156,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Imprudence Viewer Project"
             VALUE "FileDescription", "Imprudence"
-            VALUE "FileVersion", "1.0.0"
+            VALUE "FileVersion", "1.3.0"
             VALUE "InternalName", "Imprudence"
-            VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
             VALUE "OriginalFilename", "Imprudence.exe"
             VALUE "ProductName", "Imprudence"
-            VALUE "ProductVersion", "1.0.0"
+            VALUE "ProductVersion", "1.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/rlvdefines.h b/linden/indra/newview/rlvdefines.h
new file mode 100644
index 0000000..118ba31
--- /dev/null
+++ b/linden/indra/newview/rlvdefines.h
@@ -0,0 +1,212 @@
+#ifndef RLV_DEFINES_H
+#define RLV_DEFINES_H
+
+// ============================================================================
+// Extensions
+//
+
+// Comment out if you don't want the Advanced / RLVa menu (may prevent enabling some extensions or experimental features - see below)
+#define RLV_ADVANCED_MENU
+// Comment out if you provide your own way to enable/disable RLVa
+#define RLV_ADVANCED_TOGGLE_RLVA
+
+// Provides access to "advanced" feature through the RLVa debug menu
+#define RLV_EXTENSION_ENABLE_WEAR                       // "Enable Wear"
+#define RLV_EXTENSION_FLOATER_RESTRICTIONS      // Enables the Advanced / RLVa / Restrictions... floater
+#define RLV_EXTENSION_HIDELOCKED                        // "Hide locked layers", "Hide locked attachments" and "Hide locked inventory"
+
+// Extensions
+#define RLV_EXTENSION_CMD_GETSETDEBUG_EX        // Extends the debug variables accessible through @getdebug_xxx/@setdebug_xxx
+#define RLV_EXTENSION_CMD_FINDFOLDERS           // @findfolders:<option>=<channel> - @findfolder with multiple results
+#define RLV_EXTENSION_FLAG_NOSTRIP                      // Layers and attachments marked as "nostrip" are exempt from @detach/@remoutfit
+#define RLV_EXTENSION_STARTLOCATION                     // Reenables "Start Location" at login if not @tploc=n or @unsit=n restricted at last logoff
+#define RLV_EXPERIMENTAL                                        // Enables/disables experimental features en masse
+
+// Experimental features
+#ifdef RLV_EXPERIMENTAL
+        // Stable (will mature to RLV_EXTENSION_XXX in next release if no bugs are found)
+        #define RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK              // Enables "cleaner" UI responses when fartouch blocks something
+
+        // Under testing (stable, but requires further testing - safe for public release but may be quirky)
+        #define RLV_EXPERIMENTAL_FIRSTUSE                               // Enables a number of "first use" popups
+
+        // Under development (don't include in public release)
+        #if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
+        #endif // LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
+#endif // RLV_EXPERIMENTAL
+
+// ============================================================================
+// Defines
+//
+
+// Version of the specifcation we support
+const S32 RLV_VERSION_MAJOR = 1;
+const S32 RLV_VERSION_MINOR = 21;
+const S32 RLV_VERSION_PATCH = 0;
+const S32 RLV_VERSION_BUILD = 0;
+
+// Implementation version
+const S32 RLVa_VERSION_MAJOR = 1;
+const S32 RLVa_VERSION_MINOR = 0;
+const S32 RLVa_VERSION_PATCH = 4;
+const S32 RLVa_VERSION_BUILD = 4;
+
+// The official viewer version we're patching against
+#define RLV_MAKE_TARGET(x, y, z)        ((x << 16) | (y << 8) | z)
+#define RLV_TARGET                                      RLV_MAKE_TARGET(1, 22, 11)
+
+// Defining these makes it easier if we ever need to change our tag
+#define RLV_WARNS       LL_WARNS("RLV")
+#define RLV_INFOS       LL_INFOS("RLV")
+#define RLV_DEBUGS      LL_DEBUGS("RLV")
+
+#if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
+        // Turn on extended debugging information
+        #define RLV_DEBUG
+        // Make sure we halt execution on errors
+        #define RLV_ERRS  LL_ERRS("RLV")
+        // Uncomment to enable the Advanced / RLVa / Unit Tests menu (non-public)
+        //#define RLV_DEBUG_TESTS
+#else
+        // Uncomment if you want extended debugging information on release builds
+        //#define RLV_DEBUG
+        // Don't halt execution on errors in release
+        #define RLV_ERRS  LL_WARNS("RLV")
+#endif // LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
+
+#define RLV_ROOT_FOLDER                                 "#RLV"
+#define RLV_CMD_PREFIX                                  '@'
+#define RLV_PUTINV_PREFIX                               "#RLV/~"
+#define RLV_SETROT_OFFSET                               F_PI_BY_TWO             // @setrot is off by 90° with the rest of SL
+
+#define RLV_FOLDER_FLAG_NOSTRIP                 "nostrip"
+#define RLV_FOLDER_PREFIX_HIDDEN                '.'
+#define RLV_FOLDER_PREFIX_PUTINV        '~'
+
+// ============================================================================
+// Enumeration declarations
+//
+
+// NOTE: any changes to this enumeration should be reflected in initLookupTable()
+enum ERlvBehaviour {
+        RLV_BHVR_VERSION = 0,                   // "version"
+        RLV_BHVR_DETACH,                                // "detach"
+        RLV_BHVR_SENDCHAT,                              // "sendchat"
+        RLV_BHVR_EMOTE,                                 // "emote"
+        RLV_BHVR_CHATSHOUT,                             // "chatshout"
+        RLV_BHVR_CHATNORMAL,                    // "chatnormal"
+        RLV_BHVR_CHATWHISPER,                   // "chatwhisper"
+        RLV_BHVR_REDIRCHAT,                             // "redirchat"
+        RLV_BHVR_REDIREMOTE,                    // "rediremote"
+        RLV_BHVR_SENDIM,                                // "sendim"
+        RLV_BHVR_RECVCHAT,                              // "recvchat"
+        RLV_BHVR_RECVEMOTE,                             // "recvemote"
+        RLV_BHVR_RECVIM,                                // "recvim"
+        RLV_BHVR_TPLM,                                  // "tplm"
+        RLV_BHVR_TPLOC,                                 // "tploc"
+        RLV_BHVR_TPLURE,                                // "tplure"
+        RLV_BHVR_SITTP,                                 // "sittp"
+        RLV_BHVR_EDIT,                                  // "edit"
+        RLV_BHVR_REZ,                                   // "rez"
+        RLV_BHVR_ADDOUTFIT,                             // "addoutfit"
+        RLV_BHVR_REMOUTFIT,                             // "remoutfit"
+        RLV_BHVR_GETOUTFIT,                             // "getoutfit"
+        RLV_BHVR_GETATTACH,                             // "getattach"
+        RLV_BHVR_SHOWINV,                               // "showinv"
+        RLV_BHVR_VIEWNOTE,                              // "viewnote"
+        RLV_BHVR_UNSIT,                                 // "unsit"
+        RLV_BHVR_SIT,                                   // "sit"
+        RLV_BHVR_SENDCHANNEL,                   // "sendchannel"
+        RLV_BHVR_GETSTATUS,                             // "getstatus"
+        RLV_BHVR_GETSTATUSALL,                  // "getstatusall"
+        RLV_BHVR_GETINV,                                // "getinv"
+        RLV_BHVR_GETINVWORN,                    // "getinvworn"
+        RLV_BHVR_FINDFOLDER,                    // "findfolder"
+        RLV_BHVR_FINDFOLDERS,                   // "findfolders"
+        RLV_BHVR_ATTACH,                                // "attach"
+        RLV_BHVR_ATTACHALL,                             // "attachall"
+        RLV_BHVR_DETACHALL,                             // "detachall"
+        RLV_BHVR_GETPATH,                               // "getpath"
+        RLV_BHVR_ATTACHTHIS,                    // "attachthis"
+        RLV_BHVR_ATTACHALLTHIS,                 // "attachallthis"
+        RLV_BHVR_DETACHTHIS,                    // "detachthis"
+        RLV_BHVR_DETACHALLTHIS,                 // "detachallthis"
+        RLV_BHVR_FARTOUCH,                              // "fartouch"
+        RLV_BHVR_SHOWWORLDMAP,                  // "showworldmap"
+        RLV_BHVR_SHOWMINIMAP,                   // "showminimap"
+        RLV_BHVR_SHOWLOC,                               // "showloc"
+        RLV_BHVR_TPTO,                                  // "tpto"
+        RLV_BHVR_ACCEPTTP,                              // "accepttp"
+        RLV_BHVR_ACCEPTPERMISSION,              // "acceptpermission"
+        RLV_BHVR_SHOWNAMES,                             // "shownames"
+        RLV_BHVR_FLY,                                   // "fly"
+        RLV_BHVR_GETSITID,                              // "getsitid"
+        RLV_BHVR_SETDEBUG,                              // "setdebug"
+        RLV_BHVR_SETENV,                                // "setenv"
+        RLV_BHVR_DETACHME,                              // "detachme"
+        RLV_BHVR_SHOWHOVERTEXTALL,              // "showhovertextall"
+        RLV_BHVR_SHOWHOVERTEXTWORLD,    // "showhovertextworld"
+        RLV_BHVR_SHOWHOVERTEXTHUD,              // "showhovertexthud"
+        RLV_BHVR_SHOWHOVERTEXT,                 // "showhovertext"
+        RLV_BHVR_NOTIFY,                                // "notify"
+        RLV_BHVR_DEFAULTWEAR,                   // "defaultwear"
+        RLV_BHVR_VERSIONNUM,                    // "versionnum"
+        RLV_BHVR_PERMISSIVE,                    // "permissive"
+
+        RLV_BHVR_COUNT,
+        RLV_BHVR_UNKNOWN
+};
+
+enum ERlvParamType {
+        RLV_TYPE_UNKNOWN,
+        RLV_TYPE_ADD,                                   // <param> == "n"|"add"
+        RLV_TYPE_REMOVE,                                // <param> == "y"|"rem"
+        RLV_TYPE_FORCE,                                 // <param> == "force"
+        RLV_TYPE_REPLY,                                 // <param> == <number>
+        RLV_TYPE_CLEAR
+};
+
+enum ERlvCmdRet {
+        RLV_RET_NOERROR,                                // Command executed succesfully
+        RLV_RET_RETAINED,                               // Command was retained
+        RLV_RET_DISABLED,                               // Command is disabled (by user)
+        RLV_RET_FAILED,                                 // Command failed (general failure)
+        RLV_RET_FAILED_SYNTAX,                  // Command failed (syntax error)
+        RLV_RET_FAILED_UNSET,                   // Command failed (unset restriction)
+        RLV_RET_FAILED_DUPLICATE,               // Command failed (duplicate)
+        RLV_RET_FAILED_OPTION,                  // Command failed (invalid option)
+        RLV_RET_FAILED_PARAM,                   // Command failed (invalid param)
+        RLV_RET_UNKNOWN                                 // Command unkown
+};
+
+enum ERlvExceptionCheck {
+        RLV_CHECK_PERMISSIVE,                   // Exception can be set by any object
+        RLV_CHECK_STRICT,                               // Exception must be set by all objects holding the restriction
+        RLV_CHECK_DEFAULT                               // Permissive or strict will be determined by currently enforced restrictions
+};
+
+// ============================================================================
+// Settings
+
+#define RLV_SETTING_MAIN                                "RestrainedLife"
+#define RLV_SETTING_DEBUG                               "RestrainedLifeDebug"
+#define RLV_SETTING_NOSETENV                    "RestrainedLifeNoSetEnv"
+#define RLV_SETTING_FORBIDGIVETORLV             "RestrainedLifeForbidGiveToRLV"
+
+#define RLV_SETTING_ENABLEWEAR                  "RLVaEnableWear"
+#define RLV_SETTING_ENABLELEGACYNAMING  "RLVaEnableLegacyNaming"
+#define RLV_SETTING_HIDELOCKEDLAYER             "RLVaHideLockedLayers"
+#define RLV_SETTING_HIDELOCKEDATTACH    "RLVaHideLockedAttachments"
+#define RLV_SETTING_HIDELOCKEDINVENTORY "RLVaHideLockedInventory"
+#define RLV_SETTING_LOGINLASTLOCATION   "RLVaLoginLastLocation"
+#define RLV_SETTING_SHOWNAMETAGS                "RLVaShowNameTags"
+
+#define RLV_SETTING_FIRSTUSE_PREFIX             "FirstRLV"
+#define RLV_SETTING_FIRSTUSE_DETACH             RLV_SETTING_FIRSTUSE_PREFIX"Detach"
+#define RLV_SETTING_FIRSTUSE_ENABLEWEAR RLV_SETTING_FIRSTUSE_PREFIX"EnableWear"
+#define RLV_SETTING_FIRSTUSE_FARTOUCH   RLV_SETTING_FIRSTUSE_PREFIX"Fartouch"
+#define RLV_SETTING_FIRSTUSE_GIVETORLV  RLV_SETTING_FIRSTUSE_PREFIX"GiveToRLV"
+
+// ============================================================================
+
+#endif // RLV_DEFINES_H
diff --git a/linden/indra/newview/rlvevent.h b/linden/indra/newview/rlvevent.h
new file mode 100644
index 0000000..a98996f
--- /dev/null
+++ b/linden/indra/newview/rlvevent.h
@@ -0,0 +1,227 @@
+#ifndef RLV_EVENTEMITTER_H
+#define RLV_EVENTEMITTER_H
+
+#include <algorithm>
+#include <typeinfo>
+#include <list>
+
+#include "lluuid.h"
+
+#include "rlvhelper.h"
+
+// ============================================================================
+// RlvEvent - Passed to observer event handlers (contains the same paramaters as RlvHandler::processXXXCommand)
+//
+
+class RlvEvent
+{
+public:
+        RlvEvent(const LLUUID& uuid, const RlvCommand& rlvCmd) : m_UUID(uuid), m_rlvCmd(rlvCmd) {}
+        virtual ~RlvEvent() {}
+
+        const LLUUID&           getSenderID() const     { return m_UUID; };
+        const RlvCommand&       getCommand() const      { return m_rlvCmd; };
+
+protected:
+        LLUUID     m_UUID;
+        RlvCommand m_rlvCmd;
+};
+
+// ============================================================================
+/*
+ * RlvObserver
+ * ===========
+ * Provides a way to extend the existing command set without changing the main RlvHandler class
+ *
+ * Steps:
+ *   - derive your class from RlvObserver
+ *   - override any of the event functions you need
+ *   - add it as an observer: gRlvHandler.addObserver(new RlbObserverDerivedClass());
+ *   - done
+ *
+ * Notes:
+ *   - as long as you don't call gRlvHandler.remObserver() your class will be cleaned up from
+ *     RlvEventEmitter destructor (see below)
+ *   - event handlers are called only if RlvHandler didn't handle it so while you can
+ *     add a new command @foobar=n, you won't get called for @detach=n
+ *   - event handlers are called *after* the command is added so a call to 
+ *     RlvHandler::hasBehaviour("foobar") would return TRUE
+ *   - return TRUE if you handled the command (won't get passed on to the next observer)
+ *     return FALSE if you didn't handle the command (gets passed on to the next observer)
+ *
+ */
+
+class RlvObserver
+{
+public:
+        virtual ~RlvObserver() {}
+
+        typedef RlvEvent EventType;
+
+        virtual BOOL onAddCommand(const EventType& rlvEvent)    { return FALSE; }
+        virtual BOOL onRemoveCommand(const EventType& rlvEvent) { return FALSE; }
+        virtual BOOL onClearCommand(const EventType& rlvEvent)  { return FALSE; }
+        virtual BOOL onReplyCommand(const EventType& rlvEvent)  { return FALSE; }
+        virtual BOOL onForceCommand(const EventType& rlvEvent)  { return FALSE; }
+};
+
+// ============================================================================
+/*
+ * RlvEventEmitter
+ * ===============
+ * Essentially a slightly modified eventEmitter (see lleventemitter.h)
+ *
+ * Changes:
+ *   - if an event handler returns TRUE then no further observers are notified
+ *   - cleans up the (remaining) observers in the destructor
+ */
+
+template < class T >
+class RlvEventEmitter
+{
+        public:
+                typedef typename T::EventType EventType;
+                typedef std::list< T* > ObserverContainer;
+                typedef BOOL ( T::*observerMethod )( const EventType& );
+
+        protected:
+                ObserverContainer observers;
+
+        public:
+                RlvEventEmitter() { };
+
+                ~RlvEventEmitter()
+                {
+                        clearObservers();
+                }
+
+                BOOL addObserver ( T* observerIn )
+                {
+                        if ( ! observerIn )
+                                return FALSE;
+
+                        // check if observer already exists
+                        if ( std::find ( observers.begin (), observers.end (), observerIn ) != observers.end () )
+                                return FALSE;
+
+                        // save it
+                        observers.push_back ( observerIn );
+
+                        return true;
+                }
+
+                BOOL remObserver ( T* observerIn )
+                {
+                        if ( ! observerIn )
+                                return FALSE;
+
+                        observers.remove ( observerIn );
+
+                        return TRUE;
+                }
+
+                void clearObservers()
+                {
+                        typename std::list< T* >::iterator iter = observers.begin ();
+
+                        while (iter != observers.end ())
+                        {
+                                delete *iter;
+                                ++iter;
+                        };
+
+                        observers.clear();
+                }
+
+                BOOL update ( observerMethod method, const EventType& msgIn )
+                {
+                        typename std::list< T* >::iterator iter = observers.begin ();
+
+                        BOOL fContinue = TRUE;
+                        while ( (iter != observers.end ()) && (fContinue) )
+                        {
+                                fContinue = !( ( ( *iter )->*method ) ( msgIn ) );
+                                ++iter;
+                        };
+
+                        return !fContinue;
+                }
+};
+
+// ============================================================================
+
+class RlvBehaviourObserver
+{
+public:
+        virtual ~RlvBehaviourObserver() {}
+        virtual void changed(const RlvCommand& rlvCmd, bool fInternal) = 0;
+};
+
+// ============================================================================
+
+class RlvBehaviourNotifyObserver : public RlvBehaviourObserver
+{
+public:
+        virtual ~RlvBehaviourNotifyObserver() { }
+
+        void changed(const RlvCommand& rlvCmd, bool fInternal)
+        {
+                if (fInternal)
+                        return;
+
+                std::string strCmd = rlvCmd.asString(), strNotify; ERlvParamType eCmdType = rlvCmd.getParamType();
+                if ( (RLV_TYPE_ADD == eCmdType) || (RLV_TYPE_REMOVE == eCmdType) )
+                        strNotify = llformat("/%s=%s", strCmd.c_str(), rlvCmd.getParam().c_str());
+                else if (RLV_TYPE_CLEAR == eCmdType)
+                        strNotify = llformat("/%s", strCmd.c_str());
+                else
+                        return;
+
+                for (std::multimap<LLUUID, notifyData>::const_iterator itNotify = m_Notifications.begin(); 
+                                itNotify != m_Notifications.end(); ++itNotify)
+                {
+                        if ( (itNotify->second.strFilter.empty()) || (std::string::npos != strCmd.find(itNotify->second.strFilter)) )
+                                rlvSendChatReply(itNotify->second.nChannel, strNotify);
+                }
+        }
+
+        void addNotify(const LLUUID& idObj, S32 nChannel, const std::string& strFilter)
+        {
+                m_Notifications.insert(std::pair<LLUUID, notifyData>(idObj, notifyData(nChannel, strFilter)));
+        }
+
+        void clearNotify(const LLUUID& idObj)
+        {
+                m_Notifications.erase(idObj);
+        }
+
+        bool hasNotify()
+        {
+                return (m_Notifications.size() != 0);
+        }
+
+        void removeNotify(const LLUUID& idObj, S32 nChannel, const std::string& strFilter)
+        {
+                for (std::multimap<LLUUID, notifyData>::iterator itNotify = m_Notifications.lower_bound(idObj), 
+                                endNotify = m_Notifications.upper_bound(idObj); itNotify != endNotify; ++itNotify)
+                {
+                        if ( (itNotify->second.nChannel == nChannel) && (itNotify->second.strFilter == strFilter) )
+                        {
+                                m_Notifications.erase(itNotify);
+                                break;
+                        }
+                }
+        }
+protected:
+        struct notifyData
+        {
+                S32         nChannel;
+                std::string strFilter;
+                notifyData(S32 channel, const std::string& filter) : nChannel(channel), strFilter(filter) {}
+        };
+        std::multimap<LLUUID, notifyData> m_Notifications;
+};
+
+// ============================================================================
+
+#endif // RLV_EVENTEMITTER_H
diff --git a/linden/indra/newview/rlvextensions.cpp b/linden/indra/newview/rlvextensions.cpp
new file mode 100644
index 0000000..f31c62e
--- /dev/null
+++ b/linden/indra/newview/rlvextensions.cpp
@@ -0,0 +1,497 @@
+#include "llviewerprecompiledheaders.h"
+#include "llagent.h"
+#include "llfloaterwindlight.h"
+#include "llviewercontrol.h"
+#include "llviewerwindow.h"
+#include "llvoavatar.h"
+#include "llwlparammanager.h"
+
+#include "rlvextensions.h"
+#include "rlvhandler.h"
+
+// ============================================================================
+
+std::map<std::string, S16> RlvExtGetSet::m_DbgAllowed;
+std::map<std::string, std::string> RlvExtGetSet::m_PseudoDebug;
+
+// Checked: 2009-06-03 (RLVa-0.2.0h) | Modified: RLVa-0.2.0h
+RlvExtGetSet::RlvExtGetSet()
+{
+        if (!m_DbgAllowed.size())       // m_DbgAllowed is static and should only be initialized once
+        {
+                m_DbgAllowed.insert(std::pair<std::string, S16>("AvatarSex", DBG_READ | DBG_WRITE | DBG_PSEUDO));
+                m_DbgAllowed.insert(std::pair<std::string, S16>("RenderResolutionDivisor", DBG_READ | DBG_WRITE));
+                #ifdef RLV_EXTENSION_CMD_GETSETDEBUG_EX
+                        m_DbgAllowed.insert(std::pair<std::string, S16>(RLV_SETTING_FORBIDGIVETORLV, DBG_READ));
+                        m_DbgAllowed.insert(std::pair<std::string, S16>(RLV_SETTING_NOSETENV, DBG_READ));
+                        m_DbgAllowed.insert(std::pair<std::string, S16>("WindLightUseAtmosShaders", DBG_READ));
+                #endif // RLV_EXTENSION_CMD_GETSETDEBUG_EX
+
+                // Cache persistance of every setting
+                LLControlVariable* pSetting;
+                for (std::map<std::string, S16>::iterator itDbg = m_DbgAllowed.begin(); itDbg != m_DbgAllowed.end(); ++itDbg)
+                {
+                        if ( ((pSetting = gSavedSettings.getControl(itDbg->first)) != NULL) && (pSetting->isPersisted()) )
+                                itDbg->second |= DBG_PERSIST;
+                }
+        }
+}
+
+// Checked: 2009-05-17 (RLVa-0.2.0a)
+BOOL RlvExtGetSet::onForceCommand(const RlvEvent& rlvEvent)
+{
+        return processCommand(rlvEvent.getSenderID(), rlvEvent.getCommand());
+}
+
+// Checked: 2009-05-17 (RLVa-0.2.0a)
+BOOL RlvExtGetSet::onReplyCommand(const EventType& rlvEvent)
+{
+        return processCommand(rlvEvent.getSenderID(), rlvEvent.getCommand());
+}
+
+// Checked: 2009-06-18 (RLVa-0.2.1d) | Modified: RLVa-0.2.1d
+BOOL RlvExtGetSet::processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd)
+{
+        std::string strBehaviour = rlvCmd.getBehaviour(), strGetSet, strSetting;
+        int idxSetting = strBehaviour.find('_');
+        if ( (strBehaviour.length() >= 6) && (-1 != idxSetting) && ((int)strBehaviour.length() > idxSetting + 1) )
+        {
+                strSetting = strBehaviour.substr(idxSetting + 1);
+                strBehaviour.erase(idxSetting); // Get rid of "_<setting>"
+
+                strGetSet = strBehaviour.substr(0, 3);
+                strBehaviour.erase(0, 3);               // Get rid of get/set
+
+                if ("debug" == strBehaviour)
+                {
+                        if ( ("get" == strGetSet) && (RLV_TYPE_REPLY == rlvCmd.getParamType()) )
+                        {
+                                rlvSendChatReply(rlvCmd.getParam(), onGetDebug(strSetting));
+                                return TRUE;
+                        }
+                        else if ( ("set" == strGetSet) && (RLV_TYPE_FORCE == rlvCmd.getParamType()) )
+                        {
+                                if (!gRlvHandler.hasBehaviourExcept(RLV_BHVR_SETDEBUG, idObj))
+                                        onSetDebug(strSetting, rlvCmd.getOption());
+                                return TRUE;
+                        }
+                }
+                else if ("env" == strBehaviour)
+                {
+                        if ( ("get" == strGetSet) && (RLV_TYPE_REPLY == rlvCmd.getParamType()) )
+                        {
+                                rlvSendChatReply(rlvCmd.getParam(), onGetEnv(strSetting));
+                                return TRUE;
+                        }
+                        else if ( ("set" == strGetSet) && (RLV_TYPE_FORCE == rlvCmd.getParamType()) )
+                        {
+                                if (!gRlvHandler.hasBehaviourExcept(RLV_BHVR_SETENV, idObj))
+                                        onSetEnv(strSetting, rlvCmd.getOption());
+                                return TRUE;
+                        }
+                }
+        }
+        else if ("setrot" == rlvCmd.getBehaviour())
+        {
+                // NOTE: if <option> is invalid (or missing) altogether then RLV-1.17 will rotate to 0.0 (which is actually PI / 4)
+                F32 nAngle = 0.0f;
+                if (LLStringUtil::convertToF32(rlvCmd.getOption(), nAngle))
+                {
+                        nAngle += RLV_SETROT_OFFSET;
+
+                        gAgent.startCameraAnimation();
+
+                        LLVector3 at(LLVector3::x_axis);
+                        at.rotVec(nAngle, LLVector3::z_axis);
+                        at.normalize();
+                        gAgent.resetAxes(at);
+
+                        return TRUE;
+                }
+        }
+        return FALSE;
+}
+
+// Checked: 2009-06-03 (RLVa-0.2.0h) | Modified: RLVa-0.2.0h
+bool RlvExtGetSet::findDebugSetting(std::string& strSetting, S16& flags)
+{
+        LLStringUtil::toLower(strSetting);      // Convenience for non-RLV calls
+
+        std::string strTemp;
+        for (std::map<std::string, S16>::const_iterator itSetting = m_DbgAllowed.begin(); itSetting != m_DbgAllowed.end(); ++itSetting)
+        {
+                strTemp = itSetting->first;
+                LLStringUtil::toLower(strTemp);
+                
+                if (strSetting == strTemp)
+                {
+                        strSetting = itSetting->first;
+                        flags = itSetting->second;
+                        return true;
+                }
+        }
+        return false;
+}
+
+// Checked: 2009-06-03 (RLVa-0.2.0h) | Added: RLVa-0.2.0h
+S16 RlvExtGetSet::getDebugSettingFlags(const std::string& strSetting)
+{
+        std::map<std::string, S16>::const_iterator itSetting = m_DbgAllowed.find(strSetting);
+        return (itSetting != m_DbgAllowed.end()) ? itSetting->second : 0;
+}
+
+// Checked: 2009-06-03 (RLVa-0.2.0h) | Modified: RLVa-0.2.0h
+std::string RlvExtGetSet::onGetDebug(std::string strSetting)
+{
+        S16 dbgFlags;
+        if ( (findDebugSetting(strSetting, dbgFlags)) && ((dbgFlags & DBG_READ) == DBG_READ) )
+        {
+                if ((dbgFlags & DBG_PSEUDO) == 0)
+                {
+                        LLControlVariable* pSetting = gSavedSettings.getControl(strSetting);
+                        if (pSetting)
+                        {
+                                switch (pSetting->type())
+                                {
+                                        case TYPE_U32:
+                                                return llformat("%u", gSavedSettings.getU32(strSetting));
+                                        case TYPE_S32:
+                                                return llformat("%d", gSavedSettings.getS32(strSetting));
+                                        case TYPE_BOOLEAN:
+                                                return llformat("%d", gSavedSettings.getBOOL(strSetting));
+                                        default:
+                                                RLV_ERRS << "Unexpected debug setting type" << LL_ENDL;
+                                                break;
+                                }
+                        }
+                }
+                else
+                {
+                        return onGetPseudoDebug(strSetting);
+                }
+        }
+        return std::string();
+}
+
+// Checked: 2009-10-03 (RLVa-1.0.4e) | Added: RLVa-1.0.4e
+std::string RlvExtGetSet::onGetPseudoDebug(const std::string& strSetting)
+{
+        // Skip sanity checking because it's all done in RlvExtGetSet::onGetDebug() already
+        if ("AvatarSex" == strSetting)
+        {
+                std::map<std::string, std::string>::const_iterator itPseudo = m_PseudoDebug.find(strSetting);
+                if (itPseudo != m_PseudoDebug.end())
+                {
+                        return itPseudo->second;
+                }
+                else
+                {
+                        if (gAgent.getAvatarObject())
+                                return llformat("%d", (gAgent.getAvatarObject()->getSex() == SEX_MALE)); // [See LLFloaterCustomize::LLFloaterCustomize()]
+                }
+        }
+        return std::string();
+}
+
+// Checked: 2009-10-10 (RLVa-1.0.4e) | Modified: RLVa-1.0.4e
+void RlvExtGetSet::onSetDebug(std::string strSetting, const std::string& strValue)
+{
+        S16 dbgFlags;
+        if ( (findDebugSetting(strSetting, dbgFlags)) && ((dbgFlags & DBG_WRITE) == DBG_WRITE) )
+        {
+                if ((dbgFlags & DBG_PSEUDO) == 0)
+                {
+                        LLControlVariable* pSetting = gSavedSettings.getControl(strSetting);
+                        if (pSetting)
+                        {
+                                U32 u32Value; S32 s32Value; BOOL fValue;
+                                switch (pSetting->type())
+                                {
+                                        case TYPE_U32:
+                                                if (LLStringUtil::convertToU32(strValue, u32Value))
+                                                        gSavedSettings.setU32(strSetting, u32Value);
+                                                break;
+                                        case TYPE_S32:
+                                                if (LLStringUtil::convertToS32(strValue, s32Value))
+                                                        gSavedSettings.setS32(strSetting, s32Value);
+                                                break;
+                                        case TYPE_BOOLEAN:
+                                                if (LLStringUtil::convertToBOOL(strValue, fValue))
+                                                        gSavedSettings.setBOOL(strSetting, fValue);
+                                                break;
+                                        default:
+                                                RLV_ERRS << "Unexpected debug setting type" << LL_ENDL;
+                                                break;
+                                }
+
+                                // Default settings should persist if they were marked that way, but non-default settings should never persist
+                                pSetting->setPersist( (pSetting->isDefault()) ? ((dbgFlags & DBG_PERSIST) == DBG_PERSIST) : false );
+                        }
+                }
+                else
+                {
+                        onSetPseudoDebug(strSetting, strValue);
+                }
+        }
+}
+
+// Checked: 2009-10-10 (RLVa-1.0.4e) | Modified: RLVa-1.0.4e
+void RlvExtGetSet::onSetPseudoDebug(const std::string& strSetting, const std::string& strValue)
+{
+        if ("AvatarSex" == strSetting)
+        {
+                BOOL fValue;
+                if (LLStringUtil::convertToBOOL(strValue, fValue))
+                        m_PseudoDebug[strSetting] = strValue;
+        }
+}
+
+// Checked: 2009-09-16 (RLVa-1.0.3c) | Modified: RLVa-1.0.3c
+std::string RlvExtGetSet::onGetEnv(std::string strSetting)
+{
+        // HACK: - create a LLFloaterWindLight instance if there isn't one already
+        //       - isOpen() is actually instanceExists()
+        //       - creating an instance results in showing the floater which is why we need to ->close() it
+        if (!LLFloaterWindLight::isOpen())
+        {
+                LLFloaterWindLight::instance()->close();
+                LLFloaterWindLight::instance()->syncMenu();
+        }
+
+        LLWLParamManager* pWLParams = LLWLParamManager::instance();
+
+        F32 nValue = 0.0f;
+        if ("daytime" == strSetting)
+        {
+                nValue = (pWLParams->mAnimator.mIsRunning && pWLParams->mAnimator.mUseLindenTime) ? -1.0f : pWLParams->mAnimator.getDayTime();
+        }
+        else if ("preset" == strSetting)
+        {
+                return (pWLParams->mAnimator.mIsRunning && pWLParams->mAnimator.mUseLindenTime) ? std::string() : pWLParams->mCurParams.mName;
+        }
+        else if ("cloudcoverage" == strSetting)                 nValue = pWLParams->mCloudCoverage;
+        else if ("cloudscale" == strSetting)                    nValue = pWLParams->mCloudScale;
+        else if ("cloudscrollx" == strSetting)                  nValue = pWLParams->mCurParams.getCloudScrollX() - 10.0f;
+        else if ("cloudscrolly" == strSetting)                  nValue = pWLParams->mCurParams.getCloudScrollY() - 10.0f;
+        else if ("densitymultiplier" == strSetting)             nValue = pWLParams->mDensityMult.x * pWLParams->mDensityMult.mult;
+        else if ("distancemultiplier" == strSetting)    nValue = pWLParams->mDistanceMult;
+        else if ("eastangle" == strSetting)                             nValue = pWLParams->mCurParams.getEastAngle() / F_TWO_PI;
+        else if ("hazedensity" == strSetting)                   nValue = pWLParams->mHazeDensity.r;
+        else if ("hazehorizon" == strSetting)                   nValue = pWLParams->mHazeHorizon.r;
+        else if ("maxaltitude" == strSetting)                   nValue = pWLParams->mMaxAlt;
+        else if ("scenegamma" == strSetting)                    nValue = pWLParams->mWLGamma;
+        else if ("starbrightness" == strSetting)                nValue = pWLParams->mCurParams.getStarBrightness();
+        else if ("sunglowfocus" == strSetting)                  nValue = -pWLParams->mGlow.b / 5.0f;
+        else if ("sunglowsize" == strSetting)                   nValue = 2 - pWLParams->mGlow.r / 20.0f;
+        else if ("sunmoonposition" == strSetting)               nValue = pWLParams->mCurParams.getSunAngle() / F_TWO_PI;
+        else
+        {
+                char ch = strSetting[strSetting.length() - 1];
+                // HACK-RLVa: not entirely proper (creates new synonyms)
+                if ('x' == ch)          ch = 'r';
+                else if ('y' == ch)     ch = 'g';
+                else if ('d' == ch)     ch = 'b';
+
+                if ( ('r' == ch) || ('g' == ch) || ('b' == ch) || ('i' == ch) )
+                {
+                        WLColorControl* pColour = NULL;
+                        strSetting.erase(strSetting.length() - 1, 1);
+                        
+                        if ("ambient" == strSetting)                    pColour = &pWLParams->mAmbient;
+                        else if ("bluedensity" == strSetting)   pColour = &pWLParams->mBlueDensity;
+                        else if ("bluehorizon" == strSetting)   pColour = &pWLParams->mBlueHorizon;
+                        else if ("sunmooncolor" == strSetting)  pColour = &pWLParams->mSunlight;
+                        else if ("cloudcolor" == strSetting)    pColour = &pWLParams->mCloudColor;
+                        else if ("cloud" == strSetting)                 pColour = &pWLParams->mCloudMain;
+                        else if ("clouddetail" == strSetting)   pColour = &pWLParams->mCloudDetail;
+
+                        if (pColour)
+                        {
+                                if ('r' == ch)          nValue = pColour->r;
+                                else if ('g' == ch)     nValue = pColour->g;
+                                else if ('b' == ch)     nValue = pColour->b;
+                                else if (('i' == ch) && (pColour->hasSliderName)) nValue = llmax(pColour->r, pColour->g, pColour->b);
+
+                                if (pColour->isBlueHorizonOrDensity)    nValue /= 2.0f;
+                                else if (pColour->isSunOrAmbientColor)  nValue /= 3.0f;
+                        }
+                }
+        }
+
+        return llformat("%f", nValue);
+}
+
+// Checked: 2009-09-16 (RLVa-1.0.3c) | Modified: RLVa-1.0.3c
+void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
+{
+        // HACK: see RlvExtGetSet::onGetEnv
+        if (!LLFloaterWindLight::isOpen())
+        {
+                LLFloaterWindLight::instance()->close();
+                LLFloaterWindLight::instance()->syncMenu();
+        }
+
+        LLWLParamManager* pWLParams = LLWLParamManager::instance();
+        WLFloatControl* pFloat = NULL;
+        WLColorControl* pColour = NULL;
+
+        F32 nValue = 0.0f;
+        // Sanity check - make sure strValue specifies a number for all settings except "preset"
+        if ( (rlv_handler_t::fNoSetEnv) || ( (!LLStringUtil::convertToF32(strValue, nValue)) && ("preset" != strSetting) ))
+                return;
+
+        // Not quite correct, but RLV-1.16.0 will halt the default daytime cycle on invalid commands so we need to as well
+        pWLParams->mAnimator.mIsRunning = false;
+        pWLParams->mAnimator.mUseLindenTime = false;
+
+        // See LLWorldEnvSettings::handleEvent()
+        if ("daytime" == strSetting)
+        {
+                if (0.0f <= nValue)
+                {
+                        pWLParams->mAnimator.setDayTime(llmin(nValue, 1.0f));
+                        pWLParams->mAnimator.update(pWLParams->mCurParams);
+                }
+                else
+                {
+                        pWLParams->mAnimator.mIsRunning = true;
+                        pWLParams->mAnimator.mUseLindenTime = true;     
+                }
+                return;
+        }
+        // See LLFloaterWindLight::onChangePresetName()
+        else if ("preset" == strSetting)
+        {
+                pWLParams->loadPreset(strValue, true);
+                return;
+        }
+        // See LLFloaterWindLight::onStarAlphaMoved
+        else if ("starbrightness" == strSetting)
+        {
+                pWLParams->mCurParams.setStarBrightness(nValue);
+                return;
+        }
+        // See LLFloaterWindLight::onGlowRMoved() / LLFloaterWindLight::onGlowBMoved()
+        else if ( ("sunglowfocus" == strSetting) || ("sunglowsize" == strSetting) )
+        {
+                WLColorControl *pColour = &pWLParams->mGlow;
+                if ("sunglowfocus" == strSetting) 
+                        pColour->b = -nValue * 5;
+                else
+                        pColour->r = (2 - nValue) * 20;
+
+                pColour->update(pWLParams->mCurParams);
+                pWLParams->propagateParameters();
+                return;
+        }
+        // See LLFloaterWindLight::onSunMoved()
+        else if ( ("eastangle" == strSetting) || ("sunmoonposition" == strSetting) )    
+        {
+                if ("eastangle" == strSetting)  
+                        pWLParams->mCurParams.setEastAngle(F_TWO_PI * nValue);
+                else
+                        pWLParams->mCurParams.setSunAngle(F_TWO_PI * nValue);
+
+                // TODO-RLVa: it looks like propagateParameters() will actually take care of this for us, making this redundant?
+                WLColorControl* pColour = &pWLParams->mLightnorm;
+                pColour->r = -sin(pWLParams->mCurParams.getEastAngle()) * cos(pWLParams->mCurParams.getSunAngle());
+                pColour->g = sin(pWLParams->mCurParams.getSunAngle());
+                pColour->b = cos(pWLParams->mCurParams.getEastAngle()) * cos(pWLParams->mCurParams.getSunAngle());
+                pColour->i = 1.f;
+
+                pColour->update(pWLParams->mCurParams);
+                pWLParams->propagateParameters();
+                return;
+        }
+        // See LLFloaterWindLight::onCloudScrollXMoved() / LLFloaterWindLight::onCloudScrollYMoved() 
+        else if ("cloudscrollx" == strSetting)
+        {
+                pWLParams->mCurParams.setCloudScrollX(nValue + 10.0f);
+                return;
+        }
+        else if ("cloudscrolly" == strSetting)
+        {
+                pWLParams->mCurParams.setCloudScrollY(nValue + 10.0f);
+                return;
+        }
+        // See LLFloaterWindLight::onFloatControlMoved()
+        else if ("cloudcoverage" == strSetting)                 pFloat = &pWLParams->mCloudCoverage;
+        else if ("cloudscale" == strSetting)                    pFloat = &pWLParams->mCloudScale;
+        else if ("densitymultiplier" == strSetting)             pFloat = &pWLParams->mDensityMult;
+        else if ("distancemultiplier" == strSetting)    pFloat = &pWLParams->mDistanceMult;
+        else if ("maxaltitude" == strSetting)                   pFloat = &pWLParams->mMaxAlt;
+        else if ("scenegamma" == strSetting)                    pFloat = &pWLParams->mWLGamma;
+        // See LLFloaterWindLight::onColorControlRMoved()
+        else if ("hazedensity" == strSetting)   pColour = &pWLParams->mHazeDensity;
+        else if ("hazehorizon" == strSetting)   pColour = &pWLParams->mHazeHorizon;
+
+        if (pFloat)
+        {
+                pFloat->x = nValue / pFloat->mult;
+                pFloat->update(pWLParams->mCurParams);
+                pWLParams->propagateParameters();
+                return;
+        } 
+        else if (pColour)
+        {
+                pColour->r = nValue;
+                pColour->update(pWLParams->mCurParams);
+                pWLParams->propagateParameters();
+                return;
+        }
+
+        // RGBI settings
+        char ch = strSetting[strSetting.length() - 1];
+        if ('x' == ch)          ch = 'r';
+        else if ('y' == ch)     ch = 'g';
+        else if ('d' == ch)     ch = 'b';
+
+        if ( ('r' == ch) || ('g' == ch) || ('b' == ch) || ('i' == ch) )
+        {
+                strSetting.erase(strSetting.length() - 1, 1);
+                
+                if ("ambient" == strSetting)                    pColour = &pWLParams->mAmbient;
+                else if ("bluedensity" == strSetting)   pColour = &pWLParams->mBlueDensity;
+                else if ("bluehorizon" == strSetting)   pColour = &pWLParams->mBlueHorizon;
+                else if ("sunmooncolor" == strSetting)  pColour = &pWLParams->mSunlight;
+                else if ("cloudcolor" == strSetting)    pColour = &pWLParams->mCloudColor;
+                else if ("cloud" == strSetting)                 pColour = &pWLParams->mCloudMain;
+                else if ("clouddetail" == strSetting)   pColour = &pWLParams->mCloudDetail;
+
+                if (pColour)
+                {
+                        if (pColour->isBlueHorizonOrDensity)   nValue *= 2.0f;
+                        else if (pColour->isSunOrAmbientColor) nValue *= 3.0f;
+
+                        if ('i' == ch)                                                                  // (See: LLFloaterWindLight::onColorControlIMoved)
+                        {
+                                if (!pColour->hasSliderName)
+                                        return;
+
+                                F32 curMax = llmax(pColour->r, pColour->g, pColour->b);
+                                if ( (0.0f == nValue) || (0.0f == curMax) )
+                                        pColour->r = pColour->g = pColour->b = pColour->i = nValue;
+                                else
+                                {
+                                        F32 nDelta = (nValue - curMax) / curMax;
+                                        pColour->r *= (1.0f + nDelta);
+                                        pColour->g *= (1.0f + nDelta);
+                                        pColour->b *= (1.0f + nDelta);
+                                        pColour->i = nValue;
+                                }
+                        }
+                        else                                                                                    // (See: LLFloaterWindLight::onColorControlRMoved)
+                        {
+                                F32* pnValue = ('r' == ch) ? &pColour->r : ('g' == ch) ? &pColour->g : ('b' == ch) ? &pColour->b : NULL;
+                                if (pnValue)
+                                        *pnValue = nValue;
+                                pColour->i = llmax(pColour->r, pColour->g, pColour->b);
+                        }
+
+                        pColour->update(pWLParams->mCurParams);
+                        pWLParams->propagateParameters();
+                }
+        }
+}
+
+// ============================================================================
diff --git a/linden/indra/newview/rlvextensions.h b/linden/indra/newview/rlvextensions.h
new file mode 100644
index 0000000..5720ba0
--- /dev/null
+++ b/linden/indra/newview/rlvextensions.h
@@ -0,0 +1,45 @@
+#ifndef RLV_EXTENSIONS_H
+#define RLV_EXTENSIONS_H
+
+#include "rlvhelper.h"
+#include "rlvevent.h"
+
+// ============================================================================
+/*
+ * RlvExtGetSet
+ * ============
+ * Implements @get_XXX:<option>=<channel> and @set_XXX:<option>=force
+ *
+ */
+
+class RlvExtGetSet : public RlvObserver
+{
+public:
+        RlvExtGetSet();
+        virtual ~RlvExtGetSet() {}
+
+        virtual BOOL onForceCommand(const RlvEvent& rlvEvent);
+        virtual BOOL onReplyCommand(const RlvEvent& rlvEvent);
+protected:
+        std::string onGetDebug(std::string strSetting);
+        std::string onGetPseudoDebug(const std::string& strSetting);
+        void        onSetDebug(std::string strSetting, const std::string& strValue);
+        void        onSetPseudoDebug(const std::string& strSetting, const std::string& strValue);
+
+        std::string onGetEnv(std::string strSetting);
+        void        onSetEnv(std::string strSetting, const std::string& strValue);
+
+        BOOL processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd);
+
+public:
+        enum { DBG_READ = 0x01, DBG_WRITE = 0x02, DBG_PERSIST = 0x04, DBG_PSEUDO = 0x08 };
+        static std::map<std::string, S16> m_DbgAllowed;
+        static std::map<std::string, std::string> m_PseudoDebug;
+
+        static bool findDebugSetting(/*[in,out]*/ std::string& strSetting, /*[out]*/ S16& flags);
+        static S16  getDebugSettingFlags(const std::string& strSetting);
+};
+
+// ============================================================================
+
+#endif // RLV_EXTENSIONS_H
diff --git a/linden/indra/newview/rlvfloaterbehaviour.cpp b/linden/indra/newview/rlvfloaterbehaviour.cpp
new file mode 100644
index 0000000..39fcf12
--- /dev/null
+++ b/linden/indra/newview/rlvfloaterbehaviour.cpp
@@ -0,0 +1,152 @@
+#include "llviewerprecompiledheaders.h"
+
+#include "llagent.h"
+#include "llcachename.h"
+#include "llscrolllistctrl.h"
+#include "lluictrlfactory.h"
+#include "llviewerinventory.h"
+#include "llviewerobjectlist.h"
+#include "llvoavatar.h"
+
+#include "rlvfloaterbehaviour.h"
+
+// ============================================================================
+
+RlvFloaterBehaviour::RlvFloaterBehaviour(const LLSD& key) 
+        : LLFloater(std::string("rlvBehaviours"))
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_rlv_behaviour.xml");
+}
+
+
+void RlvFloaterBehaviour::show(void*)
+{
+        RlvFloaterBehaviour::showInstance();
+}
+
+void RlvFloaterBehaviour::refreshAll()
+{
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        LLCtrlListInterface* pList = childGetListInterface("behaviour_list");
+        const rlv_object_map_t* pRlvObjects = gRlvHandler.getObjectMap();
+        if ( (!pAvatar) || (!pList) || (!pRlvObjects) )
+                return;
+
+        pList->operateOnAll(LLCtrlListInterface::OP_DELETE);
+
+        for (rlv_object_map_t::const_iterator itObj = pRlvObjects->begin(), endObj = pRlvObjects->end(); itObj != endObj; ++itObj)
+        {
+                std::string strName = itObj->first.asString();
+
+                LLViewerInventoryItem* pItem = NULL;
+                LLViewerObject* pObj = gObjectList.findObject(itObj->first);
+                if (pObj)
+                {
+                        LLViewerJointAttachment* pAttachPt = 
+                                get_if_there(pAvatar->mAttachmentPoints, gRlvHandler.getAttachPointIndex(pObj), (LLViewerJointAttachment*)NULL);
+                        if (pAttachPt)
+                        {
+                                pItem = gInventory.getItem(pAttachPt->getItemID());
+                        }
+                }
+
+                if (pItem)
+                        strName = pItem->getName();
+
+                const rlv_command_list_t* pCommands = itObj->second.getCommandList();
+                for (rlv_command_list_t::const_iterator itCmd = pCommands->begin(), endCmd = pCommands->end(); itCmd != endCmd; ++itCmd)
+                {
+                        std::string strBhvr = itCmd->asString(); LLUUID uuid(itCmd->getOption());
+                        if (uuid.notNull())
+                        {
+                                std::string strLookup;
+                                if ( (gCacheName->getFullName(uuid, strLookup)) || (gCacheName->getGroupName(uuid, strLookup)) )
+                                {
+                                        if (strLookup.find("???") == std::string::npos)
+                                                strBhvr.assign(itCmd->getBehaviour()).append(":").append(strLookup);
+                                }
+                                else if (m_PendingLookup.end() == std::find(m_PendingLookup.begin(), m_PendingLookup.end(), uuid))
+                                {
+                                        gCacheName->get(uuid, FALSE, onAvatarNameLookup, this);
+                                        m_PendingLookup.push_back(uuid);
+                                }
+                        }
+
+                        LLSD element;
+
+                        // Restriction column
+                        element["columns"][0]["column"] = "behaviour";
+                        element["columns"][0]["value"] = strBhvr;
+                        element["columns"][0]["font"] = "SANSSERIF";
+                        element["columns"][0]["font-style"] = "NORMAL";
+
+                        // Object Name column
+                        element["columns"][1]["column"] = "name";
+                        element["columns"][1]["value"] = strName;
+                        element["columns"][1]["font"] = "SANSSERIF";
+                        element["columns"][1]["font-style"] = "NORMAL";
+
+                        pList->addElement(element, ADD_BOTTOM);
+                }
+        }
+}
+
+// ============================================================================
+/*
+ * LLFloater overrides
+ */
+
+BOOL RlvFloaterBehaviour::canClose()
+{
+        return !LLApp::isExiting();
+}
+
+void RlvFloaterBehaviour::onOpen()
+{
+        gRlvHandler.addBehaviourObserver(this);
+
+        refreshAll();
+}
+
+void RlvFloaterBehaviour::onClose(bool fQuitting)
+{
+        LLFloater::setVisible(FALSE);
+
+        gRlvHandler.removeBehaviourObserver(this);
+
+        for (std::list<LLUUID>::const_iterator itLookup = m_PendingLookup.begin(); itLookup != m_PendingLookup.end(); ++itLookup)
+        {
+                gCacheName->cancelCallback(*itLookup, onAvatarNameLookup, this);
+        }
+        m_PendingLookup.clear();
+}
+
+BOOL RlvFloaterBehaviour::postBuild()
+{
+        return TRUE;
+}
+
+// ============================================================================
+/*
+ * RlvBehaviourObserver overrides
+ */
+
+void RlvFloaterBehaviour::changed(const RlvCommand& /*rlvCmd*/, bool /*fInternal*/)
+{
+        refreshAll();
+}
+
+// ============================================================================
+
+void RlvFloaterBehaviour::onAvatarNameLookup(const LLUUID& uuid, const std::string& strFirst, const std::string& strLast, BOOL fGroup, void* pParam)
+{
+        RlvFloaterBehaviour* pSelf = (RlvFloaterBehaviour*)pParam;
+
+        std::list<LLUUID>::iterator itLookup = std::find(pSelf->m_PendingLookup.begin(), pSelf->m_PendingLookup.end(), uuid);
+        if (itLookup != pSelf->m_PendingLookup.end())
+                pSelf->m_PendingLookup.erase(itLookup);
+
+        pSelf->refreshAll();
+}
+
+// ============================================================================
diff --git a/linden/indra/newview/rlvfloaterbehaviour.h b/linden/indra/newview/rlvfloaterbehaviour.h
new file mode 100644
index 0000000..1410dd5
--- /dev/null
+++ b/linden/indra/newview/rlvfloaterbehaviour.h
@@ -0,0 +1,49 @@
+#ifndef RLV_FLOATER_BEHAVIOUR
+#define RLV_FLOATER_BEHAVIOUR
+
+#include "llfloater.h"
+#include "rlvevent.h"
+
+// ============================================================================
+
+class RlvFloaterBehaviour :
+        public LLFloater,
+        public LLFloaterSingleton<RlvFloaterBehaviour>,
+        public RlvBehaviourObserver
+{
+        friend class LLUISingleton<RlvFloaterBehaviour, VisibilityPolicy<LLFloater> >;
+public:
+        virtual ~RlvFloaterBehaviour() {}
+
+        /*
+         * LLFloater overrides
+         */
+public:
+        /*virtual*/ BOOL canClose();
+        /*virtual*/ void onOpen();
+        /*virtual*/ void onClose(bool app_quitting);
+        /*virtual*/ BOOL postBuild();
+
+        /*
+         * RlvBehaviourObserver overrides
+         */
+public:
+        /*virtual*/ void changed(const RlvCommand& rlvCmd, bool fInternal);
+
+        /*
+         * Member functions
+         */
+public:
+        static void show(void*);
+        static void onAvatarNameLookup(const LLUUID& uuid, const std::string& strFirst, const std::string& strLast, BOOL fGroup, void* pParam);
+protected:
+        void refreshAll();
+private:
+        RlvFloaterBehaviour(const LLSD& key = LLSD());
+
+        std::list<LLUUID> m_PendingLookup;
+};
+
+// ============================================================================
+
+#endif // RLV_FLOATER_BEHAVIOUR
diff --git a/linden/indra/newview/rlvhandler.cpp b/linden/indra/newview/rlvhandler.cpp
new file mode 100644
index 0000000..69e2e2f
--- /dev/null
+++ b/linden/indra/newview/rlvhandler.cpp
@@ -0,0 +1,2592 @@
+#include "llviewerprecompiledheaders.h"
+#include "llagent.h"
+#include "lldrawpoolalpha.h"
+#include "llfirstuse.h"
+#include "llfloaterbeacons.h"
+#include "llfloaterchat.h"
+#include "llfloaterdaycycle.h"
+#include "llfloaterenvsettings.h"
+#include "llfloatergodtools.h"
+#include "llfloaterland.h"
+#include "llfloatermap.h"
+#include "llfloaterregioninfo.h"
+#include "llfloatertools.h"
+#include "llfloaterwater.h"
+#include "llfloaterwindlight.h"
+#include "llfloaterworldmap.h"
+#include "llgesturemgr.h"
+#include "llinventoryview.h"
+#include "llstartup.h"
+#include "llviewermenu.h"
+#include "llviewermessage.h"
+#include "llviewerparcelmgr.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
+#include "llvoavatar.h"
+#include "llworld.h"
+#include "pipeline.h"
+
+#include "rlvhelper.h"
+#include "rlvevent.h"
+#include "rlvextensions.h"
+#include "rlvhandler.h"
+
+// Only defined in llinventorybridge.cpp
+#if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
+        #include "llinventorybridge.h"
+        void confirm_replace_attachment_rez(S32 option, void* user_data);
+#endif
+// Only defined in llinventorymodel.cpp
+extern const char* NEW_CATEGORY_NAME;
+
+// ============================================================================
+// Static variable initialization
+//
+
+BOOL RlvHandler::m_fEnabled = FALSE;
+BOOL RlvHandler::fNoSetEnv = FALSE;
+BOOL RlvHandler::fLegacyNaming = FALSE;
+BOOL RlvHandler::m_fFetchStarted = FALSE;
+BOOL RlvHandler::m_fFetchComplete = FALSE;
+RlvMultiStringSearch RlvHandler::m_AttachLookup;
+
+const std::string RlvHandler::cstrSharedRoot = RLV_ROOT_FOLDER;
+
+// Keep these consistent with regular RLV
+const std::string RlvHandler::cstrBlockedRecvIM = "*** IM blocked by your viewer";
+const std::string RlvHandler::cstrBlockedSendIM = "*** IM blocked by sender's viewer";
+const std::string RlvHandler::cstrHidden = "(Hidden)";
+const std::string RlvHandler::cstrHiddenParcel = "(Hidden parcel)";
+const std::string RlvHandler::cstrHiddenRegion = "(Hidden region)";
+const std::string RlvHandler::cstrMsgRecvIM = 
+        "The Resident you messaged is prevented from reading your instant messages at the moment, please try again later.";
+const std::string RlvHandler::cstrMsgTpLure = 
+        "The Resident you invited is prevented from accepting teleport offers. Please try again later.";
+
+const std::string RlvHandler::cstrAnonyms[] =
+{
+        "A resident", "This resident", "That resident", "An individual", "This individual", "That individual", "A person",
+        "This person", "That person", "A stranger", "This stranger", "That stranger", "A human being", "This human being", 
+        "That human being", "An agent", "This agent", "That agent", "A soul", "This soul", "That soul", "Somebody", 
+        "Some people", "Someone", "Mysterious one", "An unknown being", "Unidentified one", "An unknown person"
+};
+
+rlv_handler_t gRlvHandler;
+
+// ============================================================================
+// Helper functions
+//
+
+// Checked: 2009-07-12 (RLVa-1.0.0h) | Added: RLVa-0.2.0e
+inline bool rlvIsWearingItem(const LLInventoryItem* pItem)
+{
+        return 
+                ((LLAssetType::AT_OBJECT == pItem->getType()) && (gAgent.getAvatarObject()->isWearingAttachment(pItem->getUUID()))) ||
+                ((LLAssetType::AT_GESTURE == pItem->getType()) && (gGestureManager.isGestureActive(pItem->getUUID()))) ||
+                (gAgent.isWearingItem(pItem->getUUID()));
+}
+
+// ============================================================================
+// Command specific helper functions
+//
+
+// Checked: 2009-08-04 (RLVa-1.0.1d) | Added: RLVa-1.0.1d
+static bool rlvParseNotifyOption(const std::string& strOption, S32& nChannel, std::string& strFilter)
+{
+        boost_tokenizer tokens(strOption, boost::char_separator<char>(";", "", boost::keep_empty_tokens));
+        boost_tokenizer::const_iterator itTok = tokens.begin();
+
+        // Extract and sanity check the first token (required) which is the channel
+        if ( (itTok == tokens.end()) || (!LLStringUtil::convertToS32(*itTok, nChannel)) || (!rlvIsValidReplyChannel(nChannel)) )
+                return false;
+
+        // Second token (optional) is the filter
+        strFilter.clear();
+        if (++itTok != tokens.end())
+        {
+                strFilter = *itTok;
+                ++itTok;
+        }
+
+        return (itTok == tokens.end());
+}
+
+// ============================================================================
+// Constructor/destructor
+//
+
+// Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
+RlvHandler::RlvHandler() 
+        : m_fCanCancelTp(false), m_idCurObject(LLUUID::null), m_pCurCommand(NULL), m_pGCTimer(NULL), m_pWLSnapshot(NULL), m_pBhvrNotify(NULL)
+{
+        // Array auto-initialization to 0 is non-standard? (Compiler warning in VC-8.0)
+        memset(m_LayersAdd, 0, sizeof(S16) * WT_COUNT);
+        memset(m_LayersRem, 0, sizeof(S16) * WT_COUNT);
+        memset(m_Behaviours, 0, sizeof(S16) * RLV_BHVR_COUNT);
+}
+
+// Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
+RlvHandler::~RlvHandler()
+{
+        //delete m_pGCTimer;    // <- deletes itself
+        delete m_pWLSnapshot;   // <- delete on NULL is harmless
+        delete m_pBhvrNotify;
+}
+
+// ============================================================================
+// Attachment related functions 
+//
+
+// Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0d
+inline LLViewerJointAttachment* RlvHandler::getAttachPoint(const std::string& strText, bool fExact) const
+{
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        return (pAvatar) ? get_if_there(pAvatar->mAttachmentPoints, getAttachPointIndex(strText, fExact), (LLViewerJointAttachment*)NULL)
+                         : NULL;
+}
+
+// Checked: 2009-07-29 (RLVa-1.0.1b) | Modified: RLVa-1.0.1b
+LLViewerJointAttachment* RlvHandler::getAttachPoint(const LLInventoryCategory* pFolder, bool /*fStrict*/) const
+{
+        if (!pFolder)
+                return NULL;
+
+        // RLVa-1.0.1 added support for legacy matching (See http://rlva.catznip.com/blog/2009/07/attachment-point-naming-convention/)
+        if (fLegacyNaming)
+                return getAttachPointLegacy(pFolder);
+
+        // Otherwise the only valid way to specify an attachment point in a folder name is: ^\.\(\s+attachpt\s+\)
+        std::string::size_type idxMatch;
+        std::string strAttachPt = rlvGetFirstParenthesisedText(pFolder->getName(), &idxMatch);
+        LLStringUtil::trim(strAttachPt);
+
+        return ( (1 == idxMatch) && (RLV_FOLDER_PREFIX_HIDDEN == pFolder->getName().at(0)) ) ? getAttachPoint(strAttachPt, true) : NULL;
+}
+
+// Checked: 2009-07-29 (RLVa-1.0.1b) | Modified: RLVa-1.0.1b
+LLViewerJointAttachment* RlvHandler::getAttachPoint(const LLInventoryItem* pItem, bool fStrict) const
+{
+        // Sanity check - if it's not an object then it can't have an attachment point
+        if ( (!pItem) || (LLAssetType::AT_OBJECT != pItem->getType()) )
+                return NULL;
+
+        // The attachment point should be placed at the end of the item's name, surrounded by parenthesis
+        // (if there is no such text then strAttachPt will be an empty string which is fine since it means we'll look at the item's parent)
+        std::string strAttachPt = rlvGetLastParenthesisedText(pItem->getName());
+        LLStringUtil::trim(strAttachPt);
+
+        // If the item is modify   : we look at the item's name first and only then at the containing folder
+        // If the item is no modify: we look at the containing folder's name first and only then at the item itself
+        LLViewerJointAttachment* pAttachPt;
+        if (pItem->getPermissions().allowModifyBy(gAgent.getID()))
+        {
+                pAttachPt = (!strAttachPt.empty()) ? getAttachPoint(strAttachPt, true) : NULL;
+                if (!pAttachPt)
+                        pAttachPt = getAttachPoint(gInventory.getCategory(pItem->getParentUUID()), fStrict);
+        }
+        else
+        {
+                pAttachPt = getAttachPoint(gInventory.getCategory(pItem->getParentUUID()), fStrict);
+                if ( (!pAttachPt) && (!strAttachPt.empty()) )
+                        pAttachPt = getAttachPoint(strAttachPt, true);
+        }
+        return pAttachPt;
+}
+
+// Checked: 2009-07-12 (RLVa-1.0.0h) | Added: RLVa-0.2.2a
+S32 RlvHandler::getAttachPointIndex(const LLViewerJointAttachment* pAttachPt) const
+{
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        if (pAvatar)
+        {
+                for (LLVOAvatar::attachment_map_t::const_iterator itAttach = pAvatar->mAttachmentPoints.begin(); 
+                                itAttach != pAvatar->mAttachmentPoints.end(); ++itAttach)
+                {
+                        if (itAttach->second == pAttachPt)
+                                return itAttach->first;
+                }
+        }
+        return 0;
+}
+
+// Checked: 2009-07-29 (RLVa-1.0.1b) | Added: RLVa-1.0.1b
+LLViewerJointAttachment* RlvHandler::getAttachPointLegacy(const LLInventoryCategory* pFolder) const
+{
+        // Hopefully some day this can just be deprecated (see http://rlva.catznip.com/blog/2009/07/attachment-point-naming-convention/)
+        if ( (!pFolder) || (pFolder->getName().empty()) )
+                return NULL;
+
+        // Check for a (...) block *somewhere* in the name
+        std::string::size_type idxMatch;
+        std::string strAttachPt = rlvGetFirstParenthesisedText(pFolder->getName(), &idxMatch);
+        if (!strAttachPt.empty())
+        {
+                // Could be "(attachpt)", ".(attachpt)" or "Folder name (attachpt)"
+                if ( (0 != idxMatch) && ((1 != idxMatch) || (RLV_FOLDER_PREFIX_HIDDEN == pFolder->getName().at(0)) ) && // No '(' or '.(' start
+                         (idxMatch + strAttachPt.length() + 1 != pFolder->getName().length()) )                                                         // or there's extra text
+                {
+                        // It's definitely not one of the first two so assume it's the last form (in which case we need the last paranthesised block)
+                        strAttachPt = rlvGetLastParenthesisedText(pFolder->getName());
+                }
+        }
+        else
+        {
+                // There's no paranthesised block, but it could still be "attachpt" or ".attachpt" (just strip away the '.' from the last one)
+                strAttachPt = pFolder->getName();
+                if (RLV_FOLDER_PREFIX_HIDDEN == strAttachPt[0])
+                        strAttachPt.erase(0, 1);
+        }
+        return getAttachPoint(strAttachPt, true);
+}
+
+bool RlvHandler::hasLockedHUD() const
+{
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        if (!pAvatar)
+                return false;
+        
+        LLViewerJointAttachment* pAttachPt;
+        for (rlv_detach_map_t::const_iterator itAttachPt = m_Attachments.begin(); itAttachPt != m_Attachments.end(); ++itAttachPt)
+        {
+                pAttachPt = get_if_there(pAvatar->mAttachmentPoints, (S32)itAttachPt->first, (LLViewerJointAttachment*)NULL);
+                if ( (pAttachPt) && (pAttachPt->getIsHUDAttachment()) )
+                        return true;    // At least one of our locked attachments is a HUD
+        }
+        return false;                   // None of our locked attachments is a HUD
+}
+
+bool RlvHandler::isDetachable(const LLInventoryItem* pItem) const
+{
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        return ( (pItem) && (pAvatar) ) ? isDetachable(pAvatar->getWornAttachment(pItem->getUUID())) : true;
+}
+
+// Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
+bool RlvHandler::isDetachableExcept(S32 idxAttachPt, LLViewerObject *pObj) const
+{
+        // Loop over every object that marked the specific attachment point undetachable (but ignore pObj and any of its children)
+        for (rlv_detach_map_t::const_iterator itAttach = m_Attachments.lower_bound(idxAttachPt), 
+                endAttach = m_Attachments.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
+        {
+                LLViewerObject* pTempObj = gObjectList.findObject(itAttach->second);
+                if ( (!pTempObj) || (pTempObj->getRootEdit()->getID() != pObj->getID()) )
+                        return false;
+        }
+        return true;
+}
+
+// Checked: 2009-09-06 (RLVa-1.0.2b) | Modified: RLVa-1.0.2b
+bool RlvHandler::setDetachable(S32 idxAttachPt, const LLUUID& idRlvObj, bool fDetachable)
+{
+        // Sanity check - make sure it's an object we know about
+        rlv_object_map_t::const_iterator itObj = m_Objects.find(idRlvObj);
+        if ( (itObj == m_Objects.end()) || (!idxAttachPt) )
+                return false;   // If (idxAttachPt) == 0 then: (pObj == NULL) || (pObj->isAttachment() == FALSE)
+
+        if (!fDetachable)
+        {
+                #ifdef RLV_EXPERIMENTAL_FIRSTUSE
+                        //LLFirstUse::useRlvDetach();
+                #endif // RLV_EXPERIMENTAL_FIRSTUSE
+
+                // NOTE: m_Attachments can contain duplicate <idxAttachPt, idRlvObj> pairs (ie @detach:spine=n,detach=n from an attachment on spine)
+                m_Attachments.insert(std::pair<S32, LLUUID>(idxAttachPt, itObj->second.m_UUID));
+                return true;
+        }
+        else
+        {
+                for (rlv_detach_map_t::iterator itAttach = m_Attachments.lower_bound(idxAttachPt), 
+                                endAttach = m_Attachments.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
+                {
+                        if (itObj->second.m_UUID == itAttach->second)
+                        {
+                                m_Attachments.erase(itAttach);
+                                return true;
+                        }
+                }
+        }
+        return false;   // Fall-through for (fDetachable == TRUE) - if the object wasn't undetachable then we consider it a failure
+}
+
+
+
+#ifdef RLV_EXTENSION_FLAG_NOSTRIP
+        // Checked: 2009-05-26 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+        bool RlvHandler::isStrippable(const LLUUID& idItem) const
+        {
+                // An item is exempt from @detach or @remoutfit if:
+                //   - its name contains "nostrip" (anywhere in the name)
+                //   - its parent folder contains "nostrip" (anywhere in the name)
+                if (idItem.notNull())
+                {
+                        LLViewerInventoryItem* pItem = gInventory.getItem(idItem);
+                        if (pItem)
+                        {
+                                if (std::string::npos != pItem->getName().find(RLV_FOLDER_FLAG_NOSTRIP))
+                                        return false;
+
+                                LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID());
+                                if ( (pFolder) && (std::string::npos != pFolder->getName().find(RLV_FOLDER_FLAG_NOSTRIP)) )
+                                        return false;
+                        }
+                }
+                return true;
+        }
+#endif // RLV_EXTENSION_FLAG_NOSTRIP
+
+// ============================================================================
+// Behaviour related functions
+//
+
+bool RlvHandler::hasBehaviourExcept(ERlvBehaviour eBehaviour, const std::string& strOption, const LLUUID& idObj) const
+{
+        for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
+                if ( (idObj != itObj->second.m_UUID) && (itObj->second.hasBehaviour(eBehaviour, strOption, false)) )
+                        return true;
+        return false;
+}
+
+// Checked: 2009-10-04 (RLVa-1.0.4c) | Modified: RLVa-1.0.4c
+bool RlvHandler::isException(ERlvBehaviour eBhvr, const RlvExceptionOption& varOption, ERlvExceptionCheck typeCheck) const
+{
+        // We need to "strict check" exceptions only if: the restriction is actually in place *and* (isPermissive(eBhvr) == FALSE)
+        if (RLV_CHECK_DEFAULT == typeCheck)
+                typeCheck = ( (hasBehaviour(eBhvr)) && (!isPermissive(eBhvr)) ) ? RLV_CHECK_STRICT : RLV_CHECK_PERMISSIVE;
+
+        std::list<LLUUID> objList;
+        if (RLV_CHECK_STRICT == typeCheck)
+        {
+                // If we're "strict checking" then we need the UUID of every object that currently has 'eBhvr' restricted
+                for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
+                        if (itObj->second.hasBehaviour(eBhvr, !hasBehaviour(RLV_BHVR_PERMISSIVE)))
+                                objList.push_back(itObj->first);
+        }
+
+        for (rlv_exception_map_t::const_iterator itException = m_Exceptions.lower_bound(eBhvr), 
+                        endException = m_Exceptions.upper_bound(eBhvr); itException != endException; ++itException)
+        {
+                if (itException->second.varOption == varOption)
+                {
+                        // For permissive checks we just return on the very first match
+                        if (RLV_CHECK_PERMISSIVE == typeCheck)
+                                return true;
+
+                        // For strict checks we don't return until the list is empty (every object with 'eBhvr' restricted also contains the exception)
+                        std::list<LLUUID>::iterator itList = std::find(objList.begin(), objList.end(), itException->second.idObject);
+                        if (itList != objList.end())
+                                objList.erase(itList);
+                        if (objList.empty())
+                                return true;
+                }
+        }
+        return false;
+}
+
+// ============================================================================
+// Command processing functions
+//
+
+// Checked: 2009-06-03 (RLVa-0.2.0h)
+void RlvHandler::addBehaviourObserver(RlvBehaviourObserver* pBhvrObserver)
+{
+        std::list<RlvBehaviourObserver*>::iterator itBhvrObserver = std::find(m_BhvrObservers.begin(), m_BhvrObservers.end(), pBhvrObserver);
+        if (itBhvrObserver == m_BhvrObservers.end())
+                m_BhvrObservers.push_back(pBhvrObserver);
+}
+
+// Checked: 2009-06-03 (RLVa-0.2.0h)
+void RlvHandler::removeBehaviourObserver(RlvBehaviourObserver* pBhvrObserver)
+{
+        std::list<RlvBehaviourObserver*>::iterator itBhvrObserver = std::find(m_BhvrObservers.begin(), m_BhvrObservers.end(), pBhvrObserver);
+        if (itBhvrObserver != m_BhvrObservers.end())
+                m_BhvrObservers.erase(itBhvrObserver);
+}
+
+// Checked: 2009-06-03 (RLVa-0.2.0h)
+void RlvHandler::notifyBehaviourObservers(const RlvCommand& rlvCmd, bool fInternal)
+{
+        for (std::list<RlvBehaviourObserver*>::const_iterator itBhvrObserver = m_BhvrObservers.begin();
+                itBhvrObserver != m_BhvrObservers.end(); ++itBhvrObserver)
+        {
+                (*itBhvrObserver)->changed(rlvCmd, fInternal);
+        }
+}
+
+// Checked:
+BOOL RlvHandler::processCommand(const LLUUID& uuid, const std::string& strCmd, bool fFromObj)
+{
+        #ifdef RLV_DEBUG
+                RLV_INFOS << "[" << uuid << "]: " << strCmd << LL_ENDL;
+        #endif // RLV_DEBUG
+
+        RlvCommand rlvCmd(strCmd);
+        if (!rlvCmd.isValid())
+        {
+                #ifdef RLV_DEBUG
+                        RLV_INFOS << "\t-> invalid command: " << strCmd << LL_ENDL;
+                #endif // RLV_DEBUG
+                return FALSE;
+        }
+        m_pCurCommand = &rlvCmd; m_idCurObject = uuid;
+
+        BOOL fRet = FALSE;
+        switch (rlvCmd.getParamType())
+        {
+                case RLV_TYPE_ADD:              // Checked: 2009-06-03 (RLVa-0.2.0h) | Modified: RLVa-0.2.0h
+                        {
+                                if ( (m_Behaviours[rlvCmd.getBehaviourType()]) && 
+                                         ( (RLV_BHVR_SETDEBUG == rlvCmd.getBehaviourType()) || (RLV_BHVR_SETENV == rlvCmd.getBehaviourType()) ) )
+                                {
+                                        // Some restrictions can only be held by one single object to avoid deadlocks
+                                        #ifdef RLV_DEBUG
+                                                RLV_INFOS << "\t- " << rlvCmd.getBehaviour() << " is already set by another object => discarding" << LL_ENDL;
+                                        #endif // RLV_DEBUG
+                                        break;
+                                }
+
+                                rlv_object_map_t::iterator itObj = m_Objects.find(uuid);
+                                if (itObj != m_Objects.end())
+                                {
+                                        RlvObject& rlvObj = itObj->second;
+                                        fRet = rlvObj.addCommand(rlvCmd);
+                                }
+                                else
+                                {
+                                        RlvObject rlvObj(uuid);
+                                        fRet = rlvObj.addCommand(rlvCmd);
+                                        m_Objects.insert(std::pair<LLUUID, RlvObject>(uuid, rlvObj));
+                                }
+
+                                #ifdef RLV_DEBUG
+                                        RLV_INFOS << "\t- " << ( (fRet) ? "adding behaviour" : "skipping duplicate") << LL_ENDL;
+                                #endif // RLV_DEBUG
+
+                                if (fRet) {     // If FALSE then this was a duplicate, there's no need to handle those
+                                        if (!m_pGCTimer)
+                                                m_pGCTimer = new RlvGCTimer();
+                                        processAddCommand(uuid, rlvCmd);
+                                        notifyBehaviourObservers(rlvCmd, !fFromObj);
+                                }
+                        }
+                        break;
+                case RLV_TYPE_REMOVE:           // Checked:
+                        {
+                                rlv_object_map_t::iterator itObj = m_Objects.find(uuid);
+                                if (itObj != m_Objects.end())
+                                        fRet = itObj->second.removeCommand(rlvCmd);
+
+                                #ifdef RLV_DEBUG
+                                        RLV_INFOS << "\t- " << ( (fRet) ? "removing behaviour"
+                                                                            : "skipping remove (unset behaviour or unknown object)") << LL_ENDL;
+                                #endif // RLV_DEBUG
+
+                                if (fRet) {     // Don't handle non-sensical removes
+                                        processRemoveCommand(uuid, rlvCmd);
+                                        notifyBehaviourObservers(rlvCmd, !fFromObj);
+
+                                        if (0 == itObj->second.m_Commands.size())
+                                        {
+                                                #ifdef RLV_DEBUG
+                                                        RLV_INFOS << "\t- command list empty => removing " << uuid << LL_ENDL;
+                                                #endif // RLV_DEBUG
+                                                m_Objects.erase(itObj);
+                                        }
+                                }
+                        }
+                        break;
+                case RLV_TYPE_CLEAR:
+                        fRet = processClearCommand(uuid, rlvCmd);
+                        notifyBehaviourObservers(rlvCmd, !fFromObj);
+                        break;
+                case RLV_TYPE_FORCE:            // Checked:
+                        fRet = processForceCommand(uuid, rlvCmd);
+                        break;
+                case RLV_TYPE_REPLY:            // Checked:
+                        fRet = processReplyCommand(uuid, rlvCmd);
+                        break;
+                case RLV_TYPE_UNKNOWN:          // Checked:
+                        break;
+                #ifdef LL_GNUC
+                default:
+                        break;
+                #endif // LL_GNUC
+        }
+
+        #ifdef RLV_DEBUG
+                RLV_INFOS << "\t--> command " << ((fRet) ? "succeeded" : "failed") << LL_ENDL;
+        #endif // RLV_DEBUG
+
+        m_pCurCommand = NULL; m_idCurObject.setNull();
+        return fRet;
+}
+
+BOOL RlvHandler::processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd)
+{
+        // NOTE: - at this point the command has already been added to the corresponding RlvObject instance
+        //       - the object's UUID may or may not exist in gObjectList (see handling of @detach=n)
+
+        ERlvBehaviour eBehaviour = rlvCmd.getBehaviourType();
+        const std::string& strOption = rlvCmd.getOption();
+
+        if ( (RLV_BHVR_UNKNOWN != eBehaviour) && (strOption.empty()) )
+        {
+                if (rlvCmd.isStrict())
+                        addException(uuid, RLV_BHVR_PERMISSIVE, eBehaviour);
+                m_Behaviours[eBehaviour]++;
+        }
+
+        switch (eBehaviour)
+        {
+                case RLV_BHVR_DETACH:                           // @detach[:<option>]=n         - Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
+                        {
+                                LLViewerObject* pObj = NULL; S32 idxAttachPt = 0;
+                                if (strOption.empty())                                                                                                  // @detach=n
+                                {
+                                        // If the object rezzed before we received @detach=n from it then we can just do our thing here
+                                        // If the object hasn't rezzed yet then we need to wait until RlvHandler::onAttach()
+                                        // If @detach=n were possible for non-attachments another copy/paste would be needed in RlvHandler::onGC()
+                                        if ((pObj = gObjectList.findObject(uuid)) != NULL)
+                                                setDetachable(pObj, uuid, false);
+                                } 
+                                else if ((idxAttachPt = getAttachPointIndex(strOption, true)) != 0)             // @detach:<attachpt>=n
+                                {
+                                        setDetachable(idxAttachPt, uuid, false);
+
+                                        // (See below)
+                                        LLViewerJointAttachment* pAttachPt = getAttachPoint(strOption, true);
+                                        if (pAttachPt)
+                                                pObj = pAttachPt->getObject();
+                                }
+
+                                // When at least one HUD attachment is locked we want to make sure they're all visible (ie prevent hiding a blindfold HUD)
+                                // However, since @detach:<attachpt>=n might lock a HUD attachment point that doesn't currently have an object we
+                                // have to do this here *and* in RlvHandler::onAttach()
+                                if ( (pObj) && (pObj->isHUDAttachment()) )
+                                        LLPipeline::sShowHUDAttachments = TRUE;
+                        }
+                        break;
+                case RLV_BHVR_REDIRCHAT:                        // @redirchat:<option>=n        - Checked: 2009-07-07 (RLVa-1.0.0d)
+                case RLV_BHVR_REDIREMOTE:                       // @rediremote:<option>=n       - Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.2a
+                        {
+                                if (!strOption.empty())
+                                        m_Behaviours[eBehaviour]++;     // @redirchat and @rediremote don't have an optionless version so keep track of it here
+                                else
+                                        m_Behaviours[eBehaviour]--;     // @redirchat=n and @rediremote=n are undefined, don't keep track of them
+                        }
+                        break;
+                case RLV_BHVR_SHOWWORLDMAP:                     // @showworldmap=n                      - Checked: 2009-07-05 (RLVa-1.0.0c)
+                        {
+                                // Simulate clicking the Map button [see LLToolBar::onClickMap()]
+                                if (gFloaterWorldMap->getVisible())
+                                        LLFloaterWorldMap::toggle(NULL);
+                        }
+                        break;
+                case RLV_BHVR_SHOWMINIMAP:                      // @showminimap=n                       - Checked: 2009-07-05 (RLVa-1.0.0c)
+                        {
+                                // Simulate clicking the Minimap button [see LLToolBar::onClickRadar()]
+                                if (LLFloaterMap::instanceVisible())
+                                                LLFloaterMap::hideInstance();
+                        }
+                        break;
+                #ifdef RLV_EXTENSION_STARTLOCATION
+                case RLV_BHVR_TPLOC:                            // @tploc=n                                     - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
+                case RLV_BHVR_UNSIT:                            // @unsit=n                                     - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
+                        {
+                                if (strOption.empty())
+                                        RlvSettings::updateLoginLastLocation();
+                        }
+                        break;
+                #endif // RLV_EXTENSION_STARTLOCATION
+                case RLV_BHVR_EDIT:                                     // @edit=n                                      - Checked: 2009-07-04 (RLVa-1.0.0b)
+                        {
+                                // Turn off "View / Highlight Transparent"
+                                LLDrawPoolAlpha::sShowDebugAlpha = FALSE;
+
+                                // Close the Beacons floater if it's open
+                                if (LLFloaterBeacons::instanceVisible())
+                                        LLFloaterBeacons::toggleInstance();
+
+                                // Get rid of the build floater if it's open [copy/paste from toggle_build_mode()]
+                                if (gFloaterTools->getVisible())
+                                {
+                                        gAgent.resetView(FALSE);
+                                        gFloaterTools->close();
+                                        gViewerWindow->showCursor();
+                                }
+                        }
+                        break;
+                case RLV_BHVR_ADDOUTFIT:                        // @addoutfit[:<layer>]=n       - Checked: 2009-07-07 (RLVa-1.0.0d)
+                case RLV_BHVR_REMOUTFIT:                        // @remoutfit[:<layer>]=n       - Checked: 2009-07-07 (RLVa-1.0.0d)
+                        {
+                                S16* pLayers = (eBehaviour == RLV_BHVR_ADDOUTFIT) ? m_LayersAdd : m_LayersRem;
+
+                                if (strOption.empty())
+                                {
+                                        for (int idx = 0; idx < WT_COUNT; idx++)
+                                                pLayers[idx]++;
+                                }
+                                else
+                                {
+                                        EWearableType type = LLWearable::typeNameToType(strOption);
+                                        if (WT_INVALID != type)
+                                        {
+                                                pLayers[type]++;
+                                                m_Behaviours[eBehaviour]++;
+                                        }
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SHOWINV:                          // @showinv=n                           - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-1.0.0g
+                        {
+                                // Close all open inventory windows
+                                LLInventoryView::closeAll();
+                        }
+                        break;
+                case RLV_BHVR_SHOWLOC:                          // @showloc=n                           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                        {
+                                // If we're the first @showloc=n restriction refresh all object text so we can filter it if necessary
+                                if (1 == m_Behaviours[RLV_BHVR_SHOWLOC])
+                                        LLHUDText::refreshAllObjectText();
+
+                                // Close the "About Land" floater if it's currently visible
+                                if (LLFloaterLand::instanceVisible())
+                                        LLFloaterLand::hideInstance();
+
+                                // Close the "Estate Tools" floater is it's currently visible
+                                if (LLFloaterRegionInfo::instanceVisible())
+                                        LLFloaterRegionInfo::hideInstance();
+
+                                // NOTE: we should close the "God Tools" floater as well, but since calling LLFloaterGodTools::instance() always
+                                //       creates a new instance of the floater and since it's very unlikely to be open it's just better not to
+                        }
+                        break;
+                case RLV_BHVR_SHOWNAMES:                        // @shownames=n                         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                        {
+                                // If we're the first @shownames=n restriction refresh all object text so we can filter it if necessary
+                                if (1 == m_Behaviours[RLV_BHVR_SHOWNAMES])
+                                        LLHUDText::refreshAllObjectText();
+
+                                // Close the "Active Speakers" panel if it's currently visible
+                                LLFloaterChat::getInstance()->childSetVisible("active_speakers_panel", false);
+                        }
+                        break;
+                case RLV_BHVR_FARTOUCH:
+                        {
+                                #ifdef RLV_EXPERIMENTAL_FIRSTUSE
+                                        //LLFirstUse::useRlvFartouch();
+                                #endif // RLV_EXPERIMENTAL_FIRSTUSE
+                        }
+                        break;
+                case RLV_BHVR_FLY:                                      // @fly=n                                       - Checked: 2009-07-05 (RLVa-1.0.0c)
+                        {
+                                // If currently flying, simulate clicking the Fly button [see LLToolBar::onClickFly()]
+                                if (gAgent.getFlying())
+                                        gAgent.toggleFlying();
+                        }
+                        break;
+                case RLV_BHVR_SETENV:                           // @setenv=n                            - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0a
+                        {
+                                if (!fNoSetEnv)
+                                {
+                                        // Only close the floaters if their instance exists and they're actually visible
+                                        if ( (LLFloaterEnvSettings::isOpen()) && (LLFloaterEnvSettings::instance()->getVisible()) )
+                                                LLFloaterEnvSettings::instance()->close();
+                                        if ( (LLFloaterWindLight::isOpen()) && (LLFloaterWindLight::instance()->getVisible()) )
+                                                LLFloaterWindLight::instance()->close();
+                                        if ( (LLFloaterWater::isOpen()) && (LLFloaterWater::instance()->getVisible()) )
+                                                LLFloaterWater::instance()->close();
+                                        if ( (LLFloaterDayCycle::isOpen()) && (LLFloaterDayCycle::instance()->getVisible()) )
+                                                LLFloaterDayCycle::instance()->close();
+
+                                        // Save the current WindLight params so we can restore them on @setenv=y
+                                        if (m_pWLSnapshot)
+                                        {
+                                                RLV_ERRS << "m_pWLSnapshot != NULL" << LL_ENDL; // Safety net in case we set @setenv=n for more than 1 object
+                                                delete m_pWLSnapshot;
+                                        }
+                                        m_pWLSnapshot = RlvWLSnapshot::takeSnapshot();
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SHOWHOVERTEXTALL:         // @showhovertextal=n           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_SHOWHOVERTEXTWORLD:       // @showhovertextworld=n        - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_SHOWHOVERTEXTHUD:         // @showhovertexthud=n          - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                        {
+                                // Refresh all hover text (LLHUDText::setStringUTF8() will decide what needs clearing and what doesn't)
+                                LLHUDText::refreshAllObjectText();
+                        }
+                        break;
+                case RLV_BHVR_SHOWHOVERTEXT:            // @showhovertext:<uuid>=n      - Checked: 2009-07-09 (RLVa-0.2.2a) | Modified: RLVa-1.0.0f
+                        {
+                                LLUUID idException(strOption);
+                                if (idException.notNull())      // If there's an option it should be a valid UUID
+                                {
+                                        addException(uuid, eBehaviour, idException);
+
+                                        // Clear the object's hover text
+                                        LLViewerObject* pObj = gObjectList.findObject(idException);
+                                        if ( (pObj) && (pObj->mText.notNull()) && (!pObj->mText->getObjectText().empty()) )
+                                                pObj->mText->setStringUTF8("");
+                                }
+                        }
+                        break;
+                case RLV_BHVR_NOTIFY:                           // @notify:<option>=add         - Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
+                        {
+                                S32 nChannel; std::string strFilter;
+                                if ( (!strOption.empty()) && (rlvParseNotifyOption(strOption, nChannel, strFilter)) )
+                                {
+                                        if (!m_pBhvrNotify)
+                                                addBehaviourObserver(m_pBhvrNotify = new RlvBehaviourNotifyObserver());
+                                        m_pBhvrNotify->addNotify(uuid, nChannel, strFilter);
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SENDCHANNEL:                      // @sendchannel:<uuid>=add      - Checked: 2009-10-05 (RLVa-1.0.4a) | Modified: RLVa-1.0.4a
+                        {
+                                S32 nChannel;   // If there's an option it should be a valid (=positive and non-zero) chat channel
+                                if ( (!strOption.empty()) && (LLStringUtil::convertToS32(strOption, nChannel)) && (nChannel > 0) )
+                                        addException(uuid, eBehaviour, nChannel);
+                        }
+                        break;
+                case RLV_BHVR_RECVCHAT:                         // @recvchat:<uuid>=add         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_RECVEMOTE:                        // @recvemote:<uuid>=add        - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_RECVIM:                           // @recvim:<uuid>=add           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_SENDIM:                           // @sendim:<uuid>=add           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_TPLURE:                           // @tplure:<uuid>=add           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_ACCEPTTP:                         // @accepttp:<uuid>=add         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                        {
+                                LLUUID idException(strOption);
+                                if (idException.notNull())      // If there's an option it should be a valid UUID
+                                        addException(uuid, eBehaviour, LLUUID(strOption));
+                        }
+                        break;
+                case RLV_BHVR_UNKNOWN:
+                        {
+                                // Give our observers a chance to handle any command we don't
+                                RlvEvent rlvEvent(uuid, rlvCmd);
+                                m_Emitter.update(&RlvObserver::onAddCommand, rlvEvent);
+                        }
+                        break;
+                default:
+                        break;
+        }
+        return TRUE; // Add command success/failure is decided by RlvObject::addCommand()
+}
+
+// Checked: 2009-08-05 (RLVa-1.0.1e) | Added: RLVa-1.0.1e
+void RlvHandler::processRetainedCommands()
+{
+        for (rlv_retained_list_t::const_iterator itCmd = m_Retained.begin(); itCmd != m_Retained.end(); ++itCmd)
+        {
+                const RlvRetainedCommand& cmd = *itCmd;
+                processCommand(cmd.idObject, cmd.strCmd, true);
+        }
+        m_Retained.clear();
+}
+
+BOOL RlvHandler::processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvCmd)
+{
+        // NOTE: - the RlvObject instance still exists at this point, but the viewer might already have removed it from its object list
+        ERlvBehaviour eBehaviour = rlvCmd.getBehaviourType();
+        const std::string& strOption = rlvCmd.getOption();
+
+        if ( (RLV_BHVR_UNKNOWN != eBehaviour) && (strOption.empty()) )
+        {
+                if (rlvCmd.isStrict())
+                        removeException(uuid, RLV_BHVR_PERMISSIVE, eBehaviour);
+                m_Behaviours[eBehaviour]--;
+        }
+
+        switch (eBehaviour)
+        {
+                case RLV_BHVR_DETACH:                           // @detach[:<option>]=y         - Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
+                        {
+                                S32 idxAttachPt = 0;
+                                if (strOption.empty())                                                                                          // @detach=y
+                                {
+                                        // The object may or may not (if it got detached) still exist
+                                        rlv_object_map_t::const_iterator itObj = m_Objects.find(uuid);
+                                        if (itObj != m_Objects.end())
+                                                idxAttachPt = itObj->second.m_idxAttachPt;
+                                        if (idxAttachPt)
+                                                setDetachable(idxAttachPt, uuid, true);
+                                }
+                                else if ((idxAttachPt = getAttachPointIndex(strOption, true)))          // @detach:<attachpt>=y
+                                {
+                                        setDetachable(idxAttachPt, uuid, true);
+                                }
+                        }
+                        break;
+                case RLV_BHVR_REDIRCHAT:                        // @redirchat:<option>=y        - Checked: 2009-07-07 (RLVa-1.0.0d)
+                case RLV_BHVR_REDIREMOTE:                       // @rediremote:<option>=y       - Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.2a
+                        {
+                                if (!strOption.empty())
+                                        m_Behaviours[eBehaviour]--;     // @redirchat and @rediremote don't have an optionless version so keep track of it here
+                                else
+                                        m_Behaviours[eBehaviour]++;     // @redirchat=n and @rediremote=n are undefined, don't keep track of them
+                        }
+                        break;
+                #ifdef RLV_EXTENSION_STARTLOCATION
+                case RLV_BHVR_TPLOC:                            // @tploc=y                                     - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
+                case RLV_BHVR_UNSIT:                            // @unsit=y                                     - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
+                        {
+                                if (strOption.empty())
+                                        RlvSettings::updateLoginLastLocation();
+                        }
+                        break;
+                #endif // RLV_EXTENSION_STARTLOCATION
+                case RLV_BHVR_ADDOUTFIT:                        // @addoutfit[:<layer>]=y       - Checked: 2009-07-07 (RLVa-1.0.0d)
+                case RLV_BHVR_REMOUTFIT:                        // @remoutfit[:<layer>]=y       - Checked: 2009-07-07 (RLVa-1.0.0d)
+                        {
+                                S16* pLayers = (eBehaviour == RLV_BHVR_ADDOUTFIT) ? m_LayersAdd : m_LayersRem;
+
+                                if (strOption.empty())
+                                {
+                                        for (int idx = 0; idx < WT_COUNT; idx++)
+                                                pLayers[idx]--;
+                                }
+                                else
+                                {
+                                        EWearableType type = LLWearable::typeNameToType(strOption);
+                                        if (WT_INVALID != type)
+                                        {
+                                                pLayers[type]--;
+                                                m_Behaviours[eBehaviour]--;
+                                        }
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SETENV:                           // @setenv=y                            - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0h
+                        {
+                                if (!fNoSetEnv)
+                                {
+                                        // Restore WindLight parameters to what they were before @setenv=n was issued
+                                        RlvWLSnapshot::restoreSnapshot(m_pWLSnapshot);
+                                        delete m_pWLSnapshot;
+                                        m_pWLSnapshot = NULL;
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SHOWLOC:                          // @showloc=y                           - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+                case RLV_BHVR_SHOWNAMES:                        // @shownames=y                         - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+                case RLV_BHVR_SHOWHOVERTEXTALL:         // @showhovertextal=y           - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+                case RLV_BHVR_SHOWHOVERTEXTWORLD:       // @showhovertextworld=y        - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+                case RLV_BHVR_SHOWHOVERTEXTHUD:         // @showhovertexthud=y          - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
+                        {
+                                // If this was the last of any of the five restrictions we should refresh all hover text in case anything needs restoring
+                                if (!m_Behaviours[eBehaviour])
+                                        LLHUDText::refreshAllObjectText();
+                        }
+                        break;
+                case RLV_BHVR_SHOWHOVERTEXT:            // @showhovertext:<uuid>=y      - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                        {
+                                LLUUID idException(strOption);
+                                if (idException.notNull())      // If there's an option it should be a valid UUID
+                                {
+                                        removeException(uuid, eBehaviour, idException);
+
+                                        // Restore the object's hover text
+                                        LLViewerObject* pObj = gObjectList.findObject(idException);
+                                        if ( (pObj) && (pObj->mText.notNull()) && (!pObj->mText->getObjectText().empty()) )
+                                                pObj->mText->setStringUTF8(pObj->mText->getObjectText());
+                                }
+                        }
+                        break;
+                case RLV_BHVR_NOTIFY:                           // @notify:<option>=rem         - Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
+                        {
+                                S32 nChannel; std::string strFilter;
+                                if ( (m_pBhvrNotify) && (!strOption.empty()) && (rlvParseNotifyOption(strOption, nChannel, strFilter)) )
+                                {
+                                        m_pBhvrNotify->removeNotify(uuid, nChannel, strFilter);
+
+                                        if (!m_pBhvrNotify->hasNotify())
+                                        {
+                                                removeBehaviourObserver(m_pBhvrNotify);
+                                                delete m_pBhvrNotify;
+                                                m_pBhvrNotify = NULL;
+                                        }
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SENDCHANNEL:                      // @sendchannel:<uuid>=rem      - Checked: 2009-10-05 (RLVa-1.0.4a) | Modified: RLVa-1.0.4a
+                        {
+                                S32 nChannel;   // If there's an option it should be a valid (=positive and non-zero) chat channel
+                                if ( (!strOption.empty()) && (LLStringUtil::convertToS32(strOption, nChannel)) && (nChannel > 0) )
+                                        removeException(uuid, eBehaviour, nChannel);
+                        }
+                        break;
+                case RLV_BHVR_RECVCHAT:                         // @recvchat:<uuid>=rem         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_RECVEMOTE:                        // @recvemote:<uui>=red         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_RECVIM:                           // @recvim:<uuid>=rem           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_SENDIM:                           // @sendim:<uuid>=rem           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_TPLURE:                           // @recvim:<uuid>=rem           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                case RLV_BHVR_ACCEPTTP:                         // @accepttp:<uuid>=rem         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+                        {
+                                LLUUID idException(strOption);
+                                if (idException.notNull())      // If there's an option it should be a valid UUID
+                                        removeException(uuid, eBehaviour, LLUUID(strOption));
+                        }
+                        break;
+                case RLV_BHVR_UNKNOWN:
+                        {
+                                // Give our observers a chance to handle any command we don't
+                                RlvEvent rlvEvent(uuid, rlvCmd);
+                                m_Emitter.update(&RlvObserver::onRemoveCommand, rlvEvent);
+                        }
+                        break;
+                default:
+                        break;
+        }
+        return TRUE; // Remove commands don't fail, doesn't matter what we return here
+}
+
+BOOL RlvHandler::processClearCommand(const LLUUID& idObj, const RlvCommand& rlvCmd)
+{
+        const std::string& strFilter = rlvCmd.getParam(); std::string strCmdRem;
+
+        rlv_object_map_t::const_iterator itObj = m_Objects.find(idObj);
+        if (itObj != m_Objects.end())   // No sense in clearing if we don't have any commands for this object
+        {
+                const RlvObject& rlvObj = itObj->second; bool fContinue = true;
+                for (rlv_command_list_t::const_iterator itCmd = rlvObj.m_Commands.begin(), itCurCmd;
+                                ((fContinue) && (itCmd != rlvObj.m_Commands.end())); )
+                {
+                        itCurCmd = itCmd++;             // Point itCmd ahead so it won't get invalidated if/when we erase a command
+
+                        const RlvCommand& rlvCmdRem = *itCurCmd; strCmdRem = rlvCmdRem.asString();
+                        if ( (strFilter.empty()) || (std::string::npos != strCmdRem.find(strFilter)) )
+                        {
+                                fContinue = (rlvObj.m_Commands.size() > 1); // rlvObj will become invalid once we remove the last command
+                                processCommand(idObj, strCmdRem.append("=y"), false);
+                        }
+                }
+        }
+
+        // Let our observers know about clear commands
+        RlvEvent rlvEvent(idObj, rlvCmd);
+        m_Emitter.update(&RlvObserver::onClearCommand, rlvEvent);
+
+        return TRUE; // Don't fail clear commands even if the object didn't exist since it confuses people
+}
+
+BOOL RlvHandler::processForceCommand(const LLUUID& idObj, const RlvCommand& rlvCmd) const
+{
+        const std::string& strOption = rlvCmd.getOption();
+        BOOL fHandled = TRUE;
+
+        switch (rlvCmd.getBehaviourType())
+        {
+                case RLV_BHVR_DETACH:           // @detach[:<option>]=force             - Checked:
+                        onForceDetach(idObj, strOption);
+                        break;
+                case RLV_BHVR_REMOUTFIT:        // @remoutfit:<option>=force    - Checked:
+                        onForceRemOutfit(idObj, strOption);
+                        break;
+                case RLV_BHVR_UNSIT:            // @unsit=force                                 - Checked: 2009-06-02 (RLVa-0.2.0g)
+                        {
+                                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                                if ( (pAvatar) && (pAvatar->mIsSitting) && (!hasBehaviourExcept(RLV_BHVR_UNSIT, idObj)) )
+                                {
+                                        // See behaviour notes on why we have to force an agent update here
+                                        gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+                                        send_agent_update(TRUE, TRUE);
+                                }
+                        }
+                        break;
+                case RLV_BHVR_TPTO:                     // @tpto:<option>=force                 - Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-1.0.0h
+                        {
+                                fHandled = FALSE;
+                                if ( (!strOption.empty()) && (-1 == strOption.find_first_not_of("0123456789/.")) )
+                                {
+                                        LLVector3d posGlobal;
+
+                                        boost_tokenizer tokens(strOption, boost::char_separator<char>("/", "", boost::keep_empty_tokens)); int idx = 0;
+                                        for (boost_tokenizer::const_iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
+                                        {
+                                                if (idx < 3)
+                                                        LLStringUtil::convertToF64(*itToken, posGlobal[idx++]);
+                                        }
+
+                                        if (idx == 3)
+                                        {
+                                                gAgent.teleportViaLocation(posGlobal);
+                                                fHandled = TRUE;
+                                        }
+                                } 
+                        }
+                        break;
+                case RLV_BHVR_SIT:                      // @sit:<option>=force                  - Checked: 2009-06-02 (RLVa-0.2.0g)
+                        fHandled = onForceSit(idObj, rlvCmd.getOption());
+                        break;
+                case RLV_BHVR_ADDOUTFIT:        // @addoutfit:<option>=force <- synonym of @attach:<option>=force
+                case RLV_BHVR_ATTACH:           // @attach:<option>=force               - Checked:
+                        onForceWear(rlvCmd.getOption(), true, false);   // Force attach single folder
+                        break;
+                case RLV_BHVR_ATTACHALL:        // @attachall:<option>=force    - Checked:
+                        onForceWear(rlvCmd.getOption(), true, true);    // Force attach nested folders
+                        break;
+                case RLV_BHVR_DETACHALL:        // @detachall:<option>=force    - Checked:
+                        onForceWear(rlvCmd.getOption(), false, true);   // Force detach nested folders
+                        break;
+                case RLV_BHVR_ATTACHTHIS:
+                case RLV_BHVR_ATTACHALLTHIS:
+                case RLV_BHVR_DETACHTHIS:
+                case RLV_BHVR_DETACHALLTHIS:
+                        {
+                                ERlvBehaviour eBehaviour = rlvCmd.getBehaviourType();
+                                std::string strReply;
+                                if (onGetPath(idObj, strOption, strReply))
+                                {
+                                        LLStringUtil::toLower(strReply);
+                                        onForceWear(strReply, 
+                                                (RLV_BHVR_ATTACHTHIS == eBehaviour) || (RLV_BHVR_ATTACHALLTHIS == eBehaviour), 
+                                                (RLV_BHVR_ATTACHALLTHIS == eBehaviour) || (RLV_BHVR_DETACHALLTHIS == eBehaviour));
+                                }
+                        }
+                        break;
+                case RLV_BHVR_DETACHME:         // @detachme=force                              - Checked: 2009-06-07 (RLVa-0.2.1c)
+                        {
+                                // NOTE: @detachme=force could be seen as a @detach:<attachpt>=force but RLV implements it as a "detach by UUID"
+                                LLViewerObject* pObj; LLVOAvatar* pAvatar; LLViewerJointAttachment* pAttachPt;
+                                if ( ((pObj = gObjectList.findObject(idObj)) != NULL) && (pObj->isAttachment()) && 
+                                         ((pAvatar = gAgent.getAvatarObject()) != NULL) && 
+                                         ((pAttachPt = pAvatar->getTargetAttachmentPoint(pObj->getRootEdit())) != NULL) )
+                                {
+                                        handle_detach_from_avatar(pAttachPt);
+                                }
+                        }
+                        break;
+                case RLV_BHVR_UNKNOWN:
+                        {
+                                // Give our observers a chance to handle any command we don't
+                                RlvEvent rlvEvent(idObj, rlvCmd);
+                                fHandled = m_Emitter.update(&RlvObserver::onForceCommand, rlvEvent);
+                        }
+                        break;
+                default:
+                        break;
+        }
+        return fHandled; // If we handled it then it'll still be TRUE; if an observer doesn't handle it'll be FALSE
+}
+
+// Checked: 2009-07-12 (RLVa-1.0.0h)
+BOOL RlvHandler::processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const
+{
+        const std::string& strOption = rlvCmd.getOption();
+        const std::string& strChannel = rlvCmd.getParam();
+        std::string strReply;
+
+        BOOL fHandled = TRUE;
+        switch (rlvCmd.getBehaviourType())
+        {
+                case RLV_BHVR_VERSION:                  // @version=<channel>                             - Checked: 2009-07-12 (RLVa-1.0.0h)
+                        strReply = getVersionString();
+                        break;
+                case RLV_BHVR_VERSIONNUM:               // @versionnum=<channel>                          - Checked: 2009-10-04 (RLVa-1.0.4b) | Added: RLVa-1.0.4b
+                        strReply = getVersionNumString();
+                        break;
+                case RLV_BHVR_GETOUTFIT:                // @getoufit[:<layer>]=<channel>          - Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0d
+                        {
+                                // (Quirk: RLV 1.16.1 will execute @getoutfit=<channel> if <layer> is invalid, so we need to as well)
+                                EWearableType layerType = LLWearable::typeNameToType(strOption);
+
+                                const EWearableType layerTypes[] =
+                                        { 
+                                                WT_GLOVES, WT_JACKET, WT_PANTS, WT_SHIRT, WT_SHOES, WT_SKIRT, WT_SOCKS, 
+                                                WT_UNDERPANTS, WT_UNDERSHIRT, WT_SKIN, WT_EYES, WT_HAIR, WT_SHAPE
+                                        };
+
+                                #ifdef RLV_EXPERIMENTAL_COMPOSITE_FOLDING
+                                        for (int idx = 0, cnt = sizeof(layerTypes) / sizeof(EWearableType); idx < cnt; idx++)
+                                        {
+                                                if ( (WT_INVALID == layerType) || (layerTypes[idx] == layerType) )
+                                                {
+                                                        // TODO-RLVa: add support for 'fHideLockedLayers'
+                                                        bool fWorn = (gAgent.getWearable(layerTypes[idx])) && 
+                                                                                 (!isHiddenCompositeItem(gAgent.getWearableItem(layerTypes[idx]), 
+                                                                                                                                 LLWearable::typeToTypeName(layerTypes[idx])));
+                                                        strReply.push_back( (fWorn) ? '1' : '0' );
+                                                }
+                                        }
+                                #else
+                                        for (int idx = 0, cnt = sizeof(layerTypes) / sizeof(EWearableType); idx < cnt; idx++)
+                                                if ( (WT_INVALID == layerType) || (layerTypes[idx] == layerType) )
+                                                {
+                                                        // We never hide body parts, even if they're "locked" and we're hiding locked layers
+                                                        // (nor do we hide a layer if the issuing object is the only one that has this layer locked)
+                                                        bool fWorn = (gAgent.getWearable(layerTypes[idx])) && 
+                                                                ( (!RlvSettings::getHideLockedLayers()) || 
+                                                                  (LLAssetType::AT_BODYPART == LLWearable::typeToAssetType(layerTypes[idx])) ||
+                                                                  ( (isRemovableExcept(layerTypes[idx], uuid)) && 
+                                                                    (isStrippable(gAgent.getWearableItem(layerTypes[idx]))) ) );
+                                                        strReply.push_back( (fWorn) ? '1' : '0' );
+                                                        //strReply.push_back( (gAgent.getWearable(layerTypes[idx])) ? '1' : '0' );
+                                                }
+                                #endif // RLV_EXPERIMENTAL_COMPOSITE_FOLDING
+                        }
+                        break;
+                case RLV_BHVR_GETATTACH:                // @getattach[:<layer>]=<channel>         - Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0d
+                        {
+                                // If we're fetching all worn attachments then the reply should start with 0
+                                if (strOption.empty())
+                                        strReply.push_back('0');
+
+                                LLVOAvatar* pAvatar = gAgent.getAvatarObject(); std::string strAttachName;
+                                for (LLVOAvatar::attachment_map_t::const_iterator itAttach = pAvatar->mAttachmentPoints.begin(); 
+                                         itAttach != pAvatar->mAttachmentPoints.end(); ++itAttach)
+                                {
+                                        LLViewerJointAttachment* pAttachment = itAttach->second;
+                                        if (!pAttachment)
+                                                continue;
+
+                                        strAttachName = pAttachment->getName(); // Capitalized (see avatar_lad.xml)
+                                        LLStringUtil::toLower(strAttachName);
+
+                                        #ifdef RLV_EXPERIMENTAL_COMPOSITE_FOLDING
+                                                if ( (strOption.empty()) || (strOption == strAttachName) )
+                                                {
+                                                        // TODO-RLVa: add support for 'fHideLockedAttach'
+                                                        bool fWorn = (pAttachment->getItemID().notNull()) && 
+                                                                                 (!isHiddenCompositeItem(pAttachment->getItemID(), strAttachName));
+                                                        strReply.push_back( (fWorn) ? '1' : '0' );
+                                                }
+                                        #else
+                                                if ( (strOption.empty()) || (strOption == strAttachName) )
+                                                {
+                                                        bool fWorn = (pAttachment->getItemID().notNull()) && 
+                                                                ( (!RlvSettings::getHideLockedAttach()) || 
+                                                                  ( (isDetachable(itAttach->first)) && (isStrippable(pAttachment->getItemID())) ) );
+                                                        strReply.push_back( (fWorn) ? '1' : '0' );
+                                                        //strReply.push_back( (pAttachment->getItemID().notNull()) ? '1' : '0' );
+                                                }
+                                        #endif // RLV_EXPERIMENTAL_COMPOSITE_FOLDING
+                                }
+                        }
+                        break;
+                case RLV_BHVR_GETSTATUS:                // @getstatus[:<option>]=<channel>        - Checked: 2009-07-12 (RLVa-1.0.0h)
+                        {
+                                // NOTE: specification says response should start with '/' but RLV-1.16.1 returns an empty string when no rules are set
+                                rlv_object_map_t::const_iterator itObj = m_Objects.find(uuid);
+                                if (itObj != m_Objects.end())
+                                {
+                                        std::string strObjStatus = itObj->second.getStatusString(strOption);
+                                        if (!strObjStatus.empty())
+                                        {
+                                                strReply.push_back('/');
+                                                strReply += strObjStatus;
+                                        }
+                                }
+                        }
+                        break;
+                case RLV_BHVR_GETSTATUSALL:             // @getstatusall[:<option>]=<channel> - Checked: 2009-07-12 (RLVa-1.0.0h)
+                        {
+                                // NOTE: specification says response should start with '/' but RLV-1.16.1 returns an empty string when no rules are set
+                                std::string strObjStatus;
+                                for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
+                                {
+                                        strObjStatus = itObj->second.getStatusString(strOption);
+                                        if (!strObjStatus.empty())
+                                        {
+                                                strReply.push_back('/');
+                                                strReply += strObjStatus;
+                                        }
+                                }
+                        }
+                        break;
+                case RLV_BHVR_GETINV:                   // @getinv[:<path>]=<channel>             - Checked: 2009-07-28 (RLVa-1.0.1b) | Modified: RLVa-1.0.1b
+                        {
+                                LLViewerInventoryCategory* pFolder = getSharedFolder(strOption);
+                                if (pFolder)
+                                {
+                                        LLInventoryModel::cat_array_t*  pFolders;
+                                        LLInventoryModel::item_array_t* pItems;
+                                        gInventory.getDirectDescendentsOf(pFolder->getUUID(), pFolders, pItems);
+
+                                        if (pFolders)
+                                        {
+                                                for (S32 idxFolder = 0, cntFolder = pFolders->count(); idxFolder < cntFolder; idxFolder++)
+                                                {
+                                                        const std::string& strFolder = pFolders->get(idxFolder)->getName();
+                                                        if ( (!strFolder.empty()) && (RLV_FOLDER_PREFIX_HIDDEN != strFolder[0]) &&
+                                                                 (!isFoldedFolder(pFolders->get(idxFolder).get(), true)) )
+                                                        {
+                                                                if (!strReply.empty())
+                                                                        strReply.push_back(',');
+                                                                strReply += strFolder;
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+                        break;
+                case RLV_BHVR_GETINVWORN:               // @getinvworn[:path]=<channel>           - Checked:
+                        onGetInvWorn(rlvCmd.getOption(), strReply);
+                        break;
+                case RLV_BHVR_FINDFOLDER:               // @findfolder:<criteria>=<channel>   - Checked: 2009-08-26 (RLVa-1.0.2a) | Modified: RLVa-1.0.2a
+                        {
+                                // COMPAT-RLV: RLV 1.16.1 returns the first random folder it finds (probably tries to match "" to a folder name?)
+                                //             (just going to stick with what's there for now... no option => no folder)
+                                LLInventoryModel::cat_array_t folders;
+                                if ( (!strOption.empty()) && (findSharedFolders(strOption, folders)) )
+                                {
+                                        // We need to return an "in depth" result so whoever has the most '/' is our lucky winner
+                                        // (maxSlashes needs to be initialized to -1 since children of the #RLV folder won't have '/' in their shared path)
+                                        int maxSlashes = -1, curSlashes; std::string strFolderName;
+                                        for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++)
+                                        {
+                                                strFolderName = getSharedPath(folders.get(idxFolder));
+
+                                                curSlashes = std::count(strFolderName.begin(), strFolderName.end(), '/');
+                                                if (curSlashes > maxSlashes)
+                                                {
+                                                        maxSlashes = curSlashes;
+                                                        strReply = strFolderName;
+                                                }
+                                        }
+                                }
+                        }
+                        break;
+                #ifdef RLV_EXTENSION_CMD_FINDFOLDERS
+                        case RLV_BHVR_FINDFOLDERS:      // @findfolders:<criteria>=<channel>  - Checked: 2009-07-12 (RLVa-1.0.0h) | Added: RLVa-0.2.0b
+                                {
+                                        LLInventoryModel::cat_array_t folders;
+                                        if ( (!strOption.empty()) && (findSharedFolders(strOption, folders)) )
+                                        {
+                                                for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++)
+                                                {
+                                                        if (!strReply.empty())
+                                                                strReply.push_back(',');
+                                                        strReply += getSharedPath(folders.get(idxFolder));
+                                                }
+                                        }
+                                }
+                                break;
+                #endif // RLV_EXTENSION_CMD_FINDFOLDERS
+                case RLV_BHVR_GETPATH:                  // @getpath[:<option>]=<channel>          - Checked: 2009-07-12 (RLVa-1.0.0h)
+                        onGetPath(uuid, rlvCmd.getOption(), strReply);
+                        break;
+                case RLV_BHVR_GETSITID:                 // @getsitid=<channel>                            - Checked: 2009-07-12 (RLVa-1.0.0h)
+                        {
+                                // (Quirk: RLV 1.16.1 returns a NULL uuid if we're not sitting)
+                                LLVOAvatar* pAvatarObj = gAgent.getAvatarObject(); LLUUID uuid;
+                                if ( (pAvatarObj) && (pAvatarObj->mIsSitting) )
+                                {
+                                        // LLVOAvatar inherits from 2 classes so make sure we get the right vfptr
+                                        LLViewerObject* pAvatar = dynamic_cast<LLViewerObject*>(pAvatarObj), *pParent;
+                                        // (If there is a parent, we need to upcast it from LLXform to LLViewerObject to get its UUID)
+                                        if ( (pAvatar) && ((pParent = static_cast<LLViewerObject*>(pAvatar->getRoot())) != pAvatar) )
+                                                uuid = pParent->getID();
+                                }
+                                strReply = uuid.asString();
+                        }
+                        break;
+                case RLV_BHVR_UNKNOWN:
+                        {
+                                // Give our observers a chance to handle any command we don't
+                                RlvEvent rlvEvent(uuid, rlvCmd);
+                                return m_Emitter.update(&RlvObserver::onReplyCommand, rlvEvent);
+                        }
+                        break;
+                default:
+                        break;
+        }
+
+        if (fHandled)
+                rlvSendChatReply(strChannel, strReply);
+        return fHandled;
+}
+
+// ============================================================================
+// House keeping (see debug notes for test methodology, test script and last run)
+//
+
+void RlvHandler::initLookupTables()
+{
+        static bool fInitialized = false;
+        if (!fInitialized)
+        {
+                // Initialize the attachment name lookup table
+                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                if (pAvatar)
+                {
+                        std::string strAttachPtName;
+                        for (LLVOAvatar::attachment_map_t::const_iterator itAttach = pAvatar->mAttachmentPoints.begin(); 
+                                         itAttach != pAvatar->mAttachmentPoints.end(); ++itAttach)
+                        {
+                                LLViewerJointAttachment* pAttachPt = itAttach->second;
+                                if (pAttachPt)
+                                {
+                                        strAttachPtName = pAttachPt->getName();
+                                        LLStringUtil::toLower(strAttachPtName);
+                                        m_AttachLookup.addKeyword(strAttachPtName, itAttach->first);
+                                }
+                        }
+                        fInitialized = true;
+                }
+        }
+}
+
+// Checked: 2009-08-11 (RLVa-1.0.1h) | Modified: RLVa-1.0.1h
+void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt, bool fFullyLoaded)
+{
+        // Sanity check - LLVOAvatar::attachObject() should call us *after* calling LLViewerJointAttachment::addObject()
+        LLViewerObject* pObj = pAttachPt->getObject();
+        S32 idxAttachPt = getAttachPointIndex(pObj);     // getAttachPointIndex() has a NULL pointer check so this is safe
+        if ( (!pObj) || (!idxAttachPt) )
+        {
+                RLV_ERRS << "pAttachPt->getObject() == NULL" << LL_ENDL;
+                return;
+        }
+
+        // Check if this attachment point has a pending "reattach-on-detach"
+        rlv_reattach_map_t::iterator itReattach = m_AttachPending.find(idxAttachPt);
+        if (itReattach != m_AttachPending.end())
+        {
+                if (itReattach->second == pAttachPt->getItemID())
+                {
+                        RLV_INFOS << "Reattached " << pAttachPt->getItemID().asString() << " to " << idxAttachPt << LL_ENDL;
+                        m_AttachPending.erase(itReattach);
+                }
+        }
+        else if ( (fFullyLoaded) && (!isDetachableExcept(idxAttachPt, pObj)) )
+        {
+                // We're fully loaded with no pending reattach on this attach point but it's "undetachable" -> force detach the new attachment
+
+                // Assertion: the only way the attachment point could be locked at this point is if some object locked it with @detach:attachpt=n
+                //   - previous attachments on this attachment point might have issued @detach=n but those were all cleaned up at detach
+                //   - the new attachment might have issued @detach=n but that won't actually lock down the attachment point until further down
+                // NOTE 1: "some object" may no longer exist if it was not an attachment and the GC hasn't cleaned it up yet (informative)
+                // NOTE 2: "some object" may refer to the new attachment - ie @detach:spine=n from object on spine (problematic, causes reattach)
+                //           -> solved by using isDetachableExcept(idxAttachPt, pObj) instead of isDetachable(idxAttachPt)
+
+                m_DetachPending.insert(std::pair<S32, LLUUID>(idxAttachPt, pObj->getID()));
+                rlvForceDetach(pAttachPt);
+        }
+
+        // Check if we already have an RlvObject instance for this object (rezzed prim attached from in-world, or an attachment that rezzed in)
+        rlv_object_map_t::iterator itObj = m_Objects.find(pObj->getID());
+        if (itObj != m_Objects.end())
+        {
+                // Save the attachment point index
+                itObj->second.m_idxAttachPt = idxAttachPt;
+
+                // If it's an attachment we processed commands for but that only just rezzed in we need to mark it as existing in gObjectList
+                if (!itObj->second.m_fLookup)
+                        itObj->second.m_fLookup = true;
+
+                // In both cases we should check for "@detach=n" and actually lock down the attachment point it got attached to
+                if (itObj->second.hasBehaviour(RLV_BHVR_DETACH, false))
+                {
+                        // (Copy/paste from processAddCommand)
+                        setDetachable(idxAttachPt, pObj->getID(), false);
+
+                        if (pObj->isHUDAttachment())
+                                LLPipeline::sShowHUDAttachments = TRUE; // Prevents hiding of locked HUD attachments
+                }
+        }
+
+        // Fetch the inventory item if we don't currently have it since we might need it for reattach-on-detach
+        const LLUUID& idItem = pAttachPt->getItemID();
+        LLViewerInventoryItem* pItem = ( (idItem.notNull()) && (gInventory.isInventoryUsable()) ) ? gInventory.getItem(idItem) : NULL;
+        if ( (STATE_STARTED == LLStartUp::getStartupState()) && (pItem != NULL) )
+        {
+                RlvCurrentlyWorn f;
+                f.fetchItem(idItem);
+        }
+
+        // If what we're wearing is located under the shared root then append the attachment point name (if needed)
+        LLViewerInventoryCategory* pRlvRoot = getSharedRoot();
+        if ( (STATE_STARTED == LLStartUp::getStartupState()) && (pRlvRoot) && (pItem) && (pItem->isComplete()) &&
+                 (gInventory.isObjectDescendentOf(idItem, pRlvRoot->getUUID())) )
+        {
+                std::string strAttachPt = pAttachPt->getName();
+                LLStringUtil::toLower(strAttachPt);
+
+                // If we can modify the item then it should contain the attach point name itself, otherwise its parent should
+                if (pItem->getPermissions().allowModifyBy(gAgent.getID()))
+                {
+                        if (!getAttachPoint(pItem, true))
+                        {
+                                // It doesn't specify an attach point and we can rename it [see LLItemBridge::renameItem()]
+                                std::string strName = pItem->getName();
+                                LLStringUtil::truncate(strName, DB_INV_ITEM_NAME_STR_LEN - strAttachPt.length() - 3);
+
+                                strName += " (" + strAttachPt + ")";
+
+                                pItem->rename(strName);
+                                pItem->updateServer(FALSE);
+                                gInventory.updateItem(pItem);
+                                //gInventory.notifyObservers(); <- done further down in LLVOAvatar::attachObject()
+                        }
+                }
+                else
+                {
+                        // Folder can't be the shared root, or be its direct descendant (= nested at least 2 levels deep)
+                        LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID());
+                        if ( (pFolder) && 
+                                 (pFolder->getUUID() != pRlvRoot->getUUID()) && (pFolder->getParentUUID() != pRlvRoot->getUUID()) && 
+                                 (!getAttachPoint(pFolder, true)) )
+                        {
+                                // It's no mod and its parent folder doesn't contain an attach point
+                                if ( (1 == rlvGetDirectDescendentsCount(pFolder, LLAssetType::AT_OBJECT)) && (NEW_CATEGORY_NAME == pFolder->getName()) )
+                                {
+                                        // Only rename if there's exactly 1 object/attachment inside of it [see LLFolderBridge::renameItem()]
+                                        std::string strName = ".(" + strAttachPt + ")";
+
+                                        pFolder->rename(strName);
+                                        pFolder->updateServer(FALSE);
+                                        gInventory.updateCategory(pFolder);
+                                        //gInventory.notifyObservers(); <- done further down in LLVOAvatar::attachObject()
+                                }
+                        }
+                }
+        }
+}
+
+// Checked: 2009-05-31 (RLVa-0.2.0e) | Modified: RLVa-0.2.0e
+void RlvHandler::onDetach(LLViewerJointAttachment* pAttachPt)
+{
+        LLViewerObject* pObj = pAttachPt->getObject();
+        if (!pObj)
+        {
+                // LLVOAvatar::detachObject() should call us *before* calling LLViewerJointAttachment::removeObject()
+                RLV_ERRS << "pAttachPt->getObject() == NULL" << LL_ENDL;
+                return;
+        }
+        S32 idxAttachPt = getAttachPointIndex(pObj);
+        if (0 == idxAttachPt)
+        {
+                // If we ended up here then the user "Drop"'ed this attachment (which we can't recover from)
+                return;
+        }
+
+        #ifdef RLV_DEBUG
+                // TODO-RLV: when we're exiting (for whatever reason) app state won't always reflect it but 
+                //           gAgent.getAvatarObject()->mAttachmentPoints will be NULL so anywhere we use
+                //                       "get_if_there" will call through a NULL pointer. One case is "idling out" -> test the rest
+                //LLViewerJointAttachment* pDbgAttachmentPt = 
+                //      get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, (S32)idxAttachPt, (LLViewerJointAttachment*)NULL);
+                //RLV_INFOS << "Clean up for '" << pDbgAttachmentPt->getName() << "'" << LL_ENDL;
+        #endif // RLV_DEBUG
+
+        // If the attachment was locked then we should reattach it (unless we're already trying to reattach to this attachment point)
+        // (unless we forcefully detached it else in which case we do not want to reattach it)
+        rlv_reattach_map_t::iterator itDetach = m_DetachPending.find(idxAttachPt);
+        if (itDetach != m_DetachPending.end())
+        {
+                // RLVa-TODO: we should really be comparing item UUIDs but is it even possible to end up here and not have them match?
+                m_DetachPending.erase(itDetach);
+        }
+        else if ( (!isDetachable(idxAttachPt)) && (m_AttachPending.find(idxAttachPt) == m_AttachPending.end()) )
+        {
+                // In an ideal world we would simply set up an LLInventoryObserver but there's no specific "asset updated" changed flag *sighs*
+                // NOTE: attachments *always* know their "inventory item UUID" so we don't have to worry about fetched vs unfetched inventory
+                m_AttachPending.insert(std::pair<S32, LLUUID>(idxAttachPt, pAttachPt->getItemID()));
+        }
+
+        // We can't - easily - clean up child prims that never issued @detach=n but the GC will get those eventually
+        rlv_detach_map_t::iterator itAttach = m_Attachments.find(idxAttachPt);
+        while ( (itAttach != m_Attachments.upper_bound(idxAttachPt)) && (itAttach != m_Attachments.end()) )
+        {
+                LLViewerObject* pTempObj = gObjectList.findObject(itAttach->second);
+                if ( (pTempObj) && (pTempObj->getRootEdit()->getID() == pObj->getID()) )
+                {
+                        // Iterator points to the object (or to a child prim) so issue a clear on behalf of the object (there's the 
+                        // possibility of going into an eternal loop, but that's ok since it indicates a bug in @clear that needs fixing)
+                        processCommand(itAttach->second, "clear", true);
+
+                        itAttach = m_Attachments.find(idxAttachPt); // @clear will invalidate all iterators so we have to start anew
+                }
+                else
+                {
+                        itAttach++;
+                }
+        }
+
+        // Clean up in case there was never a @detach=n (only works for the root prim - see above)
+        rlv_object_map_t::iterator itObj = m_Objects.find(pObj->getID());
+        if (itObj != m_Objects.end())
+                processCommand(itObj->second.m_UUID, "clear", true);
+}
+
+// Checked: 2009-07-30 (RLVa-1.0.1c) | Modified: RLVa-1.0.1c
+bool RlvHandler::onGC()
+{
+        // We can't issue @clear on an object while we're in the loop below since that would invalidate our iterator
+        // (and starting over would mean that some objects might get their "lookup misses" counter updated more than once per GC run)
+        std::list<LLUUID> ExpiredObjects;
+
+        for (rlv_object_map_t::iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
+        {
+                LLViewerObject* pObj = gObjectList.findObject(itObj->second.m_UUID);
+                if (!pObj)
+                {
+                        // If the RlvObject once existed in the gObjectList and now doesn't then expire it right now
+                        // If the RlvObject never existed in the gObjectList and still doesn't then increase its "lookup misses" counter
+                        // but if that reaches 20 (we run every 30 seconds so that's about 10 minutes) then we'll expire it too
+                        if ( (itObj->second.m_fLookup) || (++itObj->second.m_nLookupMisses > 20) )
+                                ExpiredObjects.push_back(itObj->first);
+                }
+                else
+                {
+                        // Check if this is an RlvObject instance who's object never existed in gObjectList before (rezzed prim in-world)
+                        // (it could also be an attachment that only just rezzed in but RlvHandler::onAttach() should be handling those)
+                        if ( (!itObj->second.m_fLookup) && (!pObj->isAttachment()) )
+                                itObj->second.m_fLookup = true;
+                }
+        }
+
+        for (std::list<LLUUID>::const_iterator itExpired = ExpiredObjects.begin(); itExpired != ExpiredObjects.end(); ++itExpired)
+        {
+                #ifdef RLV_DEBUG
+                        RLV_INFOS << "Garbage collecting " << *itExpired << LL_ENDL;
+                #endif // RLV_DEBUG
+
+                processCommand(*itExpired, "clear", true);
+        }
+
+        return (0 != m_Objects.size()); // GC will kill itself if it has nothing to do
+}
+
+// Checked: 2009-08-08 (RLVa-1.0.1g) | Modified: RLVa-1.0.1g
+void RlvHandler::onSavedAssetIntoInventory(const LLUUID& idItem)
+{
+        for (rlv_reattach_map_t::iterator itAttach = m_AttachPending.begin(); itAttach != m_AttachPending.end(); ++itAttach)
+        {
+                if (idItem == itAttach->second)
+                {
+                        RLV_INFOS << "Reattaching " << idItem.asString() << " to " << itAttach->first << LL_ENDL;
+
+                        #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
+                                LLAttachmentRezAction* rez_action = new LLAttachmentRezAction;
+                                rez_action->mItemID = itAttach->second;
+                                rez_action->mAttachPt = itAttach->first;
+
+                                confirm_replace_attachment_rez(0/*YES*/, (void*)rez_action); // (Will call delete on rez_action)
+                        #else                                                                                           // Version: 1.23.4
+                                LLSD payload;
+                                payload["item_id"] = itAttach->second;
+                                payload["attachment_point"] = itAttach->first;
+
+                                LLNotifications::instance().forceResponse(LLNotification::Params("ReplaceAttachment").payload(payload), 0/*YES*/);
+                        #endif
+                }
+        }
+}
+
+// ============================================================================
+// String/chat censoring functions
+//
+
+// LL must have included an strlen for UTF8 *somewhere* but I can't seem to find it so this one is home grown
+size_t utf8str_strlen(const std::string& utf8)
+{
+        const char* pUTF8 = utf8.c_str(); size_t length = 0;
+        for (int idx = 0, cnt = utf8.length(); idx < cnt ;idx++)
+        {
+                // We're looking for characters that don't start with 10 as their high bits
+                if ((pUTF8[idx] & 0xC0) != 0x80)
+                        length++;
+        }
+        return length;
+}
+
+// TODO-RLV: works, but more testing won't hurt
+std::string utf8str_chtruncate(const std::string& utf8, size_t length)
+{
+        if (0 == length)
+                return std::string();
+        if (utf8.length() <= length)
+                return utf8;
+
+        const char* pUTF8 = utf8.c_str(); int idx = 0;
+        while ( (pUTF8[idx]) && (length > 0) )
+        {
+                // We're looking for characters that don't start with 10 as their high bits
+                if ((pUTF8[idx] & 0xC0) != 0x80)
+                        length--;
+                idx++;
+        }
+
+        return utf8.substr(0, idx);
+}
+
+// Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+void RlvHandler::filterChat(std::string& strUTF8Text, bool fFilterEmote) const
+{
+        if (strUTF8Text.empty())
+                return;
+
+        if (rlvIsEmote(strUTF8Text))                                    // Check if it's an emote
+        {
+                if (fFilterEmote)                                                       // Emote filtering depends on fFilterEmote
+                {
+                        if ( (strUTF8Text.find_first_of("\"()*=^_?~") != -1) || 
+                                 (strUTF8Text.find(" -") != -1) || (strUTF8Text.find("- ") != -1) || (strUTF8Text.find("''") != -1) )
+                        {
+                                strUTF8Text = "...";                            // Emote contains illegal character (or character sequence)
+                        }
+                        else if (!hasBehaviour(RLV_BHVR_EMOTE))
+                        {
+                                int idx = strUTF8Text.find('.');        // Truncate at 20 characters or at the dot (whichever is shorter)
+                                strUTF8Text = utf8str_chtruncate(strUTF8Text, ( (idx > 0) && (idx < 20) ) ? idx + 1 : 20);
+                        }
+                }
+        } 
+        else if (strUTF8Text[0] == '/')                                 // Not an emote, but starts with a '/'
+        {
+                if (utf8str_strlen(strUTF8Text) > 7)            // Allow as long if it's 6 characters or less
+                        strUTF8Text = "...";
+        }
+        else if ((strUTF8Text.length() < 4) || (strUTF8Text.compare(0, 2, "((")) || (strUTF8Text.compare(strUTF8Text.length() - 2, 2, "))")))
+        {
+                strUTF8Text = "...";                                            // Regular chat (not OOC)
+        }
+}
+
+// Checked: 2009-07-04 (RLVa-1.0.0a) | Modified: RLVa-1.0.0a
+void RlvHandler::filterLocation(std::string& strUTF8Text) const
+{
+        // TODO-RLVa: if either the region or parcel name is a simple word such as "a" or "the" then confusion will ensue?
+        //            -> not sure how you would go about preventing this though :|...
+
+        // Filter any mention of the surrounding region names
+        LLWorld::region_list_t regions = LLWorld::getInstance()->getRegionList();
+        for (LLWorld::region_list_t::const_iterator itRegion = regions.begin(); itRegion != regions.end(); ++itRegion)
+                rlvStringReplace(strUTF8Text, (*itRegion)->getName(), rlv_handler_t::cstrHiddenRegion);
+
+        // Filter any mention of the parcel name
+        LLViewerParcelMgr* pParcelMgr = LLViewerParcelMgr::getInstance();
+        if (pParcelMgr)
+                rlvStringReplace(strUTF8Text, pParcelMgr->getAgentParcelName(), rlv_handler_t::cstrHiddenParcel);
+}
+
+void RlvHandler::filterNames(std::string& strUTF8Text) const
+{
+        std::string strFirstName, strLastName, strName;
+
+        // TODO-RLV: make this a bit more efficient (ie people with a large draw distance will have a load of active regions)
+        //   -> the cost of multi string matching them all at once seems to be about the same as calling rlvStringReplace 
+        //      twice so that would be a tremendous gain (and we'd get first name and word matching for free)
+        #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
+                for (LLWorld::region_list_t::const_iterator itRegion = LLWorld::getInstance()->getRegionList().begin();
+                         itRegion != LLWorld::getInstance()->getRegionList().end(); ++itRegion)
+                {
+                        LLViewerRegion* pRegion = *itRegion;
+                        
+                        for (S32 idxAgent = 0, cntAgent = pRegion->mMapAvatars.count(); idxAgent < cntAgent; idxAgent++)
+                        {
+                                // LLCacheName::getName() will add the UUID to the lookup queue if we don't know it yet
+                                if (gCacheName->getName(pRegion->mMapAvatarIDs.get(idxAgent), strFirstName, strLastName))
+                                {
+                                        strName = strFirstName + " " + strLastName;
+
+                                        rlvStringReplace(strUTF8Text, strName, getAnonym(strName));
+                                }
+                        }
+                }
+        #else                                                                                           // Version: trunk
+                // TODO-RLV: should restrict this to a certain radius (probably 1-2 sim range?)
+                std::vector<LLUUID> idAgents;
+                LLWorld::getInstance()->getAvatars(&idAgents, NULL);
+
+                for (int idxAgent = 0, cntAgent = idAgents.size(); idxAgent < cntAgent; idxAgent++)
+                {
+                        // LLCacheName::getName() will add the UUID to the lookup queue if we don't know it yet
+                        if (gCacheName->getName(idAgents[idxAgent], strFirstName, strLastName))
+                        {
+                                strName = strFirstName + " " + strLastName;
+
+                                rlvStringReplace(strUTF8Text, strName, getAnonym(strName));
+                        }
+                }
+        #endif
+}
+
+const std::string& RlvHandler::getAnonym(const std::string& strName) const
+{
+        const char* pszName = strName.c_str();
+        U32 nHash = 0;
+        
+        // Test with 11,264 SL names showed a 3.33% - 3.82% occurance for each so we *should* get a very even spread
+        for (int idx = 0, cnt = strName.length(); idx < cnt; idx++)
+                nHash += pszName[idx];
+
+        return cstrAnonyms[nHash % 28];
+}
+
+// Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-0.2.2a
+bool RlvHandler::redirectChatOrEmote(const std::string& strUTF8Text) const
+{
+        // Sanity check - @redirchat only for chat and @rediremote only for emotes
+        bool fIsEmote = rlvIsEmote(strUTF8Text);
+        if ( ((!fIsEmote) && (!hasBehaviour(RLV_BHVR_REDIRCHAT))) || ((fIsEmote) && (!hasBehaviour(RLV_BHVR_REDIREMOTE))) )
+                return false;
+
+        if (!fIsEmote)
+        {
+                std::string strText = strUTF8Text;
+                filterChat(strText, true);
+                if (strText != "...")
+                        return false;   // @sendchat wouldn't filter it so @redirchat won't redirect it either
+        }
+
+        bool fSendChannel = hasBehaviour(RLV_BHVR_SENDCHANNEL); S32 nChannel = 0;
+        for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
+        {
+                for (rlv_command_list_t::const_iterator itCmd = itObj->second.m_Commands.begin(), 
+                                endCmd = itObj->second.m_Commands.end(); itCmd != endCmd; ++itCmd)
+                {
+                        if ( ( ((!fIsEmote) && (RLV_BHVR_REDIRCHAT == itCmd->getBehaviourType())) ||    // Redirect if: (not an emote and @redirchat
+                                   ((fIsEmote) && (RLV_BHVR_REDIREMOTE == itCmd->getBehaviourType())) ) &&      // OR an emote and @rediremote)
+                                 (LLStringUtil::convertToS32(itCmd->getOption(), nChannel)) &&                          // AND the channel is a number
+                                 ( (!fSendChannel) || (isException(RLV_BHVR_SENDCHANNEL, nChannel)) ) )         // AND we're allowed to send to that channel
+                        {
+                                rlvSendChatReply(nChannel, strUTF8Text);
+                        }
+                }
+        }
+        return true;
+}
+
+// ============================================================================
+// Public service functions (called by the outside world or by extension handlers)
+//
+
+BOOL RlvHandler::isAgentNearby(const LLUUID& uuid) const
+{
+        #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
+                for (LLWorld::region_list_t::const_iterator itRegion = LLWorld::getInstance()->getRegionList().begin();
+                         itRegion != LLWorld::getInstance()->getRegionList().end(); ++itRegion)
+                {
+                        LLViewerRegion* pRegion = *itRegion;
+                        
+                        for (S32 idxAgent = 0, cntAgent = pRegion->mMapAvatars.count(); idxAgent < cntAgent; idxAgent++)
+                                if (pRegion->mMapAvatarIDs.get(idxAgent) == uuid)
+                                        return TRUE;
+                }
+        #else                                                                                           // Version: trunk
+                // TODO-RLV: rewrite this to fit trunk, but still need the radius limited to a sane range
+                std::vector<LLUUID> idAgents;
+                LLWorld::getInstance()->getAvatars(&idAgents, NULL);
+
+                for (int idxAgent = 0, cntAgent = idAgents.size(); idxAgent < cntAgent; idxAgent++)
+                {
+                        if (idAgents[idxAgent] == uuid)
+                                return TRUE;
+                }
+        #endif
+        return FALSE;
+}
+
+// ============================================================================
+// General purpose inventory functions
+//
+
+// Checked: 2009-07-12 (RLVa-1.0.0h)
+class RlvSharedRootFetcher : public LLInventoryFetchDescendentsObserver
+{
+public:
+        RlvSharedRootFetcher() {}
+
+        virtual void done()
+        {
+                RLV_INFOS << "Shared folders fetch completed" << LL_ENDL;
+                RlvHandler::m_fFetchComplete = TRUE;
+
+                gInventory.removeObserver(this);
+                delete this;
+        }
+};
+
+// Checked: 2009-07-12 (RLVa-1.0.0h)
+void RlvHandler::fetchSharedInventory()
+{
+        // Sanity check - don't fetch if we're already fetching, or if we don't have a shared root
+        LLViewerInventoryCategory* pRlvRoot = getSharedRoot();
+        if ( (m_fFetchStarted) || (!pRlvRoot) )
+                return;
+
+        // Grab all the folders under the shared root
+        LLInventoryModel::cat_array_t  folders;
+        LLInventoryModel::item_array_t items;
+        gInventory.collectDescendents(pRlvRoot->getUUID(), folders, items, FALSE);
+
+        /*
+         * Add them to the "to fetch" list
+         */ 
+        LLInventoryFetchDescendentsObserver::folder_ref_t fetchFolders;
+
+        fetchFolders.push_back(pRlvRoot->getUUID());
+        for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++)
+                fetchFolders.push_back(folders.get(idxFolder)->getUUID());
+
+        /*
+         * Now fetch them all in one go
+         */
+        RlvSharedRootFetcher* fetcher = new RlvSharedRootFetcher;
+
+        RLV_INFOS << "Starting fetch of " << fetchFolders.size() << " shared folders" << LL_ENDL;
+        fetcher->fetchDescendents(fetchFolders);
+
+        if (fetcher->isEverythingComplete())
+                fetcher->done();
+        else
+                gInventory.addObserver(fetcher);
+}
+
+bool RlvHandler::findSharedFolders(const std::string& strCriteria, LLInventoryModel::cat_array_t& folders) const
+{
+        // Sanity check - can't do anything without a shared root
+        LLViewerInventoryCategory* pRlvRoot = getSharedRoot();
+        if (!pRlvRoot)
+                return false;
+
+        folders.clear();
+        LLInventoryModel::item_array_t items;
+        RlvCriteriaCategoryCollector functor(strCriteria);
+        gInventory.collectDescendentsIf(pRlvRoot->getUUID(), folders, items, FALSE, functor);
+
+        return (folders.count() != 0);
+}
+
+// Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0e
+LLViewerInventoryCategory* RlvHandler::getSharedRoot()
+{
+        if (gInventory.isInventoryUsable())
+        {
+                LLInventoryModel::cat_array_t*  pFolders;
+                LLInventoryModel::item_array_t* pItems;
+                gInventory.getDirectDescendentsOf(gAgent.getInventoryRootID(), pFolders, pItems);
+                if (pFolders)
+                {
+                        // NOTE: we might have multiple #RLV folders so we'll just go with the first one we come across
+                        LLViewerInventoryCategory* pFolder;
+                        for (S32 idxFolder = 0, cntFolder = pFolders->count(); idxFolder < cntFolder; idxFolder++)
+                        {
+                                if ( ((pFolder = pFolders->get(idxFolder)) != NULL) && (RlvHandler::cstrSharedRoot == pFolder->getName()) )
+                                        return pFolder;
+                        }
+                }
+        }
+        return NULL;
+}
+
+// Checked: 2009-07-28 (RLVa-1.0.1a) | Modified: RLVa-1.0.1a
+LLViewerInventoryCategory* RlvHandler::getSharedFolder(const LLUUID& idParent, const std::string& strFolderName) const
+{
+        LLInventoryModel::cat_array_t*  pFolders;
+        LLInventoryModel::item_array_t* pItems;
+        gInventory.getDirectDescendentsOf(idParent, pFolders, pItems);
+        if ( (!pFolders) || (strFolderName.empty()) )
+                return NULL;
+
+        // If we can't find an exact match then we'll settle for a "contains" match
+        LLViewerInventoryCategory* pPartial = NULL;
+
+        //LLStringUtil::toLower(strFolderName); <- everything was already converted to lower case before
+
+        std::string strName;
+        for (S32 idxFolder = 0, cntFolder = pFolders->count(); idxFolder < cntFolder; idxFolder++)
+        {
+                LLViewerInventoryCategory* pFolder = pFolders->get(idxFolder);
+
+                strName = pFolder->getName();
+                if (strName.empty())
+                        continue;
+                LLStringUtil::toLower(strName);
+
+                if (strFolderName == strName)
+                        return pFolder;         // Found an exact match, no need to keep on going
+                else if ( (!pPartial) && (RLV_FOLDER_PREFIX_HIDDEN != strName[0]) && (strName.find(strFolderName) != std::string::npos) )
+                        pPartial = pFolder;     // Found a partial (non-hidden) match, but we might still find an exact one (first partial match wins)
+        }
+
+        return pPartial;
+}
+
+// Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0e
+LLViewerInventoryCategory* RlvHandler::getSharedFolder(const std::string& strPath) const
+{
+        // Sanity check - no shared root => no shared folder
+        LLViewerInventoryCategory* pRlvRoot = getSharedRoot(), *pFolder = pRlvRoot;
+        if (!pRlvRoot)
+                return NULL;
+
+        // Walk the path (starting at the root)
+        boost_tokenizer tokens(strPath, boost::char_separator<char>("/", "", boost::drop_empty_tokens));
+        for (boost_tokenizer::const_iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
+        {
+                pFolder = getSharedFolder(pFolder->getUUID(), *itToken);
+                if (!pFolder)
+                        return NULL;    // No such folder
+        }
+
+        return pFolder;                 // If strPath was empty or just a bunch of //// then: pFolder == pRlvRoot
+}
+
+// Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0g
+std::string RlvHandler::getSharedPath(const LLViewerInventoryCategory* pFolder) const
+{
+        LLViewerInventoryCategory* pRlvRoot = getSharedRoot();
+        // Sanity check - no shared root or no folder => no path
+        if ( (!pRlvRoot) || (!pFolder) || (pRlvRoot->getUUID() == pFolder->getUUID()) )
+                return std::string();
+
+        const LLUUID& idRLV  = pRlvRoot->getUUID();
+        const LLUUID& idRoot = gAgent.getInventoryRootID();
+        std::string strPath;
+
+        // Walk up the tree until we reach the top
+        while (pFolder)
+        {
+                strPath = "/" + pFolder->getName() + strPath;
+
+                const LLUUID& idParent = pFolder->getParentUUID();
+                if (idRLV == idParent)                  // Reached the shared root, we're done
+                        break;
+                else if (idRoot == idParent)    // We reached the agent's inventory root (indicative of a logic error elsewhere)
+                {
+                        RLV_ERRS << "Reached agent's inventory root while building path for shared folder" << LL_ENDL;
+                        return std::string();
+                }
+                else
+                        pFolder = gInventory.getCategory(idParent);
+        }
+
+        return strPath.erase(0, 1);
+}
+
+// ============================================================================
+// Composite folders
+//
+
+#ifdef RLV_EXPERIMENTAL_COMPOSITES
+        // Checked:
+        bool RlvHandler::getCompositeInfo(const LLInventoryCategory* pFolder, std::string* pstrName) const
+        {
+                if (pFolder)
+                {
+                        // Composite folder naming: ^\.?[Folder]
+                        const std::string& cstrFolder = pFolder->getName();
+                        int idxStart = cstrFolder.find('['), idxEnd = cstrFolder.find(']', idxStart);
+                        if ( ((0 == idxStart) || (1 == idxStart)) && (idxEnd - idxStart > 1) )
+                        {
+                                if (pstrName)
+                                        pstrName->assign(cstrFolder.substr(idxStart + 1, idxEnd - idxStart - 1));
+                                return true;
+                        }
+                }
+                return false;
+        }
+
+        // Checked:
+        bool RlvHandler::getCompositeInfo(const LLUUID& idItem, std::string* pstrName, LLViewerInventoryCategory** ppFolder) const
+        {
+                LLViewerInventoryCategory* pRlvRoot; LLViewerInventoryItem* pItem;
+
+                if ( (idItem.notNull()) && ((pRlvRoot = getSharedRoot()) != NULL) && 
+                         (gInventory.isObjectDescendentOf(idItem, pRlvRoot->getUUID())) && ((pItem = gInventory.getItem(idItem)) != NULL) )
+                {
+                        // We know it's an item in a folder under the shared root...
+                        LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID());
+                        if (getAttachPoint(pFolder, true))
+                        {
+                                // ... but it could be named ".(attachpt)" in which case we need its parent
+                                pFolder = gInventory.getCategory(pFolder->getParentUUID());
+                        }
+
+                        if ( (pFolder) && (getCompositeInfo(pFolder, pstrName)) )
+                        {
+                                if (ppFolder)
+                                        *ppFolder = pFolder;
+                                return true;
+                        }
+                }
+                return false;
+        }
+#endif // RLV_EXPERIMENTAL_COMPOSITES
+
+#ifdef RLV_EXPERIMENTAL_COMPOSITE_FOLDING
+        // Checked:
+        inline bool RlvHandler::isHiddenCompositeItem(const LLUUID& idItem, const std::string& cstrItemType) const
+        {
+                // An item that's part of a composite folder will be hidden from @getoutfit and @getattach if:
+                //   (1) the composite name specifies either a wearable layer or an attachment point
+                //   (2) the specified wearable layer or attachment point is worn and resides in the folder
+                //   (3) cstrItemType isn't the specified wearable layer or attach point
+                //
+                // Example: #RLV/Separates/Shoes/ChiChi Pumps/.[shoes] with items: "Shoe Base", "Shoe (left foot)" and "Shoe (right foot)"
+                //   -> as long as "Shoe Base" is worn, @getattach should not reflect "left foot", nor "right foot"
+                std::string strComposite; LLViewerInventoryCategory* pFolder;
+                EWearableType type; S32 idxAttachPt;
+                if ( (getCompositeInfo(idItem, &strComposite, &pFolder)) && (cstrItemType != strComposite) )
+                {
+                        LLUUID idCompositeItem;
+                        if ((type = LLWearable::typeNameToType(strComposite)) != WT_INVALID)
+                        {
+                                idCompositeItem = gAgent.getWearableItem(type);
+                        }
+                        else if ((idxAttachPt = getAttachPointIndex(strComposite, true)) != 0)
+                        {
+                                LLVOAvatar* pAvatar; LLViewerJointAttachment* pAttachmentPt;
+                                if ( ((pAvatar = gAgent.getAvatarObject()) != NULL) && 
+                                         ((pAttachmentPt = get_if_there(pAvatar->mAttachmentPoints, idxAttachPt, (LLViewerJointAttachment*)NULL)) != NULL) )
+                                {
+                                        idCompositeItem = pAttachmentPt->getItemID();
+                                }
+                        }
+
+                        if ( (idCompositeItem.notNull()) && (gInventory.isObjectDescendentOf(idCompositeItem, pFolder->getUUID())) )
+                                return true;
+                }
+                return false;
+        }
+#endif // RLV_EXPERIMENTAL_COMPOSITEFOLDING
+
+#ifdef RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+        // Checked:
+        bool RlvHandler::canTakeOffComposite(const LLInventoryCategory* pFolder) const
+        {
+                if (!pFolder)           // If there's no folder then there is nothing to take off
+                        return false;
+
+                LLInventoryModel::cat_array_t  folders;
+                LLInventoryModel::item_array_t items;
+                RlvWearableItemCollector functor(pFolder->getUUID(), true, false);
+
+                // Grab a list of all the items @detachthis would be detaching/unwearing
+                gInventory.collectDescendentsIf(pFolder->getUUID(), folders, items, FALSE, functor);
+                if (!items.count())
+                        return false;   // There are no wearable items in the folder so there is nothing to take off
+
+                LLViewerInventoryItem* pItem;
+                for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++)
+                {
+                        pItem = items.get(idxItem);
+
+                        switch (pItem->getType())
+                        {
+                                case LLAssetType::AT_CLOTHING:
+                                        {
+                                                LLWearable* pWearable = gAgent.getWearableFromWearableItem(pItem->getUUID());
+                                                if ( (pWearable) && (!isRemovable(pWearable->getType())) )
+                                                        return false;   // If one clothing layer in the composite folder is unremoveable then the entire folder is
+                                        }
+                                        break;
+                                case LLAssetType::AT_OBJECT:
+                                        {
+                                                LLVOAvatar* pAvatar; LLViewerObject* pObj;
+                                                if ( ((pAvatar = gAgent.getAvatarObject()) != NULL) && 
+                                                         ((pObj = pAvatar->getWornAttachment(pItem->getUUID())) != NULL) && (!isDetachable(pObj)) )
+                                                {
+                                                        return false;   // If one attachment in the composite folder is undetachable then the entire folder is
+                                                }
+                                        }
+                                        break;
+                                #ifdef LL_GNUC
+                                default:
+                                        break;
+                                #endif // LL_GNUC
+                        }
+                }
+                return true;
+        }
+#endif // RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+
+// ============================================================================
+// Event handlers
+//
+
+// Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0d
+void RlvHandler::onForceDetach(const LLUUID& idObj, const std::string& strOption) const
+{
+        U16 nParam;
+        if (strOption.empty())
+        {
+                // Simulate right-click / Take Off > Detach All
+                LLAgent::userRemoveAllAttachments(NULL);
+        }
+        else if (m_AttachLookup.getExactMatchParam(strOption, nParam))
+        {
+                // Simulate right-click / Take Off > Detach > ...
+                LLVOAvatar* pAvatar; LLViewerJointAttachment* pAttachmentPt;
+                if ( ((pAvatar = gAgent.getAvatarObject()) != NULL) &&  // Make sure we're actually wearing something on the attachment point
+                         ((pAttachmentPt = get_if_there(pAvatar->mAttachmentPoints, (S32)nParam, (LLViewerJointAttachment*)NULL)) != NULL) &&
+                         (isStrippable(pAttachmentPt->getItemID())) )           // ... and that it's not marked as "nostrip"
+                {
+                        #ifdef RLV_EXPERIMENTAL_COMPOSITES
+                                // If we're stripping something that's part of a composite folder then we should @detachthis instead
+                                if (isCompositeDescendent(pAttachmentPt->getItemID()))
+                                {
+                                        std::string strCmd = "detachthis:" + strOption + "=force";
+                                        #ifdef RLV_DEBUG
+                                                RLV_INFOS << "\t- '" << strOption << "' belongs to composite folder: @" << strCmd << LL_ENDL;
+                                        #endif // RLV_DEBUG
+                                        processForceCommand(idObj, RlvCommand(strCmd));
+                                }
+                                else
+                        #endif // RLV_EXPERIMENTAL_COMPOSITES
+                                {
+                                        handle_detach_from_avatar(pAttachmentPt);
+                                }
+                }
+        }
+        else
+        {
+                // Force detach single folder
+                onForceWear(strOption, false, false);
+        }
+}
+
+// Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0d
+void RlvHandler::onForceRemOutfit(const LLUUID& idObj, const std::string& strOption) const
+{
+        EWearableType typeOption = LLWearable::typeNameToType(strOption), type;
+        if ( (WT_INVALID == typeOption) && (!strOption.empty()) )
+                return;
+
+        // Before we had an option and optionless branch, but with the addition of composites and nostrip there's less duplication this way
+        for (int idxType = 0; idxType < WT_COUNT; idxType++)
+        {
+                type = (EWearableType)idxType;
+                if (LLAssetType::AT_CLOTHING != LLWearable::typeToAssetType(type))
+                        continue; // Only strip clothing, not bodyparts
+
+                if ( ((typeOption == type) || (strOption.empty())) && (gAgent.getWearable(type)) && (isStrippable(gAgent.getWearableItem(type))) )
+                {
+                        #ifdef RLV_EXPERIMENTAL_COMPOSITES
+                                // If we're stripping something that's part of a composite folder then we should @detachthis instead
+                                if (isCompositeDescendent(gAgent.getWearableItem(type)))
+                                {
+                                        std::string strCmd = "detachthis:" + LLWearable::typeToTypeName(type) + "=force";
+                                        #ifdef RLV_DEBUG
+                                                RLV_INFOS << "\t- '" << LLWearable::typeToTypeName(type) << "' is composite descendent: @" << strCmd << LL_ENDL;
+                                        #endif // RLV_DEBUG
+                                        processForceCommand(idObj, RlvCommand(strCmd));
+                                }
+                                else
+                        #endif // RLV_EXPERIMENTAL_COMPOSITES
+                                {
+                                        gAgent.removeWearable(type);
+                                }
+                }
+        }
+}
+
+// Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0g
+bool RlvHandler::onForceSit(const LLUUID& idObj, const std::string& strOption) const
+{
+        LLViewerObject* pObject = NULL; LLUUID idTarget(strOption);
+        // Sanity checking - we need to know about the object and it should identify a prim/linkset
+        if ( (idTarget.isNull()) || ((pObject = gObjectList.findObject(idTarget)) == NULL) || (LL_PCODE_VOLUME != pObject->getPCode()) )
+                return false;
+
+        // Don't force sit if:
+        //   1) currently sitting and prevented from standing up
+        //   2) prevented from sitting
+        //   3) @sittp=n restricted (except if @sittp=n was issued by the same prim that's currently force sitting the avie)
+        if ( ( (hasBehaviour(RLV_BHVR_UNSIT)) && (gAgent.getAvatarObject()) && (gAgent.getAvatarObject()->mIsSitting) ) || 
+                 ( (hasBehaviour(RLV_BHVR_SIT)) ) ||
+                 ( (hasBehaviourExcept(RLV_BHVR_SITTP, idObj)) && 
+                   (dist_vec_squared(gAgent.getPositionGlobal(), pObject->getPositionGlobal()) > 1.5f * 1.5f) ))
+        {
+                return false;
+        }
+
+        // Copy/paste from handle_sit_or_stand() [see http://wiki.secondlife.com/wiki/AgentRequestSit]
+        gMessageSystem->newMessageFast(_PREHASH_AgentRequestSit);
+        gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+        gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        gMessageSystem->nextBlockFast(_PREHASH_TargetObject);
+        gMessageSystem->addUUIDFast(_PREHASH_TargetID, pObject->mID);
+        // Offset: "a rough position in local coordinates for the edge to sit on"
+        // (we might not even be looking at the object so I don't think we can supply the offset to an edge)
+        gMessageSystem->addVector3Fast(_PREHASH_Offset, LLVector3::zero);
+        pObject->getRegion()->sendReliableMessage();
+
+        return true;
+}
+
+void RlvHandler::onForceWear(const std::string& strPath, bool fAttach, bool fMatchAll) const
+{
+        // See LLWearableBridge::wearOnAvatar(): don't wear anything until initial wearables are loaded, can destroy clothing items
+        if (!gAgent.areWearablesLoaded()) 
+                return;
+
+        LLViewerInventoryCategory* pFolder = getSharedFolder(strPath);
+        if (!pFolder)   // Folder not found = nothing to attach
+                return;
+
+        LLInventoryModel::cat_array_t  folders;
+        LLInventoryModel::item_array_t items;
+        RlvWearableItemCollector functor(pFolder->getUUID(), fAttach, fMatchAll);
+
+        // Grab a list of all the items we'll be wearing/attaching
+        gInventory.collectDescendentsIf(pFolder->getUUID(), folders, items, FALSE, functor);
+
+        LLViewerInventoryItem* pItem;
+        for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++)
+        {
+                pItem = items.get(idxItem);
+
+                switch (pItem->getType())
+                {
+                        case LLAssetType::AT_CLOTHING:
+                        case LLAssetType::AT_BODYPART:
+                                {
+                                        LLWearable* pWearable = gAgent.getWearableFromWearableItem(pItem->getUUID());
+
+                                        #ifdef RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+                                                // If we're already wearing something on this layer then we have to check if it isn't part of a composite
+                                                // folder that has at least one unremovable item (in which case we can't wear or remove this item)
+                                                LLViewerInventoryCategory* pCompositeFolder;
+                                                if ( (!pWearable) || (!getCompositeInfo(pItem->getUUID(), NULL, &pCompositeFolder)) || 
+                                                         (canTakeOffComposite(pFolder)))
+                                                {
+                                        #endif // RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+                                                        if (fAttach)
+                                                        {
+                                                                // Simulate wearing a clothing item from inventory (right click / "Wear")
+                                                                // LLWearableBridge::performAction() => LLWearableBridge::wearOnAvatar() => wear_inventory_item_on_avatar()
+                                                                wear_inventory_item_on_avatar(pItem);
+                                                        }
+                                                        else
+                                                        {
+                                                                if ( (pWearable) && (LLAssetType::AT_CLOTHING == pItem->getType()) )
+                                                                        gAgent.removeWearable(pWearable->getType());
+                                                        }
+                                        #ifdef RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+                                                }
+                                        #endif // RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+                                }
+                                break;
+                        case LLAssetType::AT_OBJECT:
+                                {
+                                        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                                        LLViewerObject* pObj;
+
+                                        #ifdef RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+                                                // If we're already wearing something on this attach point then we have to check if it isn't part of a composite
+                                                // folder that has at least one unremovable item (in which case we can't attach or detach this item)
+                                                LLViewerInventoryCategory* pCompositeFolder;
+                                                if ( (pAvatar) && 
+                                                         ( ((pObj = pAvatar->getWornAttachment(pItem->getUUID())) == NULL) || 
+                                                           (!getCompositeInfo(pItem->getUUID(), NULL, &pCompositeFolder)) || (canTakeOffComposite(pFolder)) ) )
+                                                {
+                                        #endif // RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+                                                        if (fAttach)
+                                                        {
+                                                                // Simulate wearing an object to a specific attachment point (copy/paste to suppress replacement dialog)
+                                                                // LLAttachObject::handleEvent() => rez_attachment()
+                                                                LLViewerJointAttachment* pAttachPt = getAttachPoint(pItem, true);
+                                                                if ( (pAttachPt) && (isDetachable(pAttachPt)) )
+                                                                {
+                                                                        #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
+                                                                                LLAttachmentRezAction* rez_action = new LLAttachmentRezAction;
+                                                                                rez_action->mItemID = pItem->getUUID();
+                                                                                rez_action->mAttachPt = getAttachPointIndex(pAttachPt->getName(), true);
+
+                                                                                confirm_replace_attachment_rez(0/*YES*/, (void*)rez_action); // (Will call delete on rez_action)
+                                                                        #else                                                                                           // Version: 1.23.4
+                                                                                LLSD payload;
+                                                                                payload["item_id"] = pItem->getUUID();
+                                                                                payload["attachment_point"] = getAttachPointIndex(pAttachPt->getName(), true);
+
+                                                                                LLNotifications::instance().forceResponse(
+                                                                                        LLNotification::Params("ReplaceAttachment").payload(payload), 0/*YES*/);
+                                                                        #endif
+                                                                }
+                                                        }
+                                                        else
+                                                        {
+                                                                if ( (pAvatar) && ((pObj = pAvatar->getWornAttachment(pItem->getUUID())) != NULL) )
+                                                                {
+                                                                        LLViewerJointAttachment* pAttachment = pAvatar->getTargetAttachmentPoint(pObj);
+                                                                        if (pAttachment)
+                                                                                handle_detach_from_avatar(pAttachment);
+                                                                }
+                                                        }
+                                        #ifdef RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+                                                }
+                                        #endif // RLV_EXPERIMENTAL_COMPOSITE_LOCKING
+                                }
+                                break;
+                        #ifdef LL_GNUC
+                        default:
+                                break;
+                        #endif // LL_GNUC
+                }
+        }
+}
+
+// Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0g
+bool RlvHandler::onGetPath(const LLUUID &uuid, const std::string& strOption, std::string& strReply) const
+{
+        // Sanity check - no need to go through all this trouble if we don't have a shared root
+        LLViewerInventoryCategory* pRlvRoot = getSharedRoot();
+        if (!pRlvRoot)
+                return false;
+
+        LLUUID idItem;
+
+        // <option> can be a clothing layer
+        EWearableType layerType = LLWearable::typeNameToType(strOption);
+        if (WT_INVALID != layerType)
+        {
+                idItem = gAgent.getWearableItem(layerType);
+        }
+        else
+        {
+                LLViewerJointAttachment* pAttachPt = NULL;
+
+                // ... or it can be empty
+                if (strOption.empty())
+                {
+                        // (in which case we act on the object that issued the command)
+                        LLViewerObject* pObj = gObjectList.findObject(uuid);
+                        if ( (pObj) && (pObj->isAttachment()) && (gAgent.getAvatarObject()) )
+                                pAttachPt = gAgent.getAvatarObject()->getTargetAttachmentPoint(pObj);
+                }
+                else
+                {
+                        // ... or it can specify an attach point
+                        pAttachPt = getAttachPoint(strOption, true);
+                }
+
+                // If we found something, get its inventory item UUID
+                if (pAttachPt)
+                        idItem = pAttachPt->getItemID();
+        }
+
+        // If we found something and it's under the shared root, then get its path
+        if ( (!idItem.isNull()) && (gInventory.isObjectDescendentOf(idItem, pRlvRoot->getUUID())) )
+        {
+                LLInventoryItem* pItem = gInventory.getItem(idItem);
+                if (pItem)
+                {
+                        // ... unless the containing folder's name specifies an attach point (or nostrip) in which case we need its parent
+                        LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID());
+                        #ifdef RLV_EXTENSION_FLAG_NOSTRIP
+                                if ( (getAttachPoint(pFolder, true)) || (pFolder->getName() == ".("RLV_FOLDER_FLAG_NOSTRIP")") )
+                        #else
+                                if (getAttachPoint(pFolder, true))
+                        #endif // RLV_EXTENSION_FLAG_NOSTRIP
+                                        strReply = getSharedPath(pFolder->getParentUUID());
+                                else
+                                        strReply = getSharedPath(pFolder);
+                }
+        }
+        return !strReply.empty();
+}
+
+struct rlv_wear_info { U32 cntWorn, cntTotal, cntChildWorn, cntChildTotal; };
+
+// Checked: 2009-05-30 (RLVa-0.2.0e) | Modified: RLVa-0.2.0e
+void RlvHandler::onGetInvWorn(const std::string& strPath, std::string& strReply) const
+{
+        // Sanity check - getAvatarObject() can't be NULL [see rlvIsWearingItem()] and the folder should exist and not be hidden
+        LLViewerInventoryCategory* pFolder = getSharedFolder(strPath);
+        if ((!gAgent.getAvatarObject()) || (!pFolder) || (pFolder->getName().empty()) || (RLV_FOLDER_PREFIX_HIDDEN == pFolder->getName()[0]))
+                return;
+
+        // Collect everything @attachall would be attaching
+        LLInventoryModel::cat_array_t  folders;
+        LLInventoryModel::item_array_t items;
+        RlvWearableItemCollector functor(pFolder->getUUID(), true, true);
+        gInventory.collectDescendentsIf(pFolder->getUUID(), folders, items, FALSE, functor);
+
+        rlv_wear_info wi = {0};
+
+        // Add all the folders to a lookup map 
+        std::map<LLUUID, rlv_wear_info> mapFolders;
+        mapFolders.insert(std::pair<LLUUID, rlv_wear_info>(pFolder->getUUID(), wi));
+        for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++)
+                mapFolders.insert(std::pair<LLUUID, rlv_wear_info>(folders.get(idxFolder)->getUUID(), wi));
+
+        // Iterate over all the found items
+        LLViewerInventoryItem* pItem; std::map<LLUUID, rlv_wear_info>::iterator itFolder;
+        for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++)
+        {
+                pItem = items.get(idxItem);
+
+                // The "folded parent" is the folder this item should be considered a direct descendent of (may or may not match actual parent)
+                const LLUUID& idParent = functor.getFoldedParent(pItem->getParentUUID());
+
+                // Walk up the tree: sooner or later one of the parents will be a folder in the map
+                LLViewerInventoryCategory* pParent = gInventory.getCategory(idParent);
+                while ( (itFolder = mapFolders.find(pParent->getUUID())) == mapFolders.end() )
+                        pParent = gInventory.getCategory(pParent->getParentUUID());
+
+                U32 &cntWorn  = (idParent == pParent->getUUID()) ? itFolder->second.cntWorn : itFolder->second.cntChildWorn, 
+                        &cntTotal = (idParent == pParent->getUUID()) ? itFolder->second.cntTotal : itFolder->second.cntChildTotal;
+
+                if (rlvIsWearingItem(pItem))
+                        cntWorn++;
+                cntTotal++;
+        }
+
+        // Extract the result for the main folder
+        itFolder = mapFolders.find(pFolder->getUUID());
+        wi.cntWorn = itFolder->second.cntWorn;
+        wi.cntTotal = itFolder->second.cntTotal;
+        mapFolders.erase(itFolder);
+
+        // Build the result for each child folder
+        for (itFolder = mapFolders.begin(); itFolder != mapFolders.end(); ++itFolder)
+        {
+                rlv_wear_info& wiFolder = itFolder->second;
+
+                wi.cntChildWorn += wiFolder.cntWorn + wiFolder.cntChildWorn;
+                wi.cntChildTotal += wiFolder.cntTotal + wiFolder.cntChildTotal;
+
+                strReply += llformat(",%s|%d%d", gInventory.getCategory(itFolder->first)->getName().c_str(),
+                 (0 == wiFolder.cntTotal) ? 0 : (0 == wiFolder.cntWorn) ? 1 : (wiFolder.cntWorn != wiFolder.cntTotal) ? 2 : 3,
+                 (0 == wiFolder.cntChildTotal) ? 0 : (0 == wiFolder.cntChildWorn) ? 1 : (wiFolder.cntChildWorn != wiFolder.cntChildTotal) ? 2 : 3
+                );
+        }
+
+        // Now just prepend the root and done
+        strReply = llformat("|%d%d", (0 == wi.cntTotal) ? 0 : (0 == wi.cntWorn) ? 1 : (wi.cntWorn != wi.cntTotal) ? 2 : 3,
+                (0 == wi.cntChildTotal) ? 0 : (0 == wi.cntChildWorn) ? 1 : (wi.cntChildWorn != wi.cntChildTotal) ? 2: 3) + strReply;
+}
+
+// (In case anyone cares: this isn't used in public builds)
+bool RlvHandler::getWornInfo(const LLInventoryCategory* pFolder, U8& wiFolder, U8& wiChildren) const
+{
+        // Sanity check - getAvatarObject() can't be NULL [see rlvIsWearingItem()] and the folder should exist and not be hidden
+        if ((!gAgent.getAvatarObject()) || (!pFolder) || (pFolder->getName().empty()) || (RLV_FOLDER_PREFIX_HIDDEN == pFolder->getName()[0]))
+                return false;
+
+        LLInventoryModel::cat_array_t  folders;
+        LLInventoryModel::item_array_t items;
+        RlvWearableItemCollector functor(pFolder->getUUID(), true, true);
+        gInventory.collectDescendentsIf(pFolder->getUUID(), folders, items, FALSE, functor);
+
+        LLViewerInventoryItem* pItem;
+        U32 cntWorn = 0, cntTotal = 0, cntChildWorn = 0, cntChildTotal = 0;
+        for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++)
+        {
+                pItem = items.get(idxItem);
+
+                bool fDirectDescendent = (pFolder->getUUID() == functor.getFoldedParent(pItem->getParentUUID()));
+                U32 &refWorn = (fDirectDescendent) ? cntWorn : cntChildWorn, &refTotal = (fDirectDescendent) ? cntTotal : cntChildTotal;
+
+                if (rlvIsWearingItem(pItem))
+                        refWorn++;
+                refTotal++;
+        }
+
+        wiFolder = (0 == cntTotal + cntChildTotal) ? 0 : (0 == cntWorn + cntChildWorn) ? 1 : 
+                (cntWorn + cntChildWorn != cntTotal + cntChildTotal) ? 2 : 3;
+        wiChildren = (0 == cntChildTotal) ? 0 : (0 == cntChildWorn) ? 1 : (cntChildWorn != cntChildTotal) ? 2 : 3;
+
+        return true;
+}
+
+// ============================================================================
+// Initialization helper functions
+//
+
+BOOL RlvHandler::setEnabled(BOOL fEnable)
+{
+        if (m_fEnabled == fEnable)
+                return fEnable;
+
+        if (fEnable)
+        {
+                if (gSavedSettings.controlExists(RLV_SETTING_NOSETENV))
+                        fNoSetEnv = gSavedSettings.getBOOL(RLV_SETTING_NOSETENV);
+                if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))
+                        fLegacyNaming = gSavedSettings.getBOOL(RLV_SETTING_ENABLELEGACYNAMING);
+                if (gSavedSettings.controlExists(RLV_SETTING_SHOWNAMETAGS))
+                        RlvSettings::fShowNameTags = gSavedSettings.getBOOL(RLV_SETTING_SHOWNAMETAGS);
+
+                RlvCommand::initLookupTable();
+                gRlvHandler.addObserver(new RlvExtGetSet());
+
+                if (LLStartUp::getStartupState() >= STATE_CLEANUP)
+                        fetchSharedInventory();
+
+                m_fEnabled = TRUE;
+        }
+        else if (canDisable())
+        {
+                #ifdef RLV_DEBUG
+                        RLV_INFOS << "Disabling RLV:" << LL_ENDL;
+                #endif // RLV_DEBUG
+
+                gRlvHandler.clearState();
+
+                #ifdef RLV_DEBUG
+                        RLV_INFOS << "\t--> RLV disabled" << LL_ENDL;
+                #endif // RLV_DEBUG
+
+                m_fEnabled = FALSE;
+        }
+
+        #ifdef RLV_ADVANCED_MENU
+                // RELEASE-RLVa: LL defines CLIENT_MENU_NAME but we can't get to it from here so we need to keep those two in sync manually
+                LLMenuGL* pClientMenu = NULL;
+                if ( (gMenuBarView) && ((pClientMenu = gMenuBarView->getChildMenuByName("Advanced", FALSE)) != NULL) )
+                {
+                        pClientMenu->setItemVisible("RLVa", m_fEnabled);
+                        pClientMenu->setItemEnabled("RLVa", m_fEnabled);
+                }
+        #endif // RLV_ADVANCED_MENU
+
+        return m_fEnabled;              // Return enabled/disabled state
+}
+
+BOOL RlvHandler::canDisable()
+{
+        return FALSE;
+}
+
+void RlvHandler::clearState()
+{
+        // TODO-RLVa: should restore all RLV controlled debug variables to their defaults
+
+        // Issue @clear on behalf of every object that has a currently active RLV restriction (even if it's just an exception)
+        LLUUID idObj; LLViewerObject* pObj; bool fDetachable;
+        while (m_Objects.size())
+        {
+                idObj = m_Objects.begin()->first; // Need a copy since after @clear the data it points to will no longer exist
+                fDetachable = ((pObj = gObjectList.findObject(idObj)) != NULL) ? isDetachable(pObj) : true;
+
+                processCommand(idObj, "clear", false);
+                if (!fDetachable)
+                        processCommand(idObj, "detachme=force", false);
+        }
+
+        // Sanity check - these should all be empty after we issue @clear on the last object
+        if ( (!m_Objects.empty()) || !(m_Exceptions.empty()) || (!m_Attachments.empty()) )
+        {
+                RLV_ERRS << "Object, exception or attachment map not empty after clearing state!" << LL_ENDL;
+                m_Objects.clear();
+                m_Exceptions.clear();
+                m_Attachments.clear();
+        }
+
+        // These all need manual clearing
+        memset(m_LayersAdd, 0, sizeof(S16) * WT_COUNT);
+        memset(m_LayersRem, 0, sizeof(S16) * WT_COUNT);
+        memset(m_Behaviours, 0, sizeof(S16) * RLV_BHVR_COUNT);
+        m_AttachPending.clear();
+        m_Emitter.clearObservers(); // <- calls delete on all active observers
+
+        // Clear dynamically allocated memory
+        if (m_pGCTimer)
+        {
+                delete m_pGCTimer;
+                m_pGCTimer = NULL;
+        }
+        if (m_pWLSnapshot)
+        {
+                delete m_pWLSnapshot;
+                m_pWLSnapshot = NULL;
+        }
+}
+
+// ============================================================================
diff --git a/linden/indra/newview/rlvhandler.h b/linden/indra/newview/rlvhandler.h
new file mode 100644
index 0000000..5295a72
--- /dev/null
+++ b/linden/indra/newview/rlvhandler.h
@@ -0,0 +1,445 @@
+#ifndef RLV_HANDLER_H
+#define RLV_HANDLER_H
+
+#include "llagentconstants.h"
+#include "llappviewer.h"
+#include "llformat.h"
+#include "llversionviewer.h"
+#include "llviewerjointattachment.h"
+#include "llviewerobject.h"
+#include "llwearable.h"
+
+#include "rlvhelper.h"
+#include "rlvevent.h"
+#include "rlvmultistringsearch.h"
+
+// ============================================================================
+
+typedef std::map<LLUUID, RlvObject> rlv_object_map_t;
+typedef std::multimap<S32, LLUUID> rlv_detach_map_t;
+typedef std::map<S32, LLUUID> rlv_reattach_map_t;
+typedef std::multimap<ERlvBehaviour, RlvException> rlv_exception_map_t;
+
+class RlvHandler
+{
+public:
+        RlvHandler();
+        ~RlvHandler();
+
+        // --------------------------------
+
+        /*
+         * Attachment point helper functions
+         */
+public:
+        // Returns a pointer to the attachment point for a supplied parameter
+        LLViewerJointAttachment* getAttachPoint(const std::string& strText, bool fExact) const;
+        LLViewerJointAttachment* getAttachPoint(const LLInventoryItem* pItem, bool fStrict) const;
+        LLViewerJointAttachment* getAttachPoint(const LLInventoryCategory* pFolder, bool fStrict) const;
+        LLViewerJointAttachment* getAttachPointLegacy(const LLInventoryCategory* pFolder) const;
+        S32                      getAttachPointIndex(std::string strText, bool fExact) const;
+        S32                      getAttachPointIndex(LLViewerObject* pObj) const;
+        S32                      getAttachPointIndex(const LLViewerJointAttachment* pObj) const;
+        bool                     hasAttachPointName(const LLInventoryItem* pItem, bool fStrict) const;
+
+        // --------------------------------
+
+        /*
+         * Rule checking functions
+         */
+        // NOTE: - to check @detach=n    -> hasLockedAttachment() / hasLockedHUD() / isDetachable()
+        //       - to check exceptions   -> isException()
+        //       - to check @addoutfit=n -> isWearable()
+        //       - to check @remoutfit=n -> isRemovable()
+public:
+        // Returns TRUE is at least one object contains the specified behaviour (and optional option)
+        bool hasBehaviour(ERlvBehaviour eBehaviour) const { return (eBehaviour < RLV_BHVR_COUNT) ? (0 != m_Behaviours[eBehaviour]) : false; }
+        bool hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption) const;
+        // Returns TRUE if at least one object (except the specified one) contains the specified behaviour (and optional option)
+        bool hasBehaviourExcept(ERlvBehaviour eBehaviour, const LLUUID& idObj) const;
+        bool hasBehaviourExcept(ERlvBehaviour eBehaviour, const std::string& strOption, const LLUUID& idObj) const;
+
+        // Returns TRUE if there is at least 1 non-detachable attachment
+        bool hasLockedAttachment() const { return (0 != m_Attachments.size()); }
+        // Returns TRUE if there is at least 1 non-detachable HUD attachment
+        bool hasLockedHUD() const;
+        // Returns TRUE if the specified attachment point is detachable
+        bool isDetachable(S32 idxAttachPt) const { return (idxAttachPt) && (m_Attachments.find(idxAttachPt) == m_Attachments.end()); }
+        bool isDetachable(const LLInventoryItem* pItem) const;
+        bool isDetachable(LLViewerJointAttachment* pAttachPt) const;
+        bool isDetachable(LLViewerObject* pObj) const;
+        // Returns TRUE if the specified attachment point is set non-detachable by anything other than pObj (or one of its children)
+        bool isDetachableExcept(S32 idxAttachPt, LLViewerObject* pObj) const;
+        // Marks the specified attachment point as (non-)detachable (return value indicates success ; used by unit tests)
+        bool setDetachable(S32 idxAttachPt, const LLUUID& idRlvObj, bool fDetachable);
+        bool setDetachable(LLViewerObject* pObj, const LLUUID& idRlvObj, bool fDetachable);
+
+        // Adds or removes an exception for the specified behaviour
+        void addException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& varOption);
+        void removeException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& varOption);
+        // Returns TRUE if the specified option was added as an exception for the specified behaviour
+        bool isException(ERlvBehaviour eBhvr, const RlvExceptionOption& varOption, ERlvExceptionCheck typeCheck = RLV_CHECK_DEFAULT) const;
+        // Returns TRUE if the specified behaviour should behave "permissive" (rather than "strict"/"secure")
+        bool isPermissive(ERlvBehaviour eBhvr) const;
+
+        // Returns TRUE if the specified layer is removable (use hasBehaviour(RLV_BHVR_REMOUTFIT) for the general case)
+        bool isRemovable(EWearableType type) const      { return (type < WT_COUNT) ? (0 == m_LayersRem[type]) : true; }
+        // Returns TRUE if the specified layer is not remoutfit blocked by any object (except the one specified by UUID)
+        bool isRemovableExcept(EWearableType type, const LLUUID& idObj) const;
+        // Returns TRUE if the inventory item is strippable by @detach or @remoutfit
+        bool isStrippable(const LLUUID& idItem) const;
+        // Returns TRUE if the specified layer is wearable (use hasBehaviour(RLV_BHVR_ADDOUTFIT) for the general case)
+        bool isWearable(EWearableType type) const       { return (type < WT_COUNT) ? (0 == m_LayersAdd[type]) : true; }
+
+        // Returns TRUE if the composite folder doesn't contain any "locked" items
+        bool canTakeOffComposite(const LLInventoryCategory* pFolder) const;
+        // Returns TRUE if the folder is a composite folder and optionally returns the name
+        bool getCompositeInfo(const LLInventoryCategory* pFolder, std::string* pstrName) const;
+        // Returns TRUE if the inventory item belongs to a composite folder and optionally returns the name and composite folder
+        bool getCompositeInfo(const LLUUID& idItem, std::string* pstrName, LLViewerInventoryCategory** ppFolder) const;
+        // Returns TRUE if the folder is a composite folder
+        bool isCompositeFolder(const LLInventoryCategory* pFolder) const;
+        // Returns TRUE if the inventory item belongs to a composite folder
+        bool isCompositeDescendent(const LLUUID& idItem) const;
+        // Returns TRUE if the inventory item is part of a folded composite folder and should be hidden from @getoufit or @getattach
+        bool isHiddenCompositeItem(const LLUUID& idItem, const std::string& strItemType) const;
+
+        // --------------------------------
+
+        /*
+         * Helper functions 
+         */
+public:
+        // Accessors
+        bool getCanCancelTp() const                     { return m_fCanCancelTp; }                                              // @accepttp and @tpto
+        void setCanCancelTp(bool fAllow)        { m_fCanCancelTp = fAllow; }                                    // @accepttp and @tpto
+
+        // Command specific helper functions
+        bool               canShowHoverText(LLViewerObject* pObj) const;                                        // @showhovertext* command family
+        void               filterChat(std::string& strUTF8Text, bool fFilterEmote) const;       // @sendchat, @recvchat and @redirchat
+        void               filterLocation(std::string& strUTF8Text) const;                                      // @showloc
+        void               filterNames(std::string& strUTF8Text) const;                                         // @shownames
+        const std::string& getAnonym(const std::string& strName) const;                                         // @shownames
+        std::string        getVersionString() const;                                                                            // @version
+        std::string        getVersionNumString() const;                                                                         // @versionnum
+        BOOL               isAgentNearby(const LLUUID& uuid) const;                                                     // @shownames
+        bool               redirectChatOrEmote(const std::string& strUTF8Test) const;           // @redirchat and @rediremote
+
+        // Command processing helper functions
+        BOOL processCommand(const LLUUID& idObj, const std::string& strCommand, bool fFromObj);
+        void processRetainedCommands();
+        void retainCommand(const std::string& strObj, const LLUUID& idObj, const std::string& strCmd);
+
+        // Returns a pointer to the currently executing command (do *not* save this pointer)
+        const RlvCommand* getCurrentCommand() const { return m_pCurCommand; }
+        // Returns the UUID of the object we're currently executing a command for
+        const LLUUID& getCurrentObject() const          { return m_idCurObject; }
+
+        // Initialization
+        static BOOL canDisable();
+        static BOOL isEnabled() { return m_fEnabled; }
+        static void initLookupTables();
+        static BOOL setEnabled(BOOL fEnable);
+protected:
+        void clearState();
+
+        // --------------------------------
+
+        /*
+         * Inventory related functions
+         */
+public:
+        // Starts a fetch of everything under the shared root (if there is one)
+        static void fetchSharedInventory();
+        // Returns the path of the supplied folder (relative to the shared root)
+        std::string getSharedPath(const LLViewerInventoryCategory* pFolder) const;
+        std::string getSharedPath(const LLUUID& idFolder) const;
+        // Returns a pointer to the shared root folder (if there is one)
+        static LLViewerInventoryCategory* getSharedRoot();
+        // A "folded folder" is a folder whose items logically belong to the grandparent rather than the parent
+        bool isFoldedFolder(const LLInventoryCategory* pFolder, bool fAttach) const;
+        bool isFoldedFolderLegacy(const LLInventoryCategory* pFolder, bool fAttach) const;
+protected:
+        // Find all folders that match a supplied criteria (clears the supplied array)
+        bool findSharedFolders(const std::string& strCriteria, LLInventoryModel::cat_array_t& folders) const;
+
+        // Returns a subfolder of idParent that starts with name (exact match > partial match)
+        LLViewerInventoryCategory* getSharedFolder(const LLUUID& idParent, const std::string& strName) const;
+        // Looks up a folder from a path (relative to the shared root)
+        LLViewerInventoryCategory* getSharedFolder(const std::string& strPath) const;
+
+        bool getWornInfo(const LLInventoryCategory* pFolder, U8& wiFolder, U8& wiChildren) const;
+
+        // --------------------------------
+
+        /*
+         * Event handling (forwards to registered observers if we don't handle the command)
+         */
+public:
+        BOOL addObserver(RlvObserver* pObserver)        { return m_Emitter.addObserver(pObserver); }
+        BOOL removeObserver(RlvObserver* pObserver)     { return m_Emitter.remObserver(pObserver); }
+        void addBehaviourObserver(RlvBehaviourObserver* pBhvrObserver);
+        void removeBehaviourObserver(RlvBehaviourObserver* pBhvrObserver);
+        void notifyBehaviourObservers(const RlvCommand& rlvCmd, bool fInternal);
+
+        // Externally invoked event handlers
+        void onAttach(LLViewerJointAttachment* pAttachPt, bool fFullyLoaded);   // LLVOAvatar::attachObject()
+        void onDetach(LLViewerJointAttachment* pAttachPt);                                              // LLVOAvatar::detachObject()
+        bool onGC();                                                                                                                    // RlvGCTimer::tick()
+        void onSavedAssetIntoInventory(const LLUUID& idItem);                                   // LLInventoryModel::processSaveAssetIntoInventory()
+protected:
+        BOOL processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd);
+        BOOL processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvCmd);
+        BOOL processClearCommand(const LLUUID& idObj, const RlvCommand& rlvCmd);
+        BOOL processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const;
+        BOOL processForceCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const;
+
+        // Command handlers (exist for no other reason than to keep the length of the processXXX functions down)
+        void onForceDetach(const LLUUID& idObj, const std::string& strOption) const;
+        void onForceRemOutfit(const LLUUID& idObj, const std::string& strOption) const;
+        bool onForceSit(const LLUUID& uuid, const std::string& strOption) const;
+        void onForceWear(const std::string& strPath, bool fAttach, bool fMatchAll) const;
+        bool onGetPath(const LLUUID& uuid, const std::string& strOption, std::string& strReply) const;
+        void onGetInvWorn(const std::string& strPath, std::string &strReply) const;
+
+        // --------------------------------
+
+        /*
+         * Member variables
+         */
+public:
+        static BOOL fNoSetEnv;
+        static BOOL fLegacyNaming;
+
+        static const std::string cstrSharedRoot;                // Name of the shared root folder
+        static const std::string cstrBlockedRecvIM;             // Stand-in text for incoming IM when recvim restricted
+        static const std::string cstrBlockedSendIM;             // Stand-in text for outgoing IM when sendim restricted
+        static const std::string cstrHidden;                    // General purpose "this was censored" text
+        static const std::string cstrHiddenParcel;
+        static const std::string cstrHiddenRegion;
+        static const std::string cstrMsgRecvIM;                 // Message sent to IM sender when sendim restricted
+        static const std::string cstrMsgTpLure;                 // Message sent to tplure sender when tplure restricted
+        static const std::string cstrAnonyms[28];
+protected:
+        rlv_object_map_t     m_Objects;                                 // Map of objects that have active restrictions (by UUID)
+        rlv_exception_map_t  m_Exceptions;              // Map of UUIDs that are exempt from the associated ERlvBehaviour
+        rlv_detach_map_t     m_Attachments;                             // Map of locked attachments (attachment point index -> object that issued @detach=n)
+        S16                  m_LayersAdd[WT_COUNT];             // Array of locked layers (reference counted)
+        S16                  m_LayersRem[WT_COUNT];             // Array of locked layers (reference counted)
+        S16                  m_Behaviours[RLV_BHVR_COUNT];
+
+        rlv_retained_list_t  m_Retained;
+        rlv_reattach_map_t   m_AttachPending;
+        rlv_reattach_map_t   m_DetachPending;
+        RlvGCTimer*          m_pGCTimer;
+        RlvWLSnapshot*       m_pWLSnapshot;
+
+        RlvCommand*          m_pCurCommand;                             // Convenience (see @tpto)
+        LLUUID               m_idCurObject;                             // Convenience (see @tpto)
+
+        mutable RlvEventEmitter<RlvObserver>     m_Emitter;
+        mutable std::list<RlvBehaviourObserver*> m_BhvrObservers;
+        RlvBehaviourNotifyObserver*                              m_pBhvrNotify;
+
+        static BOOL                     m_fEnabled;                                     // Use setEnabled() to toggle this
+        static BOOL                     m_fFetchStarted;                        // TRUE if we fired off an inventory fetch
+        static BOOL                     m_fFetchComplete;                       // TRUE if everything was fetched
+        static RlvMultiStringSearch m_AttachLookup;             // Lookup table for attachment names (lower case)
+
+        bool m_fCanCancelTp;
+
+        friend class RlvSharedRootFetcher;                              // Fetcher needs access to m_fFetchComplete
+        friend class RlvGCTimer;                                                // Timer clear its own point at destruction
+
+        // --------------------------------
+
+        /*
+         * Internal access functions used by unit tests
+         */
+public:
+        const rlv_object_map_t*    getObjectMap() const         { return &m_Objects; }
+        const rlv_exception_map_t* getExceptionMap() const      { return &m_Exceptions; }
+        const rlv_detach_map_t*    getDetachMap() const         { return &m_Attachments; }
+        #ifdef RLV_DEBUG_TESTS
+                const S16*                 getAddLayers() const         { return m_LayersAdd; }
+                const S16*                 getRemLayers() const         { return m_LayersRem; }
+                const S16*                 getBehaviours() const        { return m_Behaviours; }
+                const rlv_retained_list_t* getRetainedList() const      { return &m_Retained; }
+        #endif // RLV_DEBUG_TESTS
+};
+
+typedef RlvHandler rlv_handler_t;
+extern rlv_handler_t gRlvHandler;
+
+// ============================================================================
+// Inlined member functions
+//
+
+// Checked: 2009-10-04 (RLVa-1.0.4a) | Modified: RLVa-1.0.4a
+inline void RlvHandler::addException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& varOption)
+{
+        m_Exceptions.insert(std::pair<ERlvBehaviour, RlvException>(eBhvr, RlvException(idObj, eBhvr, varOption)));
+}
+
+// Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
+inline bool RlvHandler::canShowHoverText(LLViewerObject *pObj) const
+{
+        return ( (!pObj) || (LL_PCODE_VOLUME != pObj->getPCode()) ||
+                    !( (hasBehaviour(RLV_BHVR_SHOWHOVERTEXTALL)) ||
+                           ( (hasBehaviour(RLV_BHVR_SHOWHOVERTEXTWORLD)) && (!pObj->isHUDAttachment()) ) ||
+                           ( (hasBehaviour(RLV_BHVR_SHOWHOVERTEXTHUD)) && (pObj->isHUDAttachment()) ) ||
+                           (isException(RLV_BHVR_SHOWHOVERTEXT, pObj->getID(), RLV_CHECK_PERMISSIVE)) ) );
+}
+
+// Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+inline S32 RlvHandler::getAttachPointIndex(std::string strText, bool fExact) const
+{
+        U16 nParam; RlvMultiStringSearchMatch match;
+        LLStringUtil::toLower(strText);
+        return (fExact) ? ((m_AttachLookup.getExactMatchParam(strText, nParam)) ? nParam : 0)
+                        : ((m_AttachLookup.findLast(strText, match)) ? match.nParam : 0);
+}
+
+// Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+inline S32 RlvHandler::getAttachPointIndex(LLViewerObject* pObj) const
+{
+        return (pObj) ? ATTACHMENT_ID_FROM_STATE(pObj->getState()) : 0;
+}
+
+// Checked: 2009-06-02 (RLVa-0.2.0g)
+inline std::string RlvHandler::getSharedPath(const LLUUID& idFolder) const
+{
+        return getSharedPath(gInventory.getCategory(idFolder)); // getSharedPath() has a NULL pointer check so this is safe
+}
+
+// Checked: 2009-06-07 (RLVa-0.2.1c)
+inline std::string RlvHandler::getVersionString()  const
+{
+        return llformat("RestrainedLife viewer v%d.%d.%d (%s %d.%d.%d.%d - RLVa %d.%d.%d)",
+                RLV_VERSION_MAJOR, RLV_VERSION_MINOR, RLV_VERSION_PATCH,
+                LLAppViewer::instance()->getSecondLifeTitle().c_str(), LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD,
+                RLVa_VERSION_MAJOR, RLVa_VERSION_MINOR, RLVa_VERSION_PATCH);
+}
+
+// Checked: 2009-10-04 (RLVa-1.0.4b) | Added: RLVa-1.0.4b
+inline std::string RlvHandler::getVersionNumString()  const
+{
+        return llformat("%d%02d%02d%02d", RLV_VERSION_MAJOR, RLV_VERSION_MINOR, RLV_VERSION_PATCH, RLV_VERSION_BUILD);
+}
+
+// Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+inline bool RlvHandler::hasAttachPointName(const LLInventoryItem *pItem, bool fStrict) const
+{
+        return (getAttachPoint(pItem, fStrict) != NULL); // getAttachPoint() has a NULL pointer check so this is safe
+}
+
+// Checked:
+inline bool RlvHandler::hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption) const
+{
+        return hasBehaviourExcept(eBehaviour, strOption, LLUUID::null);
+}
+
+// Checked:
+inline bool RlvHandler::hasBehaviourExcept(ERlvBehaviour eBehaviour, const LLUUID& idObj) const
+{
+        return hasBehaviourExcept(eBehaviour, std::string(), idObj);
+}
+
+#ifdef RLV_EXPERIMENTAL_COMPOSITES
+        // Checked:
+        inline bool RlvHandler::isCompositeFolder(const LLInventoryCategory* pFolder) const
+        {
+                return getCompositeInfo(pFolder, NULL);
+        }
+
+        // Checked:
+        inline bool RlvHandler::isCompositeDescendent(const LLUUID& idItem) const
+        {
+                return getCompositeInfo(idItem, NULL, NULL);
+        }
+#endif // RLV_EXPERIMENTAL_COMPOSITES
+
+// Checked: 2009-09-08 (RLVa-1.0.2c) | Added: RLVa-1.0.2c
+inline bool RlvHandler::isDetachable(LLViewerJointAttachment *pAttachPt) const
+{
+        // If there's an attached object it's faster to just use that; otherwise look up the attachment index because it might be locked empty
+        return (pAttachPt == NULL) ||
+                   ( (pAttachPt->getObject() != NULL) && isDetachable(pAttachPt->getObject()) ) || (isDetachable(getAttachPointIndex(pAttachPt)));
+}
+
+// Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+inline bool RlvHandler::isDetachable(LLViewerObject* pObj) const
+{
+        return (pObj == NULL) || (!pObj->isAttachment()) || (isDetachable(getAttachPointIndex(pObj)));
+}
+
+inline bool RlvHandler::isPermissive(ERlvBehaviour eBhvr) const
+{
+        return (RlvCommand::hasStrictVariant(eBhvr)) 
+                ? !((hasBehaviour(RLV_BHVR_PERMISSIVE)) || (isException(RLV_BHVR_PERMISSIVE, eBhvr, RLV_CHECK_PERMISSIVE)))
+                : true;
+}
+
+// Checked: 2009-07-29 (RLVa-1.0.1b) | Added: RLVa-1.0.1b
+inline bool RlvHandler::isFoldedFolder(const LLInventoryCategory* pFolder, bool fAttach) const
+{
+        return
+          (
+                // .(<attachpt>) type folder (on detach we don't care about its children, but on attach there can only be 1 attachment)
+                ( (gRlvHandler.getAttachPoint(pFolder, true)) &&
+                  ( (!fAttach) || (1 == rlvGetDirectDescendentsCount(pFolder, LLAssetType::AT_OBJECT))) )
+                #ifdef RLV_EXTENSION_FLAG_NOSTRIP
+                // .(nostrip) folder
+                || ( (pFolder) && (".("RLV_FOLDER_FLAG_NOSTRIP")" == pFolder->getName()) )
+                #endif // RLV_EXTENSION_FLAG_NOSTRIP
+          );
+}
+
+// Checked: 2009-05-23 (RLVa-0.2.0d) | Added: RLVa-0.2.0d
+inline bool RlvHandler::isRemovableExcept(EWearableType type, const LLUUID& idObj) const
+{
+        // NOTE: mind the bitwise OR rather than the logical OR!!
+        return (isRemovable(type)) || !( (hasBehaviourExcept(RLV_BHVR_REMOUTFIT, idObj)) |
+                                             (hasBehaviourExcept(RLV_BHVR_REMOUTFIT, LLWearable::typeToTypeName(type), idObj)) );
+}
+
+#ifndef RLV_EXTENSION_FLAG_NOSTRIP
+        // Checked: 2009-05-23 (RLVa-0.2.0d) | Added: RLVa-0.2.0d
+        bool RlvHandler::isStrippable(const LLUUID& idItem) const
+        {
+                return true;
+        }
+#endif // RLV_EXTENSION_FLAG_NOSTRIP
+
+// Checked: 2009-10-04 (RLVa-1.0.4a) | Modified: RLVa-1.0.4a
+inline void RlvHandler::removeException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& varOption)
+{
+        for (rlv_exception_map_t::iterator itException = m_Exceptions.lower_bound(eBhvr), 
+                        endException = m_Exceptions.upper_bound(eBhvr); itException != endException; ++itException)
+        {
+                if ( (itException->second.idObject == idObj) && (itException->second.varOption == varOption) )
+                {
+                        m_Exceptions.erase(itException);
+                        break;
+                }
+        }
+}
+
+// Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
+inline void RlvHandler::retainCommand(const std::string& strObj, const LLUUID& idObj, const std::string& strCmd)
+{
+        #ifdef RLV_DEBUG
+                RLV_INFOS << "[" << idObj << "]: " << strCmd << " (retaining)" << LL_ENDL;
+        #endif // RLV_DEBUG
+        m_Retained.push_back(RlvRetainedCommand(strObj, idObj, strCmd));
+}
+
+// Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+inline bool RlvHandler::setDetachable(LLViewerObject* pObj, const LLUUID& idRlvObj, bool fDetachable)
+{
+        return setDetachable(getAttachPointIndex(pObj), idRlvObj, fDetachable); // getAttachPointIndex() has a NULL pointer check
+}
+
+// ============================================================================
+
+#endif // RLV_HANDLER_H
diff --git a/linden/indra/newview/rlvhelper.cpp b/linden/indra/newview/rlvhelper.cpp
new file mode 100644
index 0000000..c8d430d
--- /dev/null
+++ b/linden/indra/newview/rlvhelper.cpp
@@ -0,0 +1,668 @@
+#include "llviewerprecompiledheaders.h"
+#include "llagent.h"
+#include "llfloaterwindlight.h"
+#include "llviewerobject.h"
+#include "llviewerstats.h"
+#include "llviewerwindow.h"
+#include "llvoavatar.h"
+#include "llwlparammanager.h"
+
+#include "rlvhelper.h"
+#include "rlvevent.h"
+#include "rlvhandler.h"
+
+// ============================================================================
+// Static variable initialization
+//
+
+RlvCommand::RlvBhvrTable RlvCommand::m_BhvrMap;
+
+// ============================================================================
+// RlvCommmand
+//
+
+// Checked: 2009-09-10 (RLVa-1.0.3a) | Modified: RLVa-1.0.3a
+RlvCommand::RlvCommand(const std::string& strCommand)
+        : m_eBehaviour(RLV_BHVR_UNKNOWN), m_fStrict(false), m_eParamType(RLV_TYPE_UNKNOWN)
+{
+        if ((m_fValid = parseCommand(strCommand, m_strBehaviour, m_strOption, m_strParam)))
+        {
+                S32 nTemp = 0;
+                if ( ("n" == m_strParam) || ("add" == m_strParam) )
+                        m_eParamType = RLV_TYPE_ADD;
+                else if ( ("y" == m_strParam) || ("rem" == m_strParam) )
+                        m_eParamType = RLV_TYPE_REMOVE;
+                else if ("force" == m_strParam)
+                        m_eParamType = RLV_TYPE_FORCE;
+                else if (LLStringUtil::convertToS32(m_strParam, nTemp)) // Assume it's a reply command if we can convert <param> to an S32
+                        m_eParamType = RLV_TYPE_REPLY;
+                else if (m_strBehaviour == "clear")                                             // clear is the odd one out so just make it its own type
+                        m_eParamType = RLV_TYPE_CLEAR;
+                else
+                {
+                        m_eParamType = RLV_TYPE_UNKNOWN;
+                        m_fValid = false;
+                }
+        }
+
+        if (!m_fValid)
+        {
+                m_strBehaviour = m_strOption = m_strParam = "";
+                return;
+        }
+
+        // Check if this is the "strict" (aka "secure") variation of a behaviour
+        std::string::size_type idxStrict = m_strBehaviour.find("_sec");
+        m_fStrict = (std::string::npos != idxStrict) && (idxStrict + 4 == m_strBehaviour.length());
+
+        RlvBhvrTable::const_iterator itBhvr = m_BhvrMap.find( (!m_fStrict) ? m_strBehaviour : m_strBehaviour.substr(0, idxStrict));
+        if ( (itBhvr != m_BhvrMap.end()) && ((!m_fStrict) || (hasStrictVariant(itBhvr->second))) )
+                m_eBehaviour = itBhvr->second;
+}
+
+
+bool RlvCommand::parseCommand(const std::string& strCommand, std::string& strBehaviour, std::string& strOption, std::string& strParam)
+{
+        // (See behaviour notes for the command parsing truth table)
+
+        // Format: <behaviour>[:<option>]=<param>
+        int idxParam  = strCommand.find('=');
+        int idxOption = (idxParam > 0) ? strCommand.find(':') : -1;
+        if (idxOption > idxParam - 1)
+                idxOption = -1;
+
+        // If <behaviour> is missing it's always an improperly formatted command
+        if ( (0 == idxOption) || (0 == idxParam) )
+                return false;
+
+        strBehaviour = strCommand.substr(0, (-1 != idxOption) ? idxOption : idxParam);
+        strOption = strParam = "";
+
+        // If <param> is missing it's an improperly formatted command
+        if ( (-1 == idxParam) || ((int)strCommand.length() - 1 == idxParam) )
+        {
+                // Unless "<behaviour> == "clear" AND (idxOption == 0)" 
+                // OR <behaviour> == "clear" AND (idxParam != 0) [see table above]
+                if ( ("clear" == strBehaviour) && ( (!idxOption) || (idxParam) ) )
+                        return true;
+                return false;
+        }
+
+        if ( (-1 != idxOption) && (idxOption + 1 != idxParam) )
+                strOption = strCommand.substr(idxOption + 1, idxParam - idxOption - 1);
+        strParam = strCommand.substr(idxParam + 1);
+
+        return true;
+}
+
+void RlvCommand::initLookupTable()
+{
+        static bool fInitialized = false;
+        if (!fInitialized)
+        {
+                // NOTE: keep this matched with the enumeration at all times
+                std::string arBehaviours[RLV_BHVR_COUNT] =
+                        {
+                                "version", "detach", "sendchat", "emote", "chatshout", "chatnormal", "chatwhisper", "redirchat", "rediremote",
+                                "sendim", "recvchat", "recvemote", "recvim", "tplm", "tploc", "tplure", "sittp", "edit", "rez", "addoutfit",
+                                "remoutfit", "getoutfit", "getattach", "showinv", "viewnote", "unsit", "sit", "sendchannel", "getstatus", "getstatusall",
+                                "getinv", "getinvworn", "findfolder", "findfolders", "attach", "attachall", "detachall", "getpath", "attachthis",
+                                "attachallthis", "detachthis", "detachallthis", "fartouch", "showworldmap", "showminimap", "showloc", "tpto", "accepttp",
+                                "acceptpermission", "shownames", "fly", "getsitid", "setdebug", "setenv", "detachme", "showhovertextall", 
+                                "showhovertextworld", "showhovertexthud", "showhovertext", "notify", "defaultwear", "versionnum", "permissive"
+                        };
+
+                for (int idxBvhr = 0; idxBvhr < RLV_BHVR_COUNT; idxBvhr++)
+                        m_BhvrMap.insert(std::pair<std::string, ERlvBehaviour>(arBehaviours[idxBvhr], (ERlvBehaviour)idxBvhr));
+
+                fInitialized = true;
+        }
+}
+
+// =========================================================================
+// RlvObject
+//
+
+RlvObject::RlvObject(const LLUUID& idObj) : m_UUID(idObj), m_nLookupMisses(0)
+{
+        LLViewerObject* pObj = gObjectList.findObject(idObj);
+        m_fLookup = (NULL != pObj);
+        m_idxAttachPt = (pObj) ? ATTACHMENT_ID_FROM_STATE(pObj->getState()) : 0;
+}
+
+bool RlvObject::addCommand(const RlvCommand& rlvCmd)
+{
+        // Sanity checking
+        if (RLV_TYPE_ADD != rlvCmd.getParamType())
+                return false;
+
+        // Don't add duplicate commands for this object (ie @detach=n followed by another @detach=n later on)
+        for (rlv_command_list_t::iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
+        {
+                if ( (itCmd->getBehaviour() == rlvCmd.getBehaviour()) && (itCmd->getOption() == rlvCmd.getOption()) && 
+                         (itCmd->isStrict() == rlvCmd.isStrict() ) )
+                {
+                        return false;
+                }
+        }
+
+        // Now that we know it's not a duplicate, add it to the end of the list
+        m_Commands.push_back(rlvCmd);
+
+        return true;
+}
+
+bool RlvObject::removeCommand(const RlvCommand& rlvCmd)
+{
+        // Sanity checking
+        if (RLV_TYPE_REMOVE != rlvCmd.getParamType())
+                return false;
+
+        for (rlv_command_list_t::iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
+        {
+                //if (*itCmd == rlvCmd) <- commands will never be equal since one is an add and the other is a remove *rolls eyes*
+                if ( (itCmd->getBehaviour() == rlvCmd.getBehaviour()) && (itCmd->getOption() == rlvCmd.getOption()) && 
+                         (itCmd->isStrict() == rlvCmd.isStrict() ) )
+                {
+                        m_Commands.erase(itCmd);
+                        return true;
+                }
+        }
+        return false;   // Command was never added so nothing to remove now
+}
+
+bool RlvObject::hasBehaviour(ERlvBehaviour eBehaviour, bool fStrictOnly) const
+{
+        for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
+                if ( (itCmd->getBehaviourType() == eBehaviour) && (itCmd->getOption().empty()) && ((!fStrictOnly) || (itCmd->isStrict())) )
+                        return true;
+        return false;
+}
+
+bool RlvObject::hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption, bool fStrictOnly) const
+{
+        for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
+                if ( (itCmd->getBehaviourType() == eBehaviour) && (itCmd->getOption() == strOption) && ((!fStrictOnly) || (itCmd->isStrict())) )
+                        return true;
+        return false;
+}
+
+// Checked: 2009-06-07 (RLVa-0.2.1c)
+std::string RlvObject::getStatusString(const std::string& strMatch) const
+{
+        std::string strStatus, strCmd;
+
+        for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
+        {
+                strCmd = itCmd->asString();
+                if ( (strMatch.empty()) || (std::string::npos != strCmd.find(strMatch)) )
+                {
+                        if (!strStatus.empty())
+                                strStatus.push_back('/');
+                        strStatus += strCmd;
+                }
+        }
+
+        return strStatus;
+}
+
+// ============================================================================
+// RlvWearableItemCollector
+//
+
+// Checked: 2009-05-30 (RLVa-0.2.0e) | Added: RLVa-0.2.0e
+const LLUUID& RlvWearableItemCollector::getFoldedParent(const LLUUID& idFolder) const
+{
+        std::map<LLUUID, LLUUID>::const_iterator itFolder = m_Folding.end(), itCur = m_Folding.find(idFolder);
+        while (itCur != m_Folding.end())
+        {
+                itFolder = itCur;
+                itCur = m_Folding.find(itFolder->second);
+        }
+        return (m_Folding.end() == itFolder) ? idFolder : itFolder->second;
+}
+
+// Checked: 2009-07-29 (RLVa-1.0.1b) | Modified: RLVa-1.0.1b
+bool RlvWearableItemCollector::onCollectFolder(const LLInventoryCategory* pFolder)
+{
+        const LLUUID& idParent = pFolder->getParentUUID();
+        if (m_Wearable.end() == std::find(m_Wearable.begin(), m_Wearable.end(), idParent))
+                return false;                                                                                                                   // Not the child of a wearable folder == skip
+
+        const std::string& strFolder = pFolder->getName();
+        if (strFolder.empty())                                                                                                          // Shouldn't happen but does... naughty Lindens
+                return false;
+
+        #ifdef RLV_EXTENSION_FLAG_NOSTRIP
+                if ( (!m_fAttach) && (-1 != strFolder.find(RLV_FOLDER_FLAG_NOSTRIP)) )  // Don't process "nostrip" folders on detach
+                        return false;
+        #endif // RLV_EXTENSION_FLAG_NOSTRIP
+
+        if (gRlvHandler.isFoldedFolder(pFolder, m_fAttach))                                                     // Check for folder that should get folded under its parent
+        {
+                m_Tentative.push_front(pFolder->getUUID());
+                m_Folding.insert(std::pair<LLUUID, LLUUID>(pFolder->getUUID(), idParent));
+        }
+        else if ( (RLV_FOLDER_PREFIX_HIDDEN != strFolder[0]) && (m_fMatchAll) )         // Collect from any non-hidden child folder for *all
+        {
+                m_Wearable.push_front(pFolder->getUUID());
+                return (idParent == m_idFolder);                                                                                // (Convenience for @getinvworn)
+        }
+        #ifdef RLV_EXPERIMENTAL_COMPOSITES
+        else if ( (RLV_FOLDER_PREFIX_HIDDEN == strFolder[0]) &&                                         // Hidden folder that's a... 
+                          (gRlvHandler.isCompositeFolder(pFolder)) &&                                           // ... composite folder which we...
+                      ((m_fAttach) || (gRlvHandler.canTakeOffComposite(pFolder))) )             // ... attach or can detach (see composite locking)
+        {
+                m_Wearable.push_front(pFolder->getUUID());
+                m_Folding.insert(std::pair<LLUUID, LLUUID>(pFolder->getUUID(), idParent));
+        }
+        #endif // RLV_EXPERIMENTAL_COMPOSITES
+
+        return false;
+}
+
+// Checked: 2009-05-26 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+bool RlvWearableItemCollector::onCollectItem(const LLInventoryItem* pItem)
+{
+        #ifdef RLV_EXTENSION_FLAG_NOSTRIP
+                if ( (!m_fAttach) && (-1 != pItem->getName().find(RLV_FOLDER_FLAG_NOSTRIP)) )   // Don't process "nostrip" items on detach
+                        return false;
+        #endif // RLV_EXTENSION_FLAG_NOSTRIP
+
+        const LLUUID& idParent = pItem->getParentUUID(); bool fRet = false;
+        switch (pItem->getType())
+        {
+                case LLAssetType::AT_BODYPART:
+                        if (!m_fAttach)
+                                break;                                                                                                                                  // Don't process body parts on detach
+                case LLAssetType::AT_CLOTHING:
+                        #ifdef RLV_EXTENSION_FLAG_NOSTRIP
+                                fRet = ( (m_Wearable.end() != std::find(m_Wearable.begin(), m_Wearable.end(), idParent)) ||
+                                                 ( (m_fAttach) && (m_Tentative.end() != std::find(m_Tentative.begin(), m_Tentative.end(), idParent)) &&
+                                                   (gInventory.getCategory(pItem->getParentUUID())->getName() == ".("RLV_FOLDER_FLAG_NOSTRIP")") ) );
+                        #else
+                                fRet = (m_Wearable.end() != std::find(m_Wearable.begin(), m_Wearable.end(), idParent));
+                        #endif // RLV_EXTENSION_FLAG_NOSTRIP
+                        break;
+                case LLAssetType::AT_OBJECT:
+                        fRet = ( (m_Wearable.end() != std::find(m_Wearable.begin(), m_Wearable.end(), idParent)) || 
+                                     (m_Tentative.end() != std::find(m_Tentative.begin(), m_Tentative.end(), idParent)) ) &&
+                                   ( (!m_fAttach) || (gRlvHandler.hasAttachPointName(pItem, true)) );   // Only care about attach point on attach*
+                        break;
+                #ifdef RLV_EXPERIMENTAL_FORCEWEAR_GESTURES
+                case LLAssetType::AT_GESTURE:
+                        fRet = (m_Wearable.end() != std::find(m_Wearable.begin(), m_Wearable.end(), idParent));
+                        break;
+                #endif // RLV_EXPERIMENTAL_FORCEWEAR_GESTURES
+                default:
+                        break;
+        }
+        return fRet;
+}
+
+// Checked: 2009-05-26 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+bool RlvWearableItemCollector::operator()(LLInventoryCategory* pFolder, LLInventoryItem* pItem)
+{
+        // NOTE: this is used for more than was originally intended so only modify if you're sure it won't break something obscure
+        return (pFolder) ? onCollectFolder(pFolder) : ( (pItem) ? onCollectItem(pItem) : false );
+}
+
+// ============================================================================
+// RlvWLSnapshot
+//
+
+// Checked: 2009-06-03 (RLVa-0.2.0h) | Added: RLVa-0.2.0h
+void RlvWLSnapshot::restoreSnapshot(const RlvWLSnapshot* pWLSnapshot)
+{
+        LLWLParamManager* pWLParams = LLWLParamManager::instance();
+        if ( (pWLSnapshot) && (pWLParams) )
+        {
+                pWLParams->mAnimator.mIsRunning = pWLSnapshot->fIsRunning;
+                pWLParams->mAnimator.mUseLindenTime = pWLSnapshot->fUseLindenTime;
+                pWLParams->mCurParams = pWLSnapshot->WLParams;
+                pWLParams->propagateParameters();
+        }
+}
+
+// Checked: 2009-09-16 (RLVa-1.0.3c) | Modified: RLVa-1.0.3c
+RlvWLSnapshot* RlvWLSnapshot::takeSnapshot()
+{
+        // HACK: see RlvExtGetSet::onGetEnv
+        if (!LLFloaterWindLight::isOpen())
+        {
+                LLFloaterWindLight::instance()->close();
+                LLFloaterWindLight::instance()->syncMenu();
+        }
+
+        RlvWLSnapshot* pWLSnapshot = NULL;
+        LLWLParamManager* pWLParams = LLWLParamManager::instance();
+        if (pWLParams)
+        {
+                pWLSnapshot = new RlvWLSnapshot();
+                pWLSnapshot->fIsRunning = pWLParams->mAnimator.mIsRunning;
+                pWLSnapshot->fUseLindenTime = pWLParams->mAnimator.mUseLindenTime;
+                pWLSnapshot->WLParams = pWLParams->mCurParams;
+        }
+        return pWLSnapshot;
+}
+
+// =========================================================================
+// RlvSettings
+//
+
+BOOL RlvSettings::fShowNameTags = FALSE;
+
+BOOL RlvSettings::getEnableWear()
+{
+        return rlvGetSettingBOOL(RLV_SETTING_ENABLEWEAR, TRUE) && (!gRlvHandler.hasBehaviour(RLV_BHVR_DEFAULTWEAR));
+}
+
+#ifdef RLV_EXTENSION_STARTLOCATION
+        // Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.1d
+        void RlvSettings::updateLoginLastLocation()
+        {
+                if (gSavedPerAccountSettings.controlExists(RLV_SETTING_LOGINLASTLOCATION))
+                {
+                        BOOL fValue = (gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)) ||
+                                                  ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) &&
+                                                    (gAgent.getAvatarObject()) && (!gAgent.getAvatarObject()->mIsSitting) );
+                        if (gSavedPerAccountSettings.getBOOL(RLV_SETTING_LOGINLASTLOCATION) != fValue)
+                        {
+                                gSavedPerAccountSettings.setBOOL(RLV_SETTING_LOGINLASTLOCATION, fValue);
+                                gSavedPerAccountSettings.saveToFile(gSavedSettings.getString("PerAccountSettingsFile"), TRUE);
+                        }
+                }
+        }
+#endif // RLV_EXTENSION_STARTLOCATION
+
+// =========================================================================
+// Various helper classes/timers/functors
+//
+
+BOOL RlvGCTimer::tick()
+{
+        bool fContinue = gRlvHandler.onGC();
+        if (!fContinue)
+                gRlvHandler.m_pGCTimer = NULL;
+        return !fContinue;
+}
+
+void RlvCurrentlyWorn::fetchWorn()
+{
+        LLInventoryFetchObserver::item_ref_t idItems;
+
+        // Fetch all currently worn clothing layers and body parts
+        for (int type = 0; type < (int)WT_COUNT; type++)
+        {
+                const LLUUID& idItem = gAgent.getWearableItem((EWearableType)type);
+                if (idItem.notNull())
+                        idItems.push_back(idItem);
+        }
+
+        // Fetch all currently worn attachments
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        if (pAvatar)
+        {
+                for (LLVOAvatar::attachment_map_t::const_iterator itAttach = pAvatar->mAttachmentPoints.begin(); 
+                         itAttach != pAvatar->mAttachmentPoints.end(); ++itAttach)
+                {
+                        const LLUUID& idItem = itAttach->second->getItemID();
+                        if (idItem.notNull())
+                                idItems.push_back(idItem);
+                }
+        }
+
+        RlvCurrentlyWorn f;
+        f.fetchItems(idItems);
+}
+
+// Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0f
+bool RlvSelectHasLockedAttach::apply(LLSelectNode* pNode)
+{
+        return (pNode->getObject()) ? !gRlvHandler.isDetachable(pNode->getObject()) : false;
+}
+
+// Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-0.2.0f
+bool RlvSelectIsOwnedByOrGroupOwned::apply(LLSelectNode* pNode)
+{
+        return (pNode->mPermissions->isGroupOwned()) || (pNode->mPermissions->getOwner() == m_idAgent);
+}
+
+// Checked: 2009-05-31 (RLVa-0.2.0f) | Modified: RLVa-0.2.0f
+bool RlvSelectIsSittingOn::apply(LLSelectNode* pNode)
+{
+        return (pNode->getObject()) && (pNode->getObject()->getRootEdit() == m_pObject);
+}
+
+// ============================================================================
+// Various helper functions
+//
+
+// Checked: 2009-09-08 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
+BOOL rlvAttachToEnabler(void* pParam)
+{
+        // Enables/disables an option on the "Attach to (HUD)" submenu depending on whether it is (un)detachable
+        return gRlvHandler.isDetachable((LLViewerJointAttachment*)pParam);
+}
+
+// Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-0.2.0g
+bool rlvCanDeleteOrReturn()
+{
+        bool fIsAllowed = true;
+
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
+        {
+                // We'll allow if none of the prims are owned by the avie or group owned
+                LLObjectSelectionHandle handleSel = LLSelectMgr::getInstance()->getSelection();
+                RlvSelectIsOwnedByOrGroupOwned func(gAgent.getID());
+                if ( (handleSel.notNull()) && ((0 == handleSel->getRootObjectCount()) || (NULL != handleSel->getFirstRootNode(&func, FALSE))) )
+                        fIsAllowed = false;
+        }
+
+        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (gAgent.getAvatarObject()) )
+        {
+                // We'll allow if the avie isn't sitting on any of the selected objects
+                LLObjectSelectionHandle handleSel = LLSelectMgr::getInstance()->getSelection();
+                RlvSelectIsSittingOn func(gAgent.getAvatarObject()->getRoot());
+                if ( (handleSel.notNull()) && (handleSel->getFirstRootNode(&func, TRUE)) )
+                        fIsAllowed = false;
+        }
+
+        return fIsAllowed;
+}
+
+// Checked: 2009-10-04 (RLVa-1.0.4b) | Modified: RLVa-1.0.4b
+BOOL rlvEnableWearEnabler(void* pParam)
+{
+        // Visually disables the "Enable Wear" option when restricted from toggling it
+        return (!gRlvHandler.hasBehaviour(RLV_BHVR_DEFAULTWEAR));
+}
+
+// Checked: 2009-05-26 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+S32 rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType::EType type)
+{
+        S32 cntType = 0;
+        if (pFolder)
+        {
+                LLInventoryModel::cat_array_t*  pFolders;
+                LLInventoryModel::item_array_t* pItems;
+                gInventory.getDirectDescendentsOf(pFolder->getUUID(), pFolders, pItems);
+
+                if (pItems)
+                {
+                        for (S32 idxItem = 0, cntItem = pItems->count(); idxItem < cntItem; idxItem++)
+                                if (pItems->get(idxItem)->getType() == type)
+                                        cntType++;
+                }
+        }
+        return cntType;
+}
+
+#ifdef RLV_ADVANCED_TOGGLE_RLVA
+        // Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-1.0.0h
+        void rlvToggleEnabled(void*)
+        {
+                gSavedSettings.setBOOL(RLV_SETTING_MAIN, !rlv_handler_t::isEnabled());
+
+                #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
+                        LLStringUtil::format_map_t args;
+                        args["[MESSAGE]"] = llformat("Restrained Life Support will be %s after you restart", 
+                                (rlv_handler_t::isEnabled()) ? "disabled" : "enabled" );
+                        gViewerWindow->alertXml("GenericAlert", args);
+                #else                                                                                           // Version: 1.23.4
+                        LLSD args;
+                        args["MESSAGE"] = llformat("Restrained Life Support will be %s after you restart", 
+                                (rlv_handler_t::isEnabled()) ? "disabled" : "enabled" );
+                        LLNotifications::instance().add("GenericAlert", args);
+                #endif
+        }
+        // Checked: 2009-07-08 (RLVa-1.0.0e)
+        BOOL rlvGetEnabled(void*)
+        {
+                return rlv_handler_t::isEnabled();
+        }
+#endif // RLV_ADVANCED_TOGGLE_RLVA
+
+// =========================================================================
+// Message sending functions
+//
+
+// Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
+void rlvForceDetach(LLViewerJointAttachment* pAttachPt)
+{
+        // Copy/paste from handle_detach_from_avatar()
+        LLViewerObject* attached_object = pAttachPt->getObject();
+        if (attached_object)
+        {
+                gMessageSystem->newMessage("ObjectDetach");
+                gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+                gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+                gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+
+                gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
+                gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, attached_object->getLocalID());
+                gMessageSystem->sendReliable( gAgent.getRegionHost() );
+        }
+}
+
+void rlvSendBusyMessage(const LLUUID& idTo, const std::string& strMsg, const LLUUID& idSession)
+{
+        // (See process_improved_im)
+        std::string strFullName;
+        gAgent.buildFullname(strFullName);
+
+        pack_instant_message(gMessageSystem, gAgent.getID(), FALSE, gAgent.getSessionID(), idTo, strFullName,
+                strMsg, IM_ONLINE, IM_BUSY_AUTO_RESPONSE, idSession);
+        gAgent.sendReliableMessage();
+}
+
+// Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
+bool rlvSendChatReply(S32 nChannel, const std::string& strReply)
+{
+        if (!rlvIsValidReplyChannel(nChannel))
+                return false;
+
+        // Copy/paste from send_chat_from_viewer()
+        LLMessageSystem* msg = gMessageSystem;
+        msg->newMessageFast(_PREHASH_ChatFromViewer);
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->nextBlockFast(_PREHASH_ChatData);
+        msg->addStringFast(_PREHASH_Message, strReply);
+        msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_SHOUT);
+        msg->addS32("Channel", nChannel);
+        gAgent.sendReliableMessage();
+        LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
+
+        return true;
+}
+
+// =========================================================================
+// String helper functions
+//
+
+// Checked: 2009-07-04 (RLVa-1.0.0a)
+void rlvStringReplace(std::string& strText, std::string strFrom, const std::string& strTo)
+{
+        if (strFrom.empty())
+                return;
+
+        size_t lenFrom = strFrom.length();
+        size_t lenTo = strTo.length();
+
+        std::string strTemp(strText);
+        LLStringUtil::toLower(strTemp);
+        LLStringUtil::toLower(strFrom);
+
+        std::string::size_type idxCur, idxStart = 0, idxOffset = 0;
+        while ( (idxCur = strTemp.find(strFrom, idxStart)) != std::string::npos)
+        {
+                strText.replace(idxCur + idxOffset, lenFrom, strTo);
+                idxStart = idxCur + lenFrom;
+                idxOffset += lenTo - lenFrom;
+        }
+}
+
+// Checked: 2009-07-29 (RLVa-1.0.1b) | Added: RLVa-1.0.1b
+std::string rlvGetFirstParenthesisedText(const std::string& strText, std::string::size_type* pidxMatch /*=NULL*/)
+{
+        if (pidxMatch)
+                *pidxMatch = std::string::npos; // Assume we won't find anything
+
+        std::string::size_type idxIt, idxStart; int cntLevel = 1;
+        if ((idxStart = strText.find_first_of('(')) == std::string::npos)
+                return std::string();
+
+        const char* pstrText = strText.c_str(); idxIt = idxStart;
+        while ( (cntLevel > 0) && (idxIt < strText.length()) )
+        {
+                if ('(' == pstrText[++idxIt])
+                        cntLevel++;
+                else if (')' == pstrText[idxIt])
+                        cntLevel--;
+        }
+
+        if (idxIt < strText.length())
+        {
+                if (pidxMatch)
+                        *pidxMatch = idxStart;  // Return the character index of the starting '('
+                return strText.substr(idxStart + 1, idxIt - idxStart - 1);
+        }
+        return std::string();
+}
+
+// Checked: 2009-07-29 (RLVa-1.0.1b) | Added: RLVa-1.0.1b
+std::string rlvGetLastParenthesisedText(const std::string& strText, std::string::size_type* pidxStart /*=NULL*/)
+{
+        if (pidxStart)
+                *pidxStart = std::string::npos; // Assume we won't find anything
+
+        // Extracts the last - matched - parenthesised text from the input string
+        std::string::size_type idxIt, idxEnd; int cntLevel = 1;
+        if ((idxEnd = strText.find_last_of(')')) == std::string::npos)
+                return std::string();
+
+        const char* pstrText = strText.c_str(); idxIt = idxEnd;
+        while ( (cntLevel > 0) && (idxIt >= 0) )
+        {
+                if (')' == pstrText[--idxIt])
+                        cntLevel++;
+                else if ('(' == pstrText[idxIt])
+                        cntLevel--;
+        }
+
+        if ( (idxIt >= 0) && (idxIt < strText.length()) )       // NOTE: allow for std::string::size_type to be signed or unsigned
+        {
+                if (pidxStart)
+                        *pidxStart = idxIt;             // Return the character index of the starting '('
+                return strText.substr(idxIt + 1, idxEnd - idxIt - 1);
+        }
+        return std::string();
+}
+
+// =========================================================================
+// Debug helper functions
+//
+
+// =========================================================================
diff --git a/linden/indra/newview/rlvhelper.h b/linden/indra/newview/rlvhelper.h
new file mode 100644
index 0000000..42d10b8
--- /dev/null
+++ b/linden/indra/newview/rlvhelper.h
@@ -0,0 +1,416 @@
+#ifndef RLV_HELPER_H
+#define RLV_HELPER_H
+
+#include "llboost.h"
+#include "llinventorymodel.h"
+#include "llselectmgr.h"
+#include "llviewercontrol.h"
+#include "llviewerobjectlist.h"
+#include "llwlparamset.h"
+#include "rlvdefines.h"
+
+#ifdef LL_WINDOWS
+        #pragma warning (push)
+        #pragma warning (disable : 4702) // warning C4702: unreachable code
+#endif
+#include <boost/variant.hpp>
+#ifdef LL_WINDOWS
+        #pragma warning (pop)
+#endif
+
+// ============================================================================
+// RlvCommand
+//
+
+class RlvCommand
+{
+public:
+        explicit RlvCommand(const std::string& strCommand);
+
+        /*
+         * Member functions
+         */
+public:
+        std::string        asString() const;
+        const std::string& getBehaviour() const     { return m_strBehaviour; }
+        ERlvBehaviour      getBehaviourType() const { return m_eBehaviour; }
+        const std::string& getOption() const        { return m_strOption; }
+        const std::string& getParam() const         { return m_strParam; }
+        ERlvParamType      getParamType() const     { return m_eParamType; }
+        bool               isStrict() const                     { return m_fStrict; }
+        bool               isValid() const          { return m_fValid; }
+
+        static ERlvBehaviour      getBehaviourFromString(const std::string& strBhvr);
+        static const std::string& getStringFromBehaviour(ERlvBehaviour eBhvr);
+        static bool               hasStrictVariant(ERlvBehaviour eBhvr);
+
+        static void initLookupTable();
+protected:
+        static bool parseCommand(const std::string& strCommand, std::string& strBehaviour, std::string& strOption,  std::string& strParam);
+
+        /*
+         * Operators
+         */
+public:
+        bool operator ==(const RlvCommand&) const;
+
+        /*
+         * Member variables
+         */
+protected:
+        bool            m_fValid;
+        std::string     m_strBehaviour;
+        ERlvBehaviour   m_eBehaviour;
+        bool            m_fStrict;
+        std::string     m_strOption;
+        std::string     m_strParam;
+        ERlvParamType   m_eParamType;
+
+        typedef std::map<std::string, ERlvBehaviour> RlvBhvrTable;
+        static RlvBhvrTable m_BhvrMap;
+
+        friend class RlvHandler;
+};
+typedef std::list<RlvCommand> rlv_command_list_t;
+
+// ============================================================================
+// RlvObject
+//
+
+class RlvObject
+{
+public:
+        RlvObject(const LLUUID& idObj);
+
+        /*
+         * Member functions
+         */
+public:
+        bool addCommand(const RlvCommand& rlvCmd);
+        bool removeCommand(const RlvCommand& rlvCmd);
+
+        std::string getStatusString(const std::string& strMatch) const;
+        bool        hasBehaviour(ERlvBehaviour eBehaviour, bool fStrictOnly) const;
+        bool        hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption, bool fStrictOnly) const;
+
+        const rlv_command_list_t* getCommandList() const { return &m_Commands; }
+
+        /*
+         * Member variables
+         */
+protected:
+        LLUUID             m_UUID;                              // The object's UUID
+        S32                m_idxAttachPt;               // The object's attachment point (or 0 if it's not an attachment)
+        bool               m_fLookup;                   // TRUE if the object existed in gObjectList at one point in time
+        S16                m_nLookupMisses;             // Count of unsuccessful lookups in gObjectList by the GC
+        rlv_command_list_t m_Commands;                  // List of behaviours held by this object (in the order they were received)
+
+        friend class RlvHandler;
+};
+
+// ============================================================================
+// RlvCriteriaCategoryCollector - Criteria based folder matching filter used by @findfolder and @findfolders
+//
+
+class RlvCriteriaCategoryCollector : public LLInventoryCollectFunctor
+{
+public:
+        RlvCriteriaCategoryCollector(const std::string& strCriteria)
+        {
+                std::string::size_type idxIt, idxLast = 0;
+                while (idxLast < strCriteria.length())
+                {
+                        idxIt = strCriteria.find("&&", idxLast);
+                        if (std::string::npos == idxIt)
+                                idxIt = strCriteria.length();
+                        if (idxIt != idxLast)
+                                m_Criteria.push_back(strCriteria.substr(idxLast, idxIt - idxLast));
+                        idxLast = idxIt + 2;
+                }
+        }
+        virtual ~RlvCriteriaCategoryCollector() {}
+
+        virtual bool operator()(LLInventoryCategory* pFolder, LLInventoryItem* pItem)
+        {
+                if ( (!pFolder) || (m_Criteria.empty()) )       // We're only interested in matching folders, we don't care about items
+                        return false;                                                   // (if there are no criteria then we don't want to return a match)
+
+                std::string strFolderName = pFolder->getName();
+                LLStringUtil::toLower(strFolderName);
+
+                if ( (strFolderName.empty()) || (RLV_FOLDER_PREFIX_HIDDEN == strFolderName[0]) )
+                        return false;
+
+                for (std::list<std::string>::const_iterator itCrit = m_Criteria.begin(); itCrit != m_Criteria.end(); ++itCrit)
+                        if (std::string::npos == strFolderName.find(*itCrit))   // Return false on the first mismatch
+                                return false;
+                return true;
+        }
+
+protected:
+        std::list<std::string> m_Criteria;
+};
+
+// ============================================================================
+// RlvWearableItemCollector - Inventory item filter used by attach/detach/attachall/detachall/getinvworn
+//
+
+class RlvWearableItemCollector : public LLInventoryCollectFunctor
+{
+public:
+        RlvWearableItemCollector(const LLUUID& idFolder, bool fAttach, bool fMatchAll)
+                : m_idFolder(idFolder), m_fAttach(fAttach), m_fMatchAll(fMatchAll)
+        {
+                m_Wearable.push_back(idFolder);
+        }
+        virtual ~RlvWearableItemCollector() {}
+
+        virtual bool operator()(LLInventoryCategory* pFolder, LLInventoryItem* pItem);
+
+        const LLUUID& getFoldedParent(const LLUUID& idFolder) const;
+protected:
+        bool         m_fAttach;
+        bool         m_fMatchAll;
+        const LLUUID m_idFolder;
+
+        bool onCollectFolder(const LLInventoryCategory* pFolder);
+        bool onCollectItem(const LLInventoryItem* pItem);
+
+        std::list<LLUUID> m_Tentative;
+        std::list<LLUUID> m_Wearable;
+
+        std::map<LLUUID, LLUUID> m_Folding;
+};
+
+// ============================================================================
+// RlvRetainedCommand
+//
+
+struct RlvRetainedCommand
+{
+public:
+        std::string strObject;
+        LLUUID      idObject;
+        std::string strCmd;
+
+        RlvRetainedCommand(const std::string obj, const LLUUID& uuid, const std::string& cmd) : strObject(obj), idObject(uuid), strCmd(cmd) {}
+private:
+        RlvRetainedCommand();
+};
+typedef std::list<RlvRetainedCommand> rlv_retained_list_t;
+
+// ============================================================================
+// RlvException
+//
+
+typedef boost::variant<std::string, LLUUID, S32, ERlvBehaviour> RlvExceptionOption;
+
+struct RlvException
+{
+public:
+        LLUUID                          idObject;    // UUID of the object that added the exception
+        ERlvBehaviour           eBehaviour;  // Behaviour the exception applies to
+        RlvExceptionOption      varOption;   // Exception data (type is dependent on eBehaviour)
+
+        RlvException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& option) : idObject(idObj), eBehaviour(eBhvr), varOption(option) {}
+private:
+        RlvException();
+};
+
+// ============================================================================
+// RlvWLSnapshot
+//
+
+struct RlvWLSnapshot
+{
+public:
+        static void           restoreSnapshot(const RlvWLSnapshot* pWLSnapshot);
+        static RlvWLSnapshot* takeSnapshot();
+private:
+        RlvWLSnapshot() {}
+
+        bool             fIsRunning;
+        bool             fUseLindenTime;
+        LLWLParamSet WLParams;
+};
+
+// ============================================================================
+// RlvSettings
+//
+
+inline BOOL rlvGetSettingBOOL(const std::string& strSetting, BOOL fDefault)
+{
+        return (gSavedSettings.controlExists(strSetting)) ? gSavedSettings.getBOOL(strSetting) : fDefault;
+}
+inline BOOL rlvGetPerUserSettingsBOOL(const std::string& strSetting, BOOL fDefault)
+{
+        return (gSavedPerAccountSettings.controlExists(strSetting)) ? gSavedPerAccountSettings.getBOOL(strSetting) : fDefault;
+}
+
+class RlvSettings
+{
+public:
+        static BOOL getDebug()                                  { return rlvGetSettingBOOL(RLV_SETTING_DEBUG, FALSE); }
+        static BOOL getForbidGiveToRLV()                { return rlvGetSettingBOOL(RLV_SETTING_FORBIDGIVETORLV, TRUE); }
+
+        static BOOL getEnableWear();
+        static BOOL getHideLockedLayers()               { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDLAYER, FALSE); }               
+        static BOOL getHideLockedAttach()               { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDATTACH, FALSE); }
+        static BOOL getHideLockedInventory()    { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDINVENTORY, FALSE); }
+        static BOOL getShowNameTags()                   { return fShowNameTags; }
+
+        #ifdef RLV_EXTENSION_STARTLOCATION
+                static BOOL getLoginLastLocation()      { return rlvGetPerUserSettingsBOOL(RLV_SETTING_LOGINLASTLOCATION, TRUE); }
+                static void updateLoginLastLocation();
+        #endif // RLV_EXTENSION_STARTLOCATION
+
+        static BOOL fShowNameTags;
+};
+
+// ============================================================================
+// State keeping classes/structure
+//
+
+// ============================================================================
+// Various helper classes/timers/functors
+//
+
+class RlvGCTimer : public LLEventTimer
+{
+public:
+        RlvGCTimer() : LLEventTimer(30.0) {}
+        virtual BOOL tick();
+};
+
+class RlvCurrentlyWorn : public LLInventoryFetchObserver
+{
+public:
+        RlvCurrentlyWorn() {}
+        ~RlvCurrentlyWorn() {}
+        virtual void done() {}
+
+        static void fetchWorn();
+        void fetchItem(const LLUUID& idItem);
+};
+
+struct RlvSelectHasLockedAttach : public LLSelectedNodeFunctor
+{
+        virtual bool apply(LLSelectNode* pNode);
+};
+
+struct RlvSelectIsOwnedByOrGroupOwned : public LLSelectedNodeFunctor
+{
+        RlvSelectIsOwnedByOrGroupOwned(const LLUUID& uuid) : m_idAgent(uuid) {}
+        virtual bool apply(LLSelectNode* pNode);
+        LLUUID m_idAgent;
+};
+
+struct RlvSelectIsSittingOn : public LLSelectedNodeFunctor
+{
+        RlvSelectIsSittingOn(LLXform* pObject) : m_pObject(pObject) {}
+        virtual bool apply(LLSelectNode* pNode);
+        LLXform* m_pObject;
+};
+
+// ============================================================================
+// Various helper functions
+//
+
+BOOL rlvAttachToEnabler(void* pParam);
+bool rlvCanDeleteOrReturn();
+BOOL rlvEnableWearEnabler(void* pParam);
+S32  rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType::EType type);
+bool rlvIsEmote(const std::string& strUTF8Text);
+bool rlvIsValidReplyChannel(S32 nChannel);
+bool rlvIsWearingItem(const LLInventoryItem* pItem);
+
+void rlvForceDetach(LLViewerJointAttachment* pAttachPt);
+void rlvSendBusyMessage(const LLUUID& idTo, const std::string& strMsg, const LLUUID& idSession = LLUUID::null);
+bool rlvSendChatReply(const std::string& strChannel, const std::string& strReply);
+bool rlvSendChatReply(S32 nChannel, const std::string& strReply);
+
+std::string rlvGetFirstParenthesisedText(const std::string& strText, std::string::size_type* pidxMatch = NULL);
+std::string rlvGetLastParenthesisedText(const std::string& strText, std::string::size_type* pidxStart = NULL);
+void        rlvStringReplace(std::string& strText, std::string strFrom, const std::string& strTo);
+
+#ifdef RLV_ADVANCED_TOGGLE_RLVA
+        // "Advanced / RLVa / Enable RLV" menu option
+        void rlvToggleEnabled(void*);
+        BOOL rlvGetEnabled(void*);
+#endif // RLV_ADVANCED_TOGGLE_RLVA
+
+// ============================================================================
+// Debug helper functions
+//
+
+// ============================================================================
+// Inlined class member functions
+//
+
+// Checked: 2009-09-19 (RLVa-1.0.3d)
+inline std::string RlvCommand::asString() const
+{
+        // NOTE: @clear=<param> should be represented as clear:<param>
+        return (m_eParamType != RLV_TYPE_CLEAR)
+                ? (!m_strOption.empty()) ? (std::string(m_strBehaviour)).append(":").append(m_strOption) : (std::string(m_strBehaviour))
+            : (!m_strParam.empty())  ? (std::string(m_strBehaviour)).append(":").append(m_strParam)  : (std::string(m_strBehaviour));
+}
+
+inline bool RlvCommand::operator ==(const RlvCommand& rhs) const
+{
+        // The specification notes that "@detach=n" is semantically identical to "@detach=add" (same for "y" and "rem"
+        return (m_strBehaviour == rhs.m_strBehaviour) && (m_strOption == rhs.m_strOption) &&
+                ( (RLV_TYPE_UNKNOWN != m_eParamType) ? (m_eParamType == rhs.m_eParamType) : (m_strParam == rhs.m_strParam) );
+}
+
+inline void RlvCurrentlyWorn::fetchItem(const LLUUID& idItem)
+{ 
+        if (idItem.notNull()) 
+        {
+                LLInventoryFetchObserver::item_ref_t idItems; 
+                idItems.push_back(idItem);
+                fetchItems(idItems);
+        }
+}
+
+inline bool RlvCommand::hasStrictVariant(ERlvBehaviour eBhvr)
+{
+        switch (eBhvr)
+        {
+                case RLV_BHVR_RECVCHAT:
+                case RLV_BHVR_RECVEMOTE:
+                case RLV_BHVR_RECVIM:
+                case RLV_BHVR_SENDIM:
+                case RLV_BHVR_TPLURE:
+                case RLV_BHVR_SENDCHANNEL:
+                        return true;
+                default:
+                        return false;
+        }
+}
+
+// ============================================================================
+// Inlined helper functions
+//
+
+inline bool rlvIsEmote(const std::string& strUTF8Text)
+{
+        return (strUTF8Text.length() > 4) && ( (strUTF8Text.compare(0, 4, "/me ") == 0) || (strUTF8Text.compare(0, 4, "/me'") == 0) );
+}
+
+// Checked: 2009-09-05 (RLVa-1.0.2a) | Added: RLVa-1.0.2a
+inline bool rlvIsValidReplyChannel(S32 nChannel)
+{
+        return (nChannel > 0) && (CHAT_CHANNEL_DEBUG != nChannel);
+}
+
+// Checked: 2009-08-05 (RLVa-1.0.1e) | Added: RLVa-1.0.0e
+inline bool rlvSendChatReply(const std::string& strChannel, const std::string& strReply)
+{
+        S32 nChannel;
+        return (LLStringUtil::convertToS32(strChannel, nChannel)) ? rlvSendChatReply(nChannel, strReply) : false;
+}
+
+// ============================================================================
+
+#endif // RLV_HELPER_H
diff --git a/linden/indra/newview/rlvmultistringsearch.cpp b/linden/indra/newview/rlvmultistringsearch.cpp
new file mode 100644
index 0000000..0aa9889
--- /dev/null
+++ b/linden/indra/newview/rlvmultistringsearch.cpp
@@ -0,0 +1,196 @@
+#include "llviewerprecompiledheaders.h"
+
+#include "rlvmultistringsearch.h"
+
+// ====================================================================================
+
+#ifndef RLV_LOWORD
+        #define RLV_LOWORD(x)           ( (U16)( ((U32)x) & 0xFFFF) )
+#endif // RLV_LOWORD
+
+#ifndef RLV_HIWORD
+        #define RLV_HIWORD(x)           ( (U16)( (((U32)x) >> 16) & 0xFFFF) )
+#endif // RLV_HIWORD
+
+// ====================================================================================
+
+// (TODO-RLV: oops, forgot I was experimenting with word matching, get rid of that again?)
+#define isLetter(ch) \
+        ( ( (ch >= 'a') && (ch <= 'z') ) || ( (ch >= 'A') && (ch <= 'Z') ) )
+
+RlvMultiStringSearch::RlvMultiStringSearch()
+        : m_FSM(256),   // Start our FSM with room for 256 states (enough for all attachment point names)
+          m_cntState(0)
+{
+}
+
+void RlvMultiStringSearch::addKeyword(const std::string& strKeyword, U16 nParam) {
+        U16 nCurState = 0;      // Always start the loop at state 0
+
+        //
+        // Make sure there are enough unused rows to accomodate the worst case (== strKeyword.length() new states)
+        //
+        size_t nMaxState = m_FSM.getSize();
+        if (m_cntState + strKeyword.length() > nMaxState)
+                // Allocate enough new rows (in batches of 256 rows)
+                m_FSM.resize(nMaxState + ((strKeyword.length() / 256) + 1) * 256);
+
+        //
+        // Walk the string character by character
+        //
+        for (int idxCh = 0, cntCh = strKeyword.length(); idxCh < cntCh; idxCh++) {
+                // Look up the next state for current character
+                unsigned char ch = strKeyword[idxCh];
+                U16 nState = RLV_LOWORD(m_FSM[nCurState][ch]);
+
+                // If we're at the last character in the keyword then set the termination bit
+                if (cntCh - 1 == idxCh)
+                {
+                        // (Only set the termination bit for the state because this keyword might be a substring of another keyword)
+                        m_FSM[nCurState][ch] = (nParam << 16) | (nState | 0x8000);
+                }
+                else if ( (nState & 0x7FFF) == 0 ) // If the new state is 0 then we're creating a new path
+                {
+                        // (Preserve the termination bit because another keyword might be a substring of this one)
+                        nState = ++m_cntState | (nState & 0x8000);
+
+                        // Store the new path in the FSM
+                        //m_FSM[nCurState][ch] = (nParam << 16) | nState;
+                        m_FSM[nCurState][ch] |= nState;
+                }
+
+                nCurState = nState & 0x7FFF; // Mask out the termination bit since we never need it for the current state
+        }
+}
+
+// (Iterating over a "const char*" is *significantly* faster than "std::string")
+bool RlvMultiStringSearch::findNext(const char* pstrText, int idxCh, int cntCh, RlvMultiStringSearchMatch& match, bool fWordMatch) const
+{
+        U16 nCurState = 0;              // Always start the loop at state 0
+        U32 nLastMatch = 0;             // Holds the state of the last (possibly partial) keyword match
+
+        //
+        // Walk the string character by character
+        //
+        for (; idxCh < cntCh; idxCh++)
+        {
+                // Keep track of the current state in case we need to backtrack
+                U16 nPrevState = nCurState;
+
+                // If we're currently in state 0, save the current character index (for backtracking or as keyword index match)
+                if (nCurState == 0)
+                        match.idxMatch = idxCh;
+
+                // Look up the current character in the FSM
+                unsigned char ch = (unsigned char)pstrText[idxCh];
+                U32 nCell = m_FSM[nCurState & 0x7FFF][ch];
+
+                // If the termination bit is set then we found a keyword substring match
+                // If the next state is non-zero then we can't stop yet because the matched keyword might be a substring of another keyword
+                if (nCell & 0x8000)
+                {
+                        if ( 0 == (nCell & 0x7FFF) )
+                        {
+                                // Termination bit with 'next state' equal to 0: matched keyword which isn't also a substring of any other keyword
+                                match.lenMatch = idxCh - match.idxMatch + 1;
+                                match.nParam = RLV_HIWORD(nCell);
+
+                                // Rudimentary word matching: check if the match is a 'word'
+                                if
+                                        ( 
+                                                (!fWordMatch) ||
+                                                (
+                                                        ( (0 == match.idxMatch) || (!isLetter(pstrText[match.idxMatch - 1])) ) && // Start of string OR non-letter
+                                                        ( (!isLetter(pstrText[match.idxMatch + match.lenMatch])) )
+                                                )
+                                        )
+                                {
+                                        return true;
+                                }
+                                
+                                // Not a word, but there's no need to backtrack: we can move on from the character after the current one
+                                nCell = 0;                              // Will set nCurState == 0 further down
+                                match.idxMatch = idxCh; // Makes sure we move on to the next character instead of backtracking
+                        }
+                        else
+                        {
+                                nLastMatch = nCell;
+
+                                // In case it turns out that we need to backtrack and return this match, save the length of this match
+                                match.lenMatch = idxCh - match.idxMatch + 1;
+                        }
+                }
+
+                nCurState = RLV_LOWORD(nCell);
+
+                // If our new state is 0, but our previous state wasn't, then we followed a false lead and need to backtrack
+                if ( (nPrevState != 0) && (nCurState == 0) )
+                {
+                        //   * if nLastMatch == 0 then we need to backtrack and keep going
+                        //   * if nLastMatch != 0 then we previously encountered a keyword match so return that one
+                        if (nLastMatch) {
+                                // Rudimentary word matching: check if the match is a 'word'
+                                if
+                                        ( 
+                                                (!fWordMatch) ||
+                                                (
+                                                        ( (0 == match.idxMatch) || (!isLetter(pstrText[match.idxMatch - 1])) ) && // Start of string OR non-letter
+                                                        ( (!isLetter(pstrText[match.idxMatch + match.lenMatch])) )
+                                                )
+                                        )
+                                {
+                                        match.nParam = RLV_HIWORD(nLastMatch);
+                                        return true;
+                                } else
+                                        // Not a word match, so throw away this partial match and backtrack
+                                        nLastMatch = 0;
+                        }
+
+                        idxCh = match.idxMatch;
+                }
+        }
+
+        // We encountered a match, but while investigating whether it was a substring of another keyword we ran out of characters
+        if (nLastMatch)
+        {
+                // Rudimentary word matching: check if we started at the beginning of a word (we know the one behind us is '\0')
+                if ( (!fWordMatch) || ( (0 == match.idxMatch) || (!isLetter(pstrText[match.idxMatch - 1])) ) )
+                {
+                        match.nParam = RLV_HIWORD(nLastMatch);
+                        return true;
+                }
+        }
+
+        // None of the keywords is contained in the string: return failure
+        match.idxMatch = -1;
+        return false;
+}
+
+bool RlvMultiStringSearch::findLast(const std::string& strText, RlvMultiStringSearchMatch& match) const {
+        RlvMultiStringSearchMatch matchTemp;
+        match.idxMatch = -1;    // (Needed to make the return work in case we don't find anything)
+        matchTemp.lenMatch = 0; // (Needed to make the first loop iteration start at 0)
+        
+        // Iterating over a "const char*" is *significantly* faster than "std::string"
+        const char* pstrText = strText.c_str();
+        int lenText = strText.length();
+
+        while (findNext(pstrText, matchTemp.idxMatch + matchTemp.lenMatch + 1, lenText, matchTemp))
+                match = matchTemp;
+
+        return (match.idxMatch != -1);
+}
+
+std::vector<RlvMultiStringSearchMatch> RlvMultiStringSearch::findAll(const std::string& strText) {
+        std::vector<RlvMultiStringSearchMatch> arMatch;
+
+        RlvMultiStringSearchMatch match;
+        match.lenMatch = 0; // (Needed to make the first loop iteration start at 0)
+        
+        while (findNext(strText, match.idxMatch + match.lenMatch + 1, match))
+                arMatch.push_back(match);
+
+        return arMatch;
+}
+
+// ====================================================================================
diff --git a/linden/indra/newview/rlvmultistringsearch.h b/linden/indra/newview/rlvmultistringsearch.h
new file mode 100644
index 0000000..43b0172
--- /dev/null
+++ b/linden/indra/newview/rlvmultistringsearch.h
@@ -0,0 +1,191 @@
+#ifndef RLV_MULTISTRINGSEARCH_H
+#define RLV_MULTISTRINGSEARCH_H
+
+// ============================================================================
+// Template classes for our state machine (2 dimensional array of type T)
+
+// STL vector
+template<typename T> class RlvMultiStringSearchFSM_STL
+{
+public:
+        /*
+         * Constructor/destructor
+         */
+
+        // Initialize the FSM with an initial capacity of 'nCapacity' states
+        RlvMultiStringSearchFSM_STL(size_t nCapacity)
+        {
+                m_arFSM.reserve(nCapacity);
+
+                T* pT;
+                for (size_t idx = 0; idx < nCapacity; idx++)
+                {
+                        // The width of each row is determined by the alphabet we're using (in this case UTF-8
+                        // so while every character might consist of multiple bytes there are
+                        // still only 256 'columns' in the state machine)
+                        pT = new T[256]();
+
+                        // The above *should* initialize to 0 but since we can't account for every compiler doing it :(
+                        memset(pT, 0, sizeof(T) * 256);
+
+                        m_arFSM.push_back(pT);
+                }
+        };
+
+        ~RlvMultiStringSearchFSM_STL()
+        {
+                // Free any memory we previously allocated
+                for (int idx = 0, cnt = m_arFSM.size(); idx < cnt; idx++)
+                        delete[] m_arFSM[idx];
+        }
+
+        /*
+         * Operators
+         */
+        // ASSERTION: nState < m_arFSM.size() at all times
+        // In other words: do *NOT* go out of bounds on the array (no memory will have allocated for that non-existing state)
+        // (There probably should be a check for that even in release but it seems wasteful, just don't do it :p)
+        inline T* operator[](size_t nState) 
+        {
+                //#ifdef _DEBUG
+                //      assert( nState < m_arFSM.size() );
+                //#endif // _DEBUG
+
+                return m_arFSM[nState]; 
+        }
+        inline const T* operator[](size_t nState) const
+        {
+                //#ifdef _DEBUG
+                //      assert( nState < m_arFSM.size() );
+                //#endif // _DEBUG
+
+                return m_arFSM[nState]; 
+        }
+
+        /*
+         * Public member functions
+         */
+
+        size_t getSize() const { return m_arFSM.size(); }
+
+        void resize(size_t nNewCapacity)
+        {
+                // Get our current capacity (only rows > capacity need memory allocated)
+                size_t nCurCapacity = m_arFSM.capacity();
+
+                // Only expand, never shrink
+                if (nNewCapacity <= nCurCapacity)
+                {
+                        //#ifdef _DEBUG
+                        //      assert(false);
+                        //#endif //_DEBUG
+
+                        return;
+                }
+                m_arFSM.resize(nNewCapacity);
+
+                // For each new state we added, allocate memory for the columns
+                for(size_t idx = nCurCapacity; idx < nNewCapacity; idx++)
+                        // The memset is redundant (or rather *should* be) but since we can't account for every compiler doing it :(
+                        m_arFSM[idx] = (T*)memset(new T[256](), 0, sizeof(T) * 256);
+        }
+
+protected:
+        /*
+         * Member variables
+         */
+        std::vector<T*> m_arFSM;
+};
+
+// ============================================================================
+
+struct RlvMultiStringSearchMatch
+{
+        int idxMatch;   // Starting character index into the string of the matched keyword (-1 if no match)
+        int lenMatch;   // Length of the matched keyword (undefined if no match)
+        U16 nParam;             // User supplied parameter for the matched keyword (undefined if no match)
+
+        RlvMultiStringSearchMatch() : idxMatch(-1) {}
+};
+
+// ============================================================================
+// The actual search class
+
+class RlvMultiStringSearch 
+{
+public:
+        /*
+         * Constructor/destructor
+         */
+        RlvMultiStringSearch();
+        //~RlvMultiStringSearch();
+
+        /*
+         * Public member functions
+         */
+
+        // Add a keyword to the state machine (if it already exists then it will simply overwrite the existing parameter)
+        void addKeyword(const std::string& strKeyword, U16 nParam);
+
+        BOOL getExactMatchParam(const std::string& strText, U16& nParam) const
+        {
+                RlvMultiStringSearchMatch match;
+                if (findFirst(strText, match))
+                {
+                        // We have an exact match if the starting index is 0
+                        // and the length of the match matches the length of the string
+                        if ( (0 == match.idxMatch) && (match.lenMatch == (int)strText.length()) )
+                        {
+                                nParam = match.nParam;
+                                return TRUE;
+                        }
+                }
+
+                return FALSE;   // Fall-through: no (exact) match
+        }
+
+        // Finds the first occurance of any keyword in the supplied string
+        bool findFirst(const std::string& strText, RlvMultiStringSearchMatch& match) const;
+        // Finds the next occurance of any keyword in the supplied string
+        bool findNext(const std::string& strText, int idxCh, RlvMultiStringSearchMatch& match) const;
+        // Finds all occurances of any keyword in the supplied string
+        std::vector<RlvMultiStringSearchMatch> findAll(const std::string& strText);
+        // Finds the last occurance of any keyword in the supplied string (non-optimized)
+        bool findLast(const std::string& strText, RlvMultiStringSearchMatch& match) const;
+
+protected:
+        // Finds the next occurance of any keyword in the supplied string
+        bool findNext(const char* pstrText, int idxCh, int cntCh, RlvMultiStringSearchMatch& match, bool fWordMatch = true) const;
+
+        /*
+         * Member variables
+         */
+        RlvMultiStringSearchFSM_STL<U32> m_FSM; // Our finite state machine (4 bytes * 256 = 1Kb of memory/state)
+                                                                                        // HIWORD(U32) = 16-bits of user data
+                                                                                        // LOWORD(U32) = ABBBBBBBBBBBBBBB
+                                                                                        //              A = termination bit
+                                                                                        //                      If (set) and (B == 0): match
+                                                                                        //                      If (set) and (B != 0): match, but might only be a substring of another keyword
+                                                                                        //              B = next state (0..32767)
+                                                                                        //                      If (B == 0): false lead -> backtrack
+                                                                                        //                      If (B != 0): partial keyword match, next state
+        size_t  m_cntState;                                             // The number of states in the FSM (= the number of *used* rows in the array)
+};
+
+// ============================================================================
+// Inlined member functions
+//
+
+inline bool RlvMultiStringSearch::findFirst(const std::string& strText, RlvMultiStringSearchMatch& match) const
+{
+        return findNext(strText.c_str(), 0, strText.length(), match);
+}
+
+inline bool RlvMultiStringSearch::findNext(const std::string& strText, int idxCh, RlvMultiStringSearchMatch& match) const
+{
+        return findNext(strText.c_str(), idxCh, strText.length(), match);
+}
+
+// ============================================================================
+
+#endif // RLV_MULTISTRINGSEARCH_H
diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index b498b4c..b90f8aa 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -68,11 +68,9 @@
 <TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
 <TextEmbeddedItemColor value="0, 0, 128, 255" />            <!-- Text of items embedded in notecards -->
 <TextDefaultColor value="0, 20, 0, 255"/>                   <!-- Non-keyword text in the script editor -->
-<ScriptBgReadOnlyColor value="100, 100, 100, 255" />        <!-- Not used -->
 <TextLinkColor value="144, 165, 208, 255"/>
 <TextLinkHoverColor value="255, 255, 255, 255"/>
-
-
+  
 <!-- LISTBOXES -->
 <ScrollBgReadOnlyColor value="200, 209, 204, 255" />    <!-- Background of read only lists -->
 <ScrollBgWriteableColor value="200, 209, 204, 255" />   <!-- Background of editable lists, e.g. groups-->
@@ -84,6 +82,7 @@
 <ScrollHighlightedColor value="183, 184, 188, 128" />   <!-- Hover color -->
 <ScrollbarThumbColor value="60, 76, 124, 255" />        <!-- Scroll bar -->
 <ScrollbarTrackColor value="153, 154, 158, 255" />      <!-- Scroll bar background -->
+<ScrollReadOnlyColor value="100, 100, 100, 255" />      <!-- Color for inactive but not disabled lists -->
  
 <!-- MENUS -->
 <MenuBarBgColor value="62, 62, 62, 255" />                  <!-- Menu bar background -->
@@ -163,6 +162,9 @@
 <MapAvatar value="0, 255, 0, 255" />                    <!-- Your avatar's glyph color -->
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
+<MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
+<MapImpDev value="90, 45, 101, 255" />                  <!-- Imprudence developers glyph color -->
+<MapPartner value="214, 40, 107, 255" />                <!-- (unused) Your avatar's partner's glyph color -->
   
   <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
new file mode 100644
index 0000000..f9ea7a2
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/loading.html b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
index 1c62d2f..97174b0 100644
--- a/linden/indra/newview/skins/default/html/en-us/loading/loading.html
+++ b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
@@ -2,7 +2,7 @@
 <table width="100%" height="100%" border="0">
         <tr>
                 <td align="center" valign="middle" style="font-size:0.8em;">
-                        <img src="sl_logo_rotate_black.gif" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...
+                        <img src="imprudence_loading.png" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...
                 </td>
         </tr>
 </table>
diff --git a/linden/indra/newview/skins/default/textures/arrow_left.tga b/linden/indra/newview/skins/default/textures/arrow_left.tga
new file mode 100644
index 0000000..68e6280
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/arrow_left.tga
diff --git a/linden/indra/newview/skins/default/textures/arrow_right.tga b/linden/indra/newview/skins/default/textures/arrow_right.tga
new file mode 100644
index 0000000..7a5a30e
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/arrow_right.tga
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_32.tga
new file mode 100644
index 0000000..aebeab4
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/map_avatar_32.tga
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga
new file mode 100644
index 0000000..65bd056
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga
new file mode 100644
index 0000000..496c44b
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga
new file mode 100644
index 0000000..782207e
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 34c9dea..0a3aee7 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -150,7 +150,6 @@
   
   <texture name="map_avatar_16.tga"/>
   <texture name="map_avatar_8.tga"/>
-  <texture name="map_avatar_you_8.tga"/>
   <texture name="map_event.tga"/>
   <texture name="map_event_mature.tga"/>
   <texture name="map_home.tga"/>
@@ -365,6 +364,9 @@
   <texture name="icn_label_music.tga"/>
   <texture name="icn_label_media.tga"/>
   <texture name="arrow_down.tga"/>
+  <texture name="arrow_up.tga"/>
+  <texture name="arrow_left.tga"/>
+  <texture name="arrow_right.tga"/>
   <texture name="cloud-particle.j2c" use_mips="true"/>
   
   <texture name="skin_thumbnail_default.png" preload="true" />
diff --git a/linden/indra/newview/skins/default/xui/de/floater_about.xml b/linden/indra/newview/skins/default/xui/de/floater_about.xml
index 28785c6..1f7518a 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_about.xml
@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Ãœber Second Life">
         <text_editor name="credits_editor">
-                Second Life wird Ihnen präsentiert von Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl und vielen anderen.
+  The Imprudence Viewer was rocked hard by:
+  Jacek Antonelli, McCabe Maxsted, and Armin Weatherwax. 
+  http://www.imprudenceviewer.org
+  
+  Imprudence is so awesome thanks to contributions from many generous people:
+  
+  For their patches and code contributions, we thank Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Asuka Neely, Balp Allen, Carjay McGinnis, Dale Glass, Felix Duesenburg, Henri Beauchamp, Kitty Barnett, Latif Khalifa, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Nicholaz Beresford, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thomas Shikami, Vadim Bigbear, Zi Ree, and Zwagoth Klaar.
+  
+  For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
+  
+  Thanks also to the developers of the Green Life Emerald Viewer, Hippo Viewer, and Meerkat Viewer for viewer enhancements we have incorporated. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
+  
+  For a complete list of who did what, read the release notes!
+  
+
+  Second Life Copyright (C) 1999-2009 Linden Research Inc.
+  
+        Second Life wird Ihnen präsentiert von Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les und vielen anderen.
 
 Vielen Dank den folgenden Einwohnern, die uns geholfen haben, dies zur bisher besten Version zu machen: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
diff --git a/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
index dd29aa7..327cb02 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_choose_group.xml
@@ -5,4 +5,7 @@
         </text>
         <button label="OK" label_selected="OK" name="OK" />
         <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
+  <string name="none">
+    keine
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/panel_groups.xml b/linden/indra/newview/skins/default/xui/de/panel_groups.xml
index 95a2ef1..a7d6f98 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_groups.xml
@@ -12,4 +12,7 @@
         <button label="Verlassen" name="Leave" />
         <button label="Erstellen..." name="Create" />
         <button label="Suchen..." name="Search..." />
+  <string name="none">
+                keine
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 4a36636..abf45cc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -1,6 +1,2893 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
-        <alert modal="true" name="ConfirmTeleportHome">
+<!-- TODO: Make sure all the Imprudence <= 1.2 alerts get pulled out before this file goes bye-bye. -->
+        <alert modal="true" name="AddFriendWithMessage" title="Add Friend">
+                <message name="message">
+Friends can give permissions to track each
+other on the map and receive online status updates.
+
+Offer friendship to [NAME]?
+                </message>
+                <editline name="editline">
+                        Would you be my friend?
+                </editline>
+                <option name="Offer">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="RemoveFromFriends">
+                <message name="message">
+                        Do you want to remove [FIRST_NAME] [LAST_NAME] from your Friends List?
+                </message>
+                <option name="Remove">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="RemoveMultipleFromFriends">
+                <message name="message">
+                        Do you want to remove multiple friends from your Friends list?
+                </message>
+                <option name="Remove">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="GodDeleteAllScriptedPublicObjectsByUser">
+                <message name="message">
+                        Are you sure you want to delete all scripted objects owned by
+** [AVATAR_NAME] **
+on all others land in this sim?
+                </message>
+                <option name="DELETE!!">
+                        OK
+                </option>
+                <option default="true" name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="GodDeleteAllScriptedObjectsByUser">
+                <message name="message">
+                        Are you sure you want to DELETE ALL scripted objects owned by
+** [AVATAR_NAME] **
+on ALL LAND in this sim?
+                </message>
+                <option name="!!DELETEALL!!">
+                        OK
+                </option>
+                <option default="true" name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="GodDeleteAllObjectsByUser">
+                <message name="message">
+                        Are you sure you want to DELETE ALL objects (scripted or not)
+owned by
+** [AVATAR_NAME] **
+on ALL LAND in this sim?
+                </message>
+                <option name="!!DELETEALL!!">
+                        OK
+                </option>
+                <option default="true" name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="PublishGroupInfoToWeb">
+                <message name="message">
+                        Selecting the &quot;Publish on the Web&quot; option allows us to publish
+the group name, insignia, charter, titles, and founder on the 
+[SECOND_LIFE] website. You are responsible for indicating if any
+of the above content is considered Mature according to the
+Community Standards.
+                </message>
+        </alert>
+        <alert modal="true" name="BlankClassifiedName">
+                <message name="message">
+                        You must specify a name for your classified.
+                </message>
+        </alert>
+        <alert modal="true" name="MinClassifiedPrice">
+                <message name="message">
+                        Price to pay for listing must be at least L$[MIN_PRICE].
+ 
+Please enter a higher price.
+                </message>
+        </alert>
+        <alert modal="true" name="CantLoadVertexShaders">
+                <message name="message">
+                        Unable to load Vertex Shaders.
+                </message>
+        </alert>
+        <alert modal="true" name="ConfirmObjectDeleteLock">
+                <message name="message">
+                        At least one of the items you have selected is locked.
+
+Are you sure you want to delete these items?
+                </message>
+                <option name="Yes">
+                        OK
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmObjectDeleteNoCopy">
+                <message name="message">
+                        At least one of the items you have selected is not copyable.
+
+Are you sure you want to delete these items?
+                </message>
+                <option name="Yes">
+                        OK
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmObjectDeleteNoOwn">
+                <message name="message">
+                        You do not own least one of the items you have selected .
+
+Are you sure you want to delete these items?
+                </message>
+                <option name="Yes">
+                        OK
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmObjectDeleteLockNoCopy">
+                <message name="message">
+                        At least one object is locked.
+At least one object is not copyable.
+
+Are you sure you want to delete these items?
+                </message>
+                <option name="Yes">
+                        OK
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmObjectDeleteLockNoOwn">
+                <message name="message">
+                        At least one object is locked.
+You do not own least one object.
+
+Are you sure you want to delete these items?
+                </message>
+                <option name="Yes">
+                        OK
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmObjectDeleteNoCopyNoOwn">
+                <message name="message">
+                        At least one object is not copyable.
+You do not own least one object.
+
+Are you sure you want to delete these items?
+                </message>
+                <option name="Yes">
+                        OK
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmObjectDeleteLockNoCopyNoOwn">
+                <message name="message">
+                        At least one object is locked.
+At least one object is not copyable.
+You do not own least one object.
+
+Are you sure you want to delete these items?
+                </message>
+                <option name="Yes">
+                        OK
+                </option>
+                <option name="No">
+                        cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmObjectTakeLock">
+                <message name="message">
+                        At least one object is locked.
+
+Are you sure you want to take these items?
+                </message>
+                <option name="Yes">
+                        OK
+                </option>
+                <option default="true" name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmObjectTakeNoOwn">
+                <message name="message">
+                        You do not own all of the objects you are taking.
+If you continue, next owner permissions will be
+applied and possibly restrict your
+ability to modify or copy them.
+
+Are you sure you want to take these items?
+                </message>
+                <option name="Yes">
+                        OK
+                </option>
+                <option default="true" name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmObjectTakeLockNoOwn">
+                <message name="message">
+                        At least one object is locked.
+You do not own all of the objects you are taking.
+If you continue, next owner permissions will be
+applied and possibly restrict your
+ability to modify or copy them.
+However, you can take the current selection.
+
+Are you sure you want to take these items?
+                </message>
+                <option name="Yes">
+                        OK
+                </option>
+                <option default="true" name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="CantBuyLandAcrossMultipleRegions">
+                <message name="message">
+                        Unable to buy land because selection spans multiple regions.
+
+Please select a smaller area and try again.
+                </message>
+        </alert>
+        <alert modal="true" name="DeedLandToGroup">
+                <message name="message">
+                        By deeding this parcel, the group will be required
+to have and maintain sufficient land use credits.
+The purchase price of the land is not refunded to
+the owner. If a deeded parcel is sold, the sale
+price will be divided evenly among group members.
+
+Deed this [AREA] m2 of land to the group
+&apos;[GROUP_NAME]&apos;?
+                </message>
+                <option name="Deed">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="DeedLandToGroupWithContribution">
+                <message name="message">
+                        By deeding this parcel, the group will be required
+to have and maintain sufficient land use credits.
+The deed will include a simultaneous land
+contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.
+The purchase price of the land is not refunded to
+the owner. If a deeded parcel is sold, the sale
+price will be divided evenly among group members.
+ 
+Deed this [AREA] m2 of land to the group
+&apos;[GROUP_NAME]&apos;?
+                </message>
+                <option name="Deed">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="DisplaySetToSafe">
+                <message name="message">
+                        Display settings have been set to safe levels
+because you have specified the -safe option.
+                </message>
+        </alert>
+        <alert modal="true" name="DisplaySetToRecommended">
+                <message name="message">
+                        Display settings have been set to recommended levels
+based on your system configuration.
+                </message>
+        </alert>
+        <alert modal="true" name="UnableToConnect">
+                <message name="message">
+                        Unable to connect to server.
+Could not request domain name: [HOST_NAME]
+                </message>
+        </alert>
+        <alert modal="true" name="CanNotFindServer">
+                <message name="message">
+                        Unable to find the server domain name.
+This could be the result of a lost network connection
+or a server problem.
+
+Please try again in a few minutes, or click Help
+for advice and a link to the system status web page.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Help">
+                        Help
+                </option>
+        </alert>
+        <alert modal="true" name="PleaseSelectServer">
+                <message name="message">
+                        Please select a server.
+Unable to connect to [IP_ADDRESS]
+                </message>
+        </alert>
+        <alert modal="true" name="SystemMayBeDown">
+                <message name="message">
+                        Unable to connect to [SECOND_LIFE]
+The system may be down.
+
+Please try again in a few minutes, or click Help
+for advice and a link to the system status web page.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Help">
+                        Help
+                </option>
+        </alert>
+        <alert modal="true" name="ErrorMessage">
+                <message name="message">
+                        [ERROR_MESSAGE]
+                </message>
+        </alert>
+        <alert modal="true" name="QuickTimeOutOfDate">
+                <ignore name="ignore">
+                        When QuickTime is disabled because it is out of date
+                </ignore>
+                <message name="message">
+                        Streaming video has been disabled because the version of 
+QuickTime installed on your system is out of date. 
+
+Visit http://www.apple.com/quicktime/ and download an update.
+                </message>
+        </alert>
+        <alert modal="true" name="AvatarMoved">
+                <message name="message">
+                        Your [TYPE] location is not currently available. [HELP] 
+You have been moved into a nearby region.
+                </message>
+        </alert>
+        <alert modal="true" name="ClothingLoading">
+                <message name="message">
+                        Your clothing is still downloading. 
+You can use [SECOND_LIFE] normally and other users will see you correctly.
+                </message>
+                <ignore name="ignore">
+                        When clothing is taking a long time to download
+                </ignore>
+        </alert>
+        <alert modal="true" name="FirstRun">
+                <message name="message">
+                        [SECOND_LIFE] installation is complete.
+
+If this is your first time using [SECOND_LIFE], you will need to create
+an account before you can log on.
+Return to www.secondlife.com to create a new account?
+                </message>
+                <option name="NewAccount...">
+                        New Account...
+                </option>
+                <option name="Continue">
+                        Continue
+                </option>
+        </alert>
+        <alert modal="true" name="SetByHostFail">
+                <message name="message">
+                        Unable to connect to server.
+Could not resolve domain name: [HOST_NAME]
+
+Please check your network connection.
+                </message>
+        </alert>
+        <alert modal="true" name="LoginPacketNeverReceived">
+                <message name="message">
+                        We&apos;re having trouble connecting. There may be a problem with your internet connection or the Second Life servers.
+
+You can either check your internet connection and try again in a few minutes, click Help to connect to our support site, or click Teleport to attempt to teleport home.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Help">
+                        Help
+                </option>
+                <option name="Teleport">
+                        Teleport
+                </option>
+        </alert>
+        <alert modal="true" name="WelcomeNoClothes">
+                <message name="message">
+                        Your character will appear in a moment.
+
+Use arrow keys to walk.
+Press the F1 key at any time for help or
+to learn more about [SECOND_LIFE].
+                </message>
+        </alert>
+        <alert modal="true" name="WelcomeChooseSex" nodefault="true">
+                <message name="message">
+                        Your character will appear in a moment.
+
+Use arrow keys to walk.
+Press the F1 key at any time for help or
+to learn more about [SECOND_LIFE].
+Please choose the male or female avatar.
+You can change your mind later.
+                </message>
+                <option name="Male">
+                        Male
+                </option>
+                <option name="Female">
+                        Female
+                </option>
+        </alert>
+        <alert modal="true" name="NotEnoughCurrency">
+                <message name="message">
+                        [NAME] L$ [PRICE] You don&apos;t have enough L$ to do that.
+                </message>
+        </alert>
+        <alert modal="true" name="GrantedModifyRights">
+                <message name="message">
+                        You have been granted the privilege to modify [FIRST_NAME] [LAST_NAME]&apos;s objects.
+                </message>
+        </alert>
+        <alert modal="true" name="RevokedModifyRights">
+                <message name="message">
+                        Your privilege to modify [FIRST_NAME] [LAST_NAME]&apos;s objects has been revoked
+                </message>
+        </alert>
+        <alert modal="true" name="FlushMapVisibilityCaches">
+                <message name="message">
+                        This will flush the map caches on this region.
+This is really only useful for debugging. 
+(In production, wait 5 minutes, then everyone&apos;s map will 
+update after they relog.)
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="OnlyCopyContentsOfSingleItem">
+                <message name="message">
+                        Unable to copy the contents of more than one item at a time.
+Please select only one object and try again.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="KickUsersFromRegion">
+                <message name="message">
+                        Teleport all Residents in this region home?
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="EstateObjectReturn">
+                <message name="message">
+                        Are you sure you want to return objects owned by
+[USER_NAME] ?
+                </message>
+                <option name="Return">
+                        OK
+                </option>
+                <option default="true" name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="InvalidTerrainBitDepth">
+                <message name="message">
+                        Couldn&apos;t set region textures: 
+Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].
+
+Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image
+then click &quot;Apply&quot; again.
+                </message>
+        </alert>
+        <alert modal="true" name="InvalidTerrainSize">
+                <message name="message">
+                        Couldn&apos;t set region textures: 
+Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. 
+
+Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image
+then click &quot;Apply&quot; again.
+                </message>
+        </alert>
+        <alert modal="true" name="RawUploadStarted">
+                <message name="message">
+                        Upload started. It may take up to two minutes, 
+depending on your connection speed.
+                </message>
+        </alert>
+        <alert modal="true" name="ConfirmBakeTerrain">
+                <message name="message">
+                        Do you really want to bake the current terrain, 
+make it the center for terrain raise/lower limits 
+and the default for the &apos;Revert&apos; tool?
+                </message>
+                <option name="Bake">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="MaxAllowedAgentOnRegion">
+                <message name="message">
+                        You can only have [MAX_AGENTS] Allowed Residents.
+                </message>
+        </alert>
+        <alert modal="true" name="MaxBannedAgentsOnRegion">
+                <message name="message">
+                        You can only have [MAX_BANNED] Banned Residents.
+                </message>
+        </alert>
+        <alert modal="true" name="MaxAgentOnRegionBatch">
+                <message name="message">
+                        Failure while attempting to add [NUM_ADDED] agents:
+Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].
+                </message>
+        </alert>
+
+        <alert modal="true" name="MaxAllowedGroupsOnRegion">
+                <message name="message">
+                        You can only have [MAX_GROUPS] Allowed Groups.
+                </message>
+                <option name="Bake">
+                        Bake
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="MaxManagersOnRegion">
+                <message name="message">
+                        You can only have [MAX_MANAGER] Estate Managers.
+                </message>
+        </alert>
+        <alert modal="true" name="OwnerCanNotBeDenied">
+                <message name="message">
+                        Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
+                </message>
+        </alert>
+        <alert modal="true" name="CanNotChangeAppearanceUntilLoaded">
+                <message name="message">
+                        Can&apos;t change appearance until clothing and shape are loaded.
+                </message>
+        </alert>
+        <alert modal="true" name="ClassifiedMustBeAlphanumeric">
+                <message name="message">
+                        The name of your classified must start with a letter 
+from A to Z or a number.  No punctuation is allowed.
+                </message>
+        </alert>
+        <alert modal="true" name="CantSetBuyObject">
+                <message name="message">
+                        Can&apos;t set Buy Object, because the object is not for sale. 
+Please set the object for sale and try again.
+                </message>
+        </alert>
+        <alert modal="true" name="FinishedRawDownload">
+                <message name="message">
+                        Finished download of raw terrain file to: 
+[DOWNLOAD_PATH].
+                </message>
+        </alert>
+        <alert modal="true" name="DownloadWindowsMandatory">
+                <message name="message">
+                        A new version of [SECOND_LIFE] is available.
+[MESSAGE]
+You must download this update to use [SECOND_LIFE].
+                </message>
+                <option name="Download">
+                        Download
+                </option>
+                <option name="Quit">
+                        Quit
+                </option>
+        </alert>
+        <alert modal="true" name="DownloadWindows">
+                <message name="message">
+                        An updated version of [SECOND_LIFE] is available.
+[MESSAGE]
+This update is not required, but we suggest you install it to improve performance and stability.
+                </message>
+                <option name="Download">
+                        Download
+                </option>
+                <option default="true" name="Continue">
+                        Continue
+                </option>
+        </alert>
+        <alert modal="true" name="DownloadWindowsReleaseForDownload">
+                <message name="message">
+                        An updated version of [SECOND_LIFE] is available.
+[MESSAGE]
+This update is not required, but we suggest you install it to improve performance and stability.
+                </message>
+                <option name="Download">
+                        Download
+                </option>
+                <option name="Continue">
+                        Continue
+                </option>
+        </alert>
+        <alert modal="true" name="DownloadMacMandatory">
+                <message name="message">
+                        A new version of [SECOND_LIFE] is available.
+[MESSAGE]
+You must download this update to use [SECOND_LIFE].
+
+Download to your Applications folder?
+                </message>
+                <option name="Download">
+                        Download
+                </option>
+                <option name="Quit">
+                        Quit
+                </option>
+        </alert>
+        <alert modal="true" name="DownloadMac">
+                <message name="message">
+                        An updated version of [SECOND_LIFE] is available.
+[MESSAGE]
+This update is not required, but we suggest you install it to improve performance and stability.
+ 
+Download to your Applications folder?
+                </message>
+                <option name="Download">
+                        Download
+                </option>
+                <option default="true" name="Continue">
+                        Continue
+                </option>
+        </alert>
+        <alert modal="true" name="DownloadMacReleaseForDownload">
+                <message name="message">
+                        An updated version of [SECOND_LIFE] is available.
+[MESSAGE]
+This update is not required, but we suggest you install it to improve performance and stability.
+ 
+Download to your Applications folder?
+                </message>
+                <option name="Download">
+                        Download
+                </option>
+                <option name="Continue">
+                        Continue
+                </option>
+        </alert>
+        <alert modal="true" name="DeedObjectToGroup">
+                <message name="message">
+                        Deeding this object will cause the group to:
+* Receive L$ paid into the object
+                </message>
+                <ignore name="ignore">
+                        When deeding objects to groups
+                </ignore>
+                <option name="Deed">
+                        Deed
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchExternalTarget">
+                <message name="message">
+                        Open your system Web browser to view this content?
+                </message>
+                <ignore name="ignore">
+                        When opening your system browser to view a Web page
+                </ignore>
+                <option name="Open">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchJoinNow">
+                <message name="message">
+                        Go to www.secondlife.com to manage your account?
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to manage your account
+                </ignore>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchBugReport101">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Wiki and Learn how to Report Bugs Correctly.
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view the Bug Reporting 101 Wiki
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchSecurityIssues">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Wiki for Details of How to Report a Security Issue.
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view Security Issues Wiki
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchQAWiki">
+                <message name="message">
+                        Visit the [SECOND_LIFE] QA Wiki.
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view the QA Wiki
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchPublicIssue">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Public Issue Tracker, Where you can Report Bugs and other Issues.
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view the Public Issue Tracker
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchPublicIssueHelp">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view Public Issue Tracker Wiki
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchForums">
+                <message name="message">
+                        Search the [SECOND_LIFE] Knowledge Base for the latest tips and tricks.
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view the knowledge base
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchSupport">
+                <message name="message">
+                        Contact [SECOND_LIFE] Support.
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to contact support
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchImprudenceBlog">
+                <message name="message">
+                        Go to the Official Imprudence Blog, for the Latest News and Information.
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view the blog
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchImprudenceForums">
+                <message name="message">
+                        Go to the Official Imprudence Forums to discuss the Imprudence Project.
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view the forums
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchLSLGuide">
+                <message name="message">
+                        Go to the Scripting Guide for scripting help?
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view the Scripting Guide
+                </ignore>
+                <option name="Gotopage">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchLSLWiki">
+                <message name="message">
+                        Go to the LSL Portal for scripting help?
+                </message>
+                <ignore name="ignore">
+                        When launching web browser to view the LSL Portal
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ReturnToOwner">
+                <message name="message">
+                        Are you sure you want to return the selected
+objects to their owners? Transferable deeded
+objects will be returned to their previous owners.
+
+*WARNING* No-transfer deeded objects will be deleted!
+                </message>
+                <ignore name="ignore">
+                        When returning objects to their owners
+                </ignore>
+                <option name="Return">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="GroupLeaveConfirmOfficer">
+                <message name="message">
+                        You are currently an officer of the group [GROUP].
+Leave Group?
+                </message>
+                <option name="Leave">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="GroupLeaveConfirmMember">
+                <message name="message">
+                        You are currently a member of the group [GROUP].
+Leave Group?
+                </message>
+                <option name="Leave">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="ConfirmKick" unique="true">
+                <message name="message">
+                        Do you REALLY want to kick all users off the grid?
+                </message>
+                <option name="Kick">
+                        Kick All Users
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="MuteLinden">
+                <message name="message">
+                        Sorry, you cannot mute a Linden.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert modal="true" name="MuteByNameFailed" title="Mute object by name failed">
+                <message name="message">
+                        You already have muted this name.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert name="RemoveItemWarn">
+                <message name="message">
+                        Though permitted, deleting contents may damage the
+object. Do you want to delete that item?
+                </message>
+                <option name="Yes">
+                        OK
+                </option>
+                <option default="true" name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="CantRateOwnedByGroup">
+                <message name="message">
+                        Can&apos;t rate this object&apos;s owner, object is owned by a group.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert name="CantOfferCallingCard">
+                <message name="message">
+                        Cannot offer a calling card at this time. Please try again in a moment.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert name="CantOfferFriendship">
+                <message name="message">
+                        Cannot offer friendship at this time. Please try again in a moment.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert name="CantSetHome">
+                <message name="message">
+                        Can&apos;t set home to here.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert name="BusyModeSet">
+                <message name="message">
+                        Busy mode set.
+Chat and instant messages will be hidden. Instant
+messages will get your Busy mode response. All teleportation
+offers will be declined. All inventory offers will go to your
+Trash.
+                </message>
+                <ignore name="ignore">
+                        When setting busy mode
+                </ignore>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert name="NoPVPDetected">
+                <message name="message">
+                        No player vs. player (PvP) abuse detected
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert name="NotecardAttachPermFail">
+                <message name="message">
+                        Only items with unrestricted &apos;next owner&apos; permissions
+can be attached to notecards.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert name="JoinedTooManyGroupsMember">
+                <message name="message">
+                        You are a member of too many groups to join
+another one. Please leave at least one group
+before joining this one, or decline the offer.
+To leave a group select the &apos;Groups..&apos; option
+from the &apos;Edit&apos; menu.
+[NAME] has invited you to join a group as a member.
+[INVITE]
+                </message>
+                <option name="Join">
+                        Join
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+        </alert>
+        <alert name="JoinedTooManyGroupsOfficer">
+                <message name="message">
+                        You are a member of too many groups to join
+another one. Please leave at least one group
+before joining this one, or decline the offer.
+To leave a group select the &apos;Groups..&apos; option
+from the &apos;Edit&apos; menu.
+[NAME] has invited you to join a group as an officer.
+[INVITE]
+                </message>
+                <option name="Join">
+                        Join
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+        </alert>
+        <alert name="KickUser">
+                <message name="message">
+                        Kick this user with what message?
+                </message>
+                <editline name="editline">
+                        An administrator has logged you off.
+                </editline>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="KickAllUsers">
+                <message name="message">
+                        Kick everyone currently on the grid with what message?
+                </message>
+                <editline name="editline">
+                        An administrator has logged you off.
+                </editline>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="FreezeUser">
+                <message name="message">
+                        Freeze this user with what message?
+                </message>
+                <editline name="editline">
+                        You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM).
+                </editline>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="UnFreezeUser">
+                <message name="message">
+                        Unfreeze this user with what message?
+                </message>
+                <editline name="editline">
+                        You are no longer frozen.
+                </editline>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="ExpungeUser">
+                <message name="message">
+                        Enter the agent id of a user to expunge
+                </message>
+                <editline />
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="OfferTeleport">
+                <message name="message">
+                        Offer a teleport to your location with the following message?
+                </message>
+                <editline name="editline">
+                        Join me in [REGION]
+                </editline>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="OfferTeleportFromGod">
+                <message name="message">
+                        God summon user to your location?
+                </message>
+                <editline name="editline">
+                        Join me in [REGION]
+                </editline>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="TeleportFromLandmark">
+                <message name="message">
+                        Are you sure you want to teleport?
+                </message>
+                <ignore name="ignore">
+                        When teleporting from a landmark in inventory
+                </ignore>
+                <option name="Teleport">
+                        Teleport
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="MessageEstate" title="Message everyone in your Estate">
+                <message name="message">
+                        Type a short announcement which will be
+sent to everyone currently in your estate.
+                </message>
+                <editline name="editline" />
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="ChangeLindenEstate" title="Change Linden Estate">
+                <message name="message">
+                        You are about to change a Linden owned estate (mainland, 
+teen grid, orientation, etc.). 
+
+This is EXTREMELY DANGEROUS because it can fundamentally 
+affect the user experience.  On the mainland, it will change 
+thousands of regions and make the spaceserver hiccup.
+ 
+Proceed?
+                </message>
+                <option name="ChangeEstate">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="ChangeLindenAccess" title="Change Linden Estate Access">
+                <message name="message">
+                        You are about to change the access list for a Linden owned 
+estate (mainland, teen grid, orientation, etc.). 
+
+This is DANGEROUS and should only be done to invoke the 
+hack allowing objects/L$ to be transfered in/out of 
+a grid. 
+It will change thousands of regions and make the 
+spaceserver hiccup.
+                </message>
+                <option name="ChangeEstate">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="EstateAllowedAgentAdd" title="Select estate">
+                <message name="message">
+                        Add to allowed list for this estate only or for [ALL_ESTATES]?
+                </message>
+                <option name="ThisEstate">
+                        This Estate
+                </option>
+                <option name="AllEstates">
+                        All Estates
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="EstateAllowedAgentRemove" title="Select estate">
+                <message name="message">
+                        Remove from allowed list for this estate only or for [ALL_ESTATES]?
+                </message>
+                <option name="ThisEstate">
+                        This Estate
+                </option>
+                <option name="AllEstates">
+                        All Estates
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="EstateAllowedGroupAdd" title="Select estate">
+                <message name="message">
+                        Add to group allowed list for this estate only or for [ALL_ESTATES]?
+                </message>
+                <option name="ThisEstate">
+                        This Estate
+                </option>
+                <option name="AllEstates">
+                        All Estates
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="EstateAllowedGroupRemove" title="Select estate">
+                <message name="message">
+                        Remove from group allowed list for this estate only or [ALL_ESTATES]?
+                </message>
+                <option name="ThisEstate">
+                        This Estate
+                </option>
+                <option name="AllEstates">
+                        All Estates
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="EstateBannedAgentAdd" title="Select estate">
+                <message name="message">
+                        Deny access for this estate only or for [ALL_ESTATES]?
+                </message>
+                <option name="ThisEstate">
+                        This Estate
+                </option>
+                <option name="AllEstates">
+                        All Estates
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="EstateBannedAgentRemove" title="Select estate">
+                <message name="message">
+                        Remove this Resident from the ban list for  access for this estate only or for [ALL_ESTATES]?
+                </message>
+                <option name="ThisEstate">
+                        This Estate
+                </option>
+                <option name="AllEstates">
+                        All Estates
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="EstateManagerAdd" title="Select estate">
+                <message name="message">
+                        Add estate manager for this estate only or for [ALL_ESTATES]?
+                </message>
+                <option name="ThisEstate">
+                        This Estate
+                </option>
+                <option name="AllEstates">
+                        All Estates
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="EstateManagerRemove" title="Select estate">
+                <message name="message">
+                        Remove estate manager for this estate only or for [ALL_ESTATES]?
+                </message>
+                <option name="ThisEstate">
+                        This Estate
+                </option>
+                <option name="AllEstates">
+                        All Estates
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="EstateCovenantChange" title="Select estate">
+                <message name="message">
+                        Change Covenant Message for this estate only or for [ALL_ESTATES]?
+                </message>
+                <option name="ThisEstate">
+                        This Estate
+                </option>
+                <option name="AllEstates">
+                        All Estates
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="EstateKickUser" title="Confirm Kick">
+                <message name="message">
+                        Kick [EVIL_USER] from this estate?
+                </message>
+                <option name="Kick">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="EstateChangeCovenant">
+                <message name="message">
+                        Are you sure you want to change the Estate Covenant?
+                </message>
+                <option name="Change">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ProblemImportingEstateCovenant">
+                <message name="message">
+                        Problem importing estate covenant.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert modal="true" name="ProblemAddingEstateManager">
+                <message name="message">
+                        Problems adding a new estate manager.  One or more estates may have a full manager list.
+                </message>
+        </alert>
+        <alert modal="true" name="ProblemAddingEstateGeneric">
+                <message name="message">
+                        Problems adding to this estate list.  One or more estates may have a full list.
+                </message>
+        </alert>
+        <alert modal="true" name="UnableToLoadNotecard">
+                <message name="message">
+                        Unable to load notecard&apos;s asset at this time.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert modal="true" name="NotAllowedToViewNotecard">
+                <message name="message">
+                        Insufficient permissions to view notecard associated with asset ID requested.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert modal="true" name="MissingNotecardAssetID">
+                <message name="message">
+                        Asset ID for notecard is missing from database.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert name="PublishClassified">
+                <message name="message">
+                        Remember: Classified ad fees are non-refundable.
+
+Publish this classified now for L$[AMOUNT]?
+                </message>
+                <option name="Publish">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+  <alert name="SetClassifiedMature">
+    <message name="message">
+Does this classified contain Mature content?
+    </message>
+    <option name="Mature">
+      Yes
+    </option>
+    <option name="Not Mature">
+      No
+    </option>
+    <option name="Cancel">
+      Cancel
+    </option>
+  </alert>
+  <alert name="SetGroupMature">
+    <message name="message">
+Does this group contain Mature content?
+    </message>
+    <option name="Mature">
+      Yes
+    </option>
+    <option name="Not Mature">
+      No
+    </option>
+    <option name="Cancel">
+      Cancel
+    </option>
+  </alert>
+        <alert name="ConfirmRestart" title="Confirm restart">
+                <message name="message">
+                        Do you really want to restart this region in 2 minutes?
+                </message>
+                <option name="Restart">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="MessageRegion" title="Message everyone in this region">
+                <message name="message">
+                        Type a short announcement which will be
+sent to everyone in this region.
+                </message>
+                <editline name="editline" />
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="HelpRegionBlockTerraform" title="Block Terraform">
+                <message name="message">
+                        If this box is checked, land owners will not be able to terraform
+their land regardless of the per-parcel &apos;Edit Terrain&apos; setting.
+
+Default: off
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionBlockFly" title="Block Fly">
+                <message name="message">
+                        If this box is checked, people will not be able to fly in this region
+regardless of the per-parcel &apos;Fly&apos; setting.
+ 
+Default: off
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionAllowDamage" title="Allow Damage">
+                <message name="message">
+                        If this box is checked, the health system across all parcels
+regardless of individual parcel settings. If this box is left
+unchecked, individual parcel owners will still be able to 
+activate the health system on their parcels.
+ 
+Default: off
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionAgentLimit" title="Agent Limit">
+                <message name="message">
+                        Sets the maximum number of avatars allowed in this region.
+Performance may vary depending on the
+number avatars present.
+ 
+Default: 40
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionObjectBonus" title="Object Bonus">
+                <message name="message">
+                        The Object Bonus is a multiplier for primitives allowed on any given
+parcel. The range allowed is 1 to 10. Set at &apos;1&apos;, each 512m2 parcel
+is allowed 117 objects. Set at &apos;2&apos;, each 512m2 parcel is
+allowed 234, or twice as many, and so on. The max number of objects
+allowed per region remains 15,000 no matter what the
+Object Bonus is. Once set, be aware that lowering the Object Bonus may cause objects to be returned or deleted. 
+ 
+Default: 1.0
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionMaturity" title="Maturity">
+                <message name="message">
+                        Sets the maturity of the region, as shown at the top
+                        of the screen and in pop-up tips on the map. This setting
+also affects search results - Residents can choose not to find
+content in Mature regions.
+ 
+It may take some time for this change to be reflected 
+on the map.
+ 
+Default: PG
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionRestrictPushObject" title="Restrict Pushing">
+                <message name="message">
+                        This checkbox sets the full region to restricted push permissions.
+When enabled, Residents may only be pushed by themselves
+or by the parcel&apos;s owner.
+(Push refers to the llPushObject() LSL function.)
+ 
+Default: Off
+                </message>
+        </alert>
+        <alert modal="true" name="HelpParcelChanges" title="Parcel Join/Subdivide">
+                <message name="message">
+                        This checkbox sets whether or not parcels not owned by the estate owner
+can be joined or subdivided. 
+If this option is unchecked:
+ * Only estate owners or managers can join or subdivide parcels. 
+ * They may only join or subdivide parcels belonging to the owner, 
+       or to a group where they have the appropriate group powers.
+If this option is checked:
+ * All parcel owners can join or subdivide the parcels they own. 
+ * For group owned parcels, those with appropriate group powers
+       may join or subdivide parcels.
+ 
+Default: Checked
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionSearch" title="Do Not Show In Search">
+                <message name="message">
+                        Checking this box will block parcel owners from listing their parcels in search
+Default: Off
+                </message>
+        </alert>
+        <alert modal="true" name="HelpParcelSearch" title="Do Not Show In Search">
+                <message name="message">
+                        Checking this box will show:
+- this parcel in search results
+- this parcel&apos;s public objects
+                </message>
+        </alert>
+        <alert modal="true" name="RegionMaturityChange" title="Changed Region Maturity">
+                <message name="message">
+                        The maturity rating for this region has been updated. 
+It may take some time for the change to be 
+reflected on the map.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionLandResell" title="Land Resale">
+                <message name="message">
+                        Estate owners and managers can sell any land owned by the estate owner. 
+If this option is left unchecked, buyers cannot resell their land in this region. 
+If this option is checked, buyers can resell their land in this region. 
+ 
+Default: Disallow
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateCovenantID" title="Covenant Asset ID">
+                <message name="message">
+                        Sets the notecard asset ID for the Estate Covenant belonging to this
+estate. 
+ 
+Default: 00000000-0000-0000-0000-000000000000 or none
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionDisableScripts" title="Disable Scripts">
+                <message name="message">
+                        When sim performance is poor, a script may be to blame. Open the
+Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS.
+If it is lower than 45,  open the Time panel located at the 
+bottom of the Stats Bar. If Script Time reads 25 ms or higher, click 
+the Get Top Scripts button. You will be given the name and location 
+of scripts that may be causing poor performance.
+ 
+Checking the Disable Scripts box and then pressing the Apply 
+button will temporarily disable all scripts in this region. You may 
+need to do this in order to travel to the location of a noted 
+&apos;top script&apos;. Once you have arrived at the location, investigate the 
+script to determine if it is causing the problem. You may want to 
+contact the owner of the script or delete or return the object. 
+Uncheck the Disable Script box and then Apply to reactivate 
+the scripts in the region.
+ 
+Default: off
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionDisableCollisions" title="Disable Collisions">
+                <message name="message">
+                        When sim performance is poor, physical objects may be to blame. 
+Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator 
+Physics FPS.  If it is lower than 45, open the Time panel 
+located at the bottom of the Stats Bar. If Sim Time (Physics) 
+reads 20 ms or higher, click the Get Top Colliders button. 
+You will be given the name and location of physical objects 
+that may be causing poor performance.
+ 
+Checking the Disable Collisions box and then pressing the Apply
+button will temporarily disable object-object collisions. You may 
+need to do this in order to travel to the location of a noted 
+&apos;top collider&apos;. Once you have arrived at the location, investigate the 
+object - is it constantly colliding with other objects? You may want to 
+contact the owner of the object or delete or return the object. 
+Uncheck the Disable Collisions box and then Apply to reactivate 
+collisions in the region.
+ 
+Default: off
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionDisablePhysics" title="Disable Physics">
+                <message name="message">
+                        Disable Physics is similar to Disable Collisions, except all 
+physics simulation is disabled.  This means that not only will 
+objects stop colliding, but avatars will be unable to move. 
+ 
+This should only be used when Disable Collisions does not 
+give back enough performance to the region to investigate 
+a physics problem or Top Collider.
+ 
+Be sure to re-enable physics when you are done, or avatars 
+will continue to be unable to move. 
+ 
+Default: off
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionTopColliders" title="Top Colliders">
+                <message name="message">
+                        Show a list of objects experiencing the greatest number 
+of potential object-object collisions.  These objects can 
+slow performance.  Select View &gt; Statistics Bar and 
+look under Simulator &gt; Time &gt; Sim Time (Physics) to see 
+if more than 20 ms is being spent in physics.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionTopScripts" title="Top Scripts">
+                <message name="message">
+                        Show a list of objects spending the most time running 
+LSL scripts.  These objects can slow performance. 
+Select View &gt; Statistics Bar and look under 
+Simulator &gt; Time &gt; Script Time to see if more than 
+25 ms is being spent in scripts.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionRestart" title="Restart Region">
+                <message name="message">
+                        Restart the server process running this region after a 
+two minute warning.  All Residents in the region will be 
+disconnected.  The region will save its data, and should 
+come back up within 90 seconds. 
+ 
+Restarting the region will not fix most performance 
+problems, and should usually be used only when directed.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionWaterHeight" title="Water Height">
+                <message name="message">
+                        This is the height in meters where water appears. If 
+this setting is anything other than 20 and you have 
+water that is adjacent to the edge of world or &apos;void&apos; 
+water, there will be a visible gap. 
+ 
+Default: 20
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionTerrainRaise" title="Terrain Raise">
+                <message name="message">
+                        This is the distance in meters that parcel owners can raise 
+their terrain above the &apos;baked&apos; terrain default 
+height. 
+ 
+Default: 4
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionTerrainLower" title="Terrain Lower">
+                <message name="message">
+                        This is the distance in meters that parcel owners can lower 
+their terrain below the &apos;baked&apos; terrain default 
+height. 
+ 
+Default: -4
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionUploadRaw" title="Upload RAW Terrain">
+                <message name="message">
+                        This button uploads a .RAW file to the region you are in. 
+The file must have the correct dimensions (RGB, 256x256) 
+and 13 channels.  The best way to create a 
+terrain file is to download the existing RAW file.  A good 
+first step is to modify the red channel (land height), 
+and upload it. 
+ 
+The upload can take up to 45 seconds. Note that uploading a 
+terrain file *will not* move the objects that are on the land, 
+only the terrain itself and the permissions associated with the 
+parcels.  This can result in objects going underground. 
+ 
+For more information on editing region height fields, consult F1 Help.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionDownloadRaw" title="Download RAW Terrain">
+                <message name="message">
+                        This button downloads a file containing the height field data, 
+parcel dimensions, parcel for sale status and some parcel permissions 
+for this region. When opening the file in a program such as 
+Photoshop you must specify the document&apos;s dimensions which 
+are: RGB, 256x256 with 13 channels. This terrain file cannot 
+be opened in any other way. 
+ 
+For more information on editing region height fields, consult F1 help.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionUseEstateSun" title="Use Estate Sun">
+                <message name="message">
+                        This checkbox makes the sun position in this region the 
+same as the sun position in the rest of the estate. 
+ 
+Default: on
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionFixedSun" title="Fixed Sun">
+                <message name="message">
+                        This checkbox sets the sun position to the position 
+in the Phase slider and stops the sun from moving. 
+ 
+Default: off
+                </message>
+        </alert>
+        <alert modal="true" name="HelpRegionBakeTerrain" title="Bake Terrain">
+                <message name="message">
+                        This button saves the current shape of the terrain as the 
+new default for the region. Once baked, the land can revert 
+to the saved shape whenever you or others use the Edit Terrain
+&apos;Revert&apos; option. The baked terrain is also the middle 
+point for the terrain raise and lower limits.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateEstateManager" title="Estate Managers">
+                <message name="message">
+                        An estate manager is a Resident to whom you have delegated 
+control of region and estate settings.  An estate manager 
+can change any setting in these panels, except for uploading, 
+downloading, and baking terrain.  In particular, they can 
+allow or ban Residents from your estate.  
+ 
+Estate managers can only be added or removed by the owner 
+of the estate, not by each other.  Please only choose 
+Residents you trust as estate managers, as you will be 
+ultimately responsible for their actions.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateUseGlobalTime" title="Use Global Time">
+                <message name="message">
+                        This checkbox makes the sun in your estate follow 
+the same position as on the Linden-owned &apos;mainland&apos; 
+estates. 
+ 
+Default: on
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateFixedSun" title="Fixed Sun">
+                <message name="message">
+                        This checkbox sets the sun position to the position 
+in the Phase slider and stops the sun from moving.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateExternallyVisible" title="Public Access">
+                <message name="message">
+                        This checkbox sets whether Residents who are on other estates can enter this
+estate without being on an access list.
+ 
+Default: on
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateAllowDirectTeleport" title="Allow Direct Teleport">
+                <message name="message">
+                        When checked, allows Residents to directly teleport to any 
+point in your estate.  When unchecked, Residents teleport 
+to the nearest telehub. 
+ 
+Default: off
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateAllowResident" title="Allow Access">
+                <message name="message">
+                        Access to this estate will be limited to Residents 
+listed here and any groups below.  This setting is 
+only available when Public Access is 
+unchecked.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateAllowGroup" title="Allow Group Access">
+                <message name="message">
+                        Access to this estate will be limited to groups 
+listed here and any Residents above.  This setting is 
+only available when Public Access is 
+unchecked.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateAbuseEmailAddress" title="Abuse Email Address">
+                <message name="message">
+                        Setting this to a valid email address will cause 
+abuse reports on this estate to be sent to that address. 
+Setting it blank will cause abuse reports to be sent
+only to Linden Lab.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateBanResident" title="Deny Access">
+                <message name="message">
+                        Residents on this list are denied access to your estate, 
+regardless of any other settings.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateVoiceChat" title="Allow Voice Chat">
+                <message name="message">
+                        Parcels in this estate are allowed to have their own voice
+channels in which residents may hear and talk with others
+nearby.
+
+Default: off
+                </message>
+        </alert>
+        <alert modal="true" name="VoiceVersionMismatch" title="Voice Version Mismatch">
+                <message name="message">
+                        This version of Second Life is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update Second Life.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEstateCovenant" title="Estate Covenant">
+                <message name="message">
+                        Setting an estate covenant enables you to sell parcels 
+within that estate. If a covenant is not set, you cannot 
+sell the land. The notecard for your covenant can be empty 
+if you do not wish to apply any rules or advise buyers of 
+anything in relation to the land before they buy it. 
+ 
+A covenant can be used to communicate rules, guidelines, 
+cultural information or simply your own expectations to the 
+prospective buyer. This can include zoning, building regulations, 
+payment options or any other information you feel it is 
+important for the new owner to have seen and to have agreed 
+to before they purchase. 
+ 
+The buyer must agree to the covenant by ticking the check box 
+before they will be able to finish the purchase. Estate 
+covenants are always visible in the About Land dialog for 
+any parcels that have one set.
+                </message>
+        </alert>
+        <alert modal="true" name="BuyObjectOneOnly" title="Can&apos;t Buy Objects">
+                <message name="message">
+                        Unable to buy more than one object at a time. 
+Please select only one object and try again.
+                </message>
+        </alert>
+        <alert modal="true" name="BuyObjectOneOwner" title="Can&apos;t Buy Objects">
+                <message name="message">
+                        Cannot buy objects from different owners at the same time. 
+Please select only one object and try again.
+                </message>
+        </alert>
+        <alert modal="true" name="BuyContentsOneOnly" title="Can&apos;t Buy Contents">
+                <message name="message">
+                        Unable to buy the contents of more than one object at a time. 
+Please select only one object and try again.
+                </message>
+        </alert>
+        <alert modal="true" name="BuyContentsOneOwner" title="Can&apos;t Buy Contents">
+                <message name="message">
+                        Cannot buy objects from different owners at the same time. 
+Please select only one object and try again.
+                </message>
+        </alert>
+        <alert name="PermYes">
+                <message name="message">
+                        Yes
+                </message>
+        </alert>
+        <alert name="PermNo">
+                <message name="message">
+                        No
+                </message>
+        </alert>
+        <alert modal="true" name="BuyOriginal">
+                <message name="message">
+                        Buy original object from [OWNER] for L$[PRICE]?
+You will become the owner of this object.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+                </message>
+                <option name="Buy">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="BuyOriginalNoOwner">
+                <message name="message">
+                        Buy original object for L$[PRICE]?
+You will become the owner of this object.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+                </message>
+                <option name="Buy">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="BuyCopy">
+                <message name="message">
+                        Buy a copy from [OWNER] for L$[PRICE]?
+The object will be copied to your inventory.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+                </message>
+                <option name="Buy">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="BuyCopyNoOwner">
+                <message name="message">
+                        Buy a copy for L$[PRICE]?
+The object will be copied to your inventory.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+                </message>
+                <option name="Buy">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="BuyContents">
+                <message name="message">
+                        Buy contents from [OWNER] for L$[PRICE]?
+They will be copied to your inventory.
+                </message>
+                <option name="Buy">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="BuyContentsNoOwner">
+                <message name="message">
+                        Buy contents for L$[PRICE]?
+They will be copied to your inventory.
+                </message>
+                <option name="Buy">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmPurchase" nodefault="true">
+                <message name="message">
+                        This transaction will:
+[ACTION]
+ 
+Are you sure you want to proceed with this purchase?
+                </message>
+                <option name="Confirm">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmPurchasePassword" nodefault="true">
+                <message name="message">
+                        This transaction will:
+[ACTION]
+ 
+Are you sure you want to proceed with this purchase?
+Please re-enter your password and click OK.
+                </message>
+                <editline />
+                <option name="ConfirmPurchase">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="SetPickLocation">
+                <message name="message">
+                        Note:
+You have updated the location
+of this pick but the other details
+will retain their original values.
+                </message>
+                <option name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert modal="true" name="MoveInventoryFromObject">
+                <message name="message">
+                        You have selected &apos;no copy&apos; inventory items.
+These items will be moved to your inventory, not copied.
+ 
+Move the inventory item(s)?
+                </message>
+                <ignore name="ignore">
+                        When moving no-copy inventory from objects
+                </ignore>
+                <option name="Move">
+                        OK
+                </option>
+                <option name="Don&apos;tMove">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="MoveInventoryFromScriptedObject">
+                <message name="message">
+                        You have selected &apos;no copy&apos; inventory items.  These items 
+will be moved to your inventory, not copied.
+Because this object is scripted, moving these items 
+to your inventory may cause the script to malfunction. 
+ 
+Move the inventory item(s)?
+                </message>
+                <ignore name="ignore">
+                        When moving no-copy inventory from scripted objects
+                </ignore>
+                <option name="Move">
+                        OK
+                </option>
+                <option name="Don&apos;tMove">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="ClickActionNotPayable">
+                <message name="message">
+                        Warning: The Pay Object click action has been set, but it 
+will only work if a script is added with a money() event.
+                </message>
+                <ignore name="ignore">
+                        When Setting &apos;Pay&apos; on objects without money() events
+                </ignore>
+        </alert>
+        <alert modal="true" name="OpenObjectCannotCopy">
+                <message name="message">
+                        There are no items in this object that you are allowed to copy.
+                </message>
+        </alert>
+        <alert modal="true" name="WebLaunchAccountHistory">
+                <message name="message">
+                        Go to the Second Life web site to see your account history?
+                </message>
+                <ignore name="ignore">
+                        When loading account history web page
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ClickOpenF1Help">
+                <message name="message">
+                        Visit the Second Life Support Web site? (note: this is not an Imprudence Help site)
+                </message>
+                <ignore name="ignore">
+                        When visiting the Second Life Support Website.
+                </ignore>
+                <option name="Gotopage">
+                        Go
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="RetryFetchInventoryDescendents">
+                <message name="message">
+                        Inventory fetch from server timed out.  Retry?
+                </message>
+                <ignore name="ignore">
+                        Retry Fetch Inventory Descendents
+                </ignore>
+                <option name="Retry">
+                        Retry
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmQuit">
+                <message name="message">
+                        Are you sure you want to quit?
+                </message>
+                <ignore name="ignore">
+                        When Quitting Second Life.
+                </ignore>
+                <option name="Quit">
+                        Quit
+                </option>
+                <option name="Continue">
+                        Continue
+                </option>
+        </alert>
+        <alert modal="true" name="HelpReportAbuseEmailLL">
+                <message name="message">
+                        Use this tool to report violations of the Terms of Service 
+and Community Standards. See:
+
+http://secondlife.com/corporate/tos.php 
+http://secondlife.com/corporate/cs.php
+
+All reported abuses of the Terms of Service and Community Standards 
+are investigated and resolved. You can view the incident 
+resolution on the Incident Report at:
+
+http://secondlife.com/support/incidentreport.php
+                </message>
+        </alert>
+        <alert modal="true" name="HelpReportAbuseEmailEO">
+                <message name="message">
+                        IMPORTANT: This report will go to the owner of the 
+region you are currently in and not to Linden Lab.
+
+As a service to residents and visitors, the owner of 
+the region you are in has elected to receive and resolve 
+all reports originating in this region. Linden Lab will 
+not investigate reports you file from this location.
+
+The region owner will resolve reports based on the local 
+rules of this region as outlined in the estate Covenant. 
+(View covenants by going to the World menu and selecting 
+About Land.)
+
+The resolution of this report applies only to this Region; 
+Residents access to other areas of Second Life will not be 
+affected by the outcome of this report. Only Linden Lab can 
+restrict access to the entirety of Second Life.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpReportBug">
+                <message name="message">
+                        Use this tool to *only* report technical features that do not perform
+as described or expected, please provide as much detail as possible,
+You may reply to the auto-response email to add more details to your
+report.
+
+All bug reports are investigated and assessed. No email response will be sent.
+
+If you are having a technical difficulty, please contact Support at: 
+
+http://secondlife.com/community/support.php
+
+Note: Incomplete reports will not be investigated
+                </message>
+        </alert>
+        <alert modal="true" name="HelpReportAbuseSelectCategory">
+                <message name="message">
+                        Please select a category for this abuse report.
+Selecting a category helps us file and process abuse reports.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpReportBugSelectCategory">
+                <message name="message">
+                        Please select a category for this bug.
+Selecting a category helps us file and process bug reports.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpReportAbuseAbuserNameEmpty">
+                <message name="message">
+                        Please enter the name of the abuser.
+Entering an accurate value helps us file and process abuse reports.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpReportAbuseAbuserLocationEmpty">
+                <message name="message">
+                        Please enter the location where the abuse took place.
+Entering an accurate value helps us file and process abuse reports.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpReportAbuseSummaryEmpty">
+                <message name="message">
+                        Please enter a summary of the abuse that took place.
+Entering an accurate summary helps us file and process abuse reports.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpReportBugSummaryEmpty">
+                <message name="message">
+                        Please enter a summary of the bug.
+Entering an accurate summary helps us file and process bug reports.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpReportAbuseDetailsEmpty">
+                <message name="message">
+                        Please enter a detailed description of the abuse that took place.
+Be as specific as you can, including names and the details of the
+incident you are reporting.
+Entering an accurate description helps us file and process abuse reports.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpReportBugDetailsEmpty">
+                <message name="message">
+                        Please enter a detailed description of the bug.
+Be as specific as you can, including steps to reproduce the bug
+if possible.
+Entering an accurate description helps us file and process bug reports.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpReportAbuseContainsCopyright">
+                <message name="message">
+                        Dear Resident,
+ 
+You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly:
+
+(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world.
+
+(2) The DMCA or Content Removal Process. To request removal of content from Second Life, you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
+
+If you still wish to continue with the abuse process, please close this window and finish submitting your report.  You may need to select the specific category 'CopyBot or Permissions Exploit'.
+
+Thank you,
+ 
+Linden Lab
+                </message>
+        </alert>
+        <alert modal="true" name="FailedRequirementsCheck">
+                <message name="message">
+                        The following required components are missing from [FLOATER]:
+[COMPONENTS]
+                </message>
+        </alert>
+        <alert name="ReplaceAttachment" title="Replace Existing Attachment">
+                <message name="message">
+                        There is already an object attached to this point on your body.
+Do you want to replace it with the selected object?
+                </message>
+                <ignore name="ignore" save_option="true">
+                        When replacing existing attachments
+                </ignore>
+                <option ignore="Replace Automatically" name="Yes">
+                        OK
+                </option>
+                <option ignore="Never Replace" name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert name="BusyModePay" title="Busy Mode Warning">
+                <message name="message">
+                        You are in Busy Mode, which means you will not
+receive any items offered in exchange for
+this payment.
+ 
+Would you like to leave Busy Mode before
+completing this transaction?
+                </message>
+                <ignore name="ignore" save_option="true">
+                        When paying a person or object in busy mode
+                </ignore>
+                <option ignore="Always leave Busy Mode" name="Yes">
+                        OK
+                </option>
+                <option ignore="Never leave Busy Mode" name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmEmptyTrash">
+                <message name="message">
+                        Are you sure you want to permanently remove
+the contents of your Trash folder?
+                </message>
+                <ignore name="ignore">
+                        When emptying your inventory trash folder
+                </ignore>
+                <option default="true" name="Yes">
+                        OK
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmClearBrowserCache">
+                <message name="message">
+                        Are you sure you want to clear your browser cache?
+                </message>
+                <option default="true" name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmClearCookies">
+                <message name="message">
+                        Are you sure you want to clear your cookies?
+                </message>
+                <option default="true" name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmClearMediaUrlList">
+                <message name="message">
+                        Are you sure you want to clear your list of saved URLs?
+                </message>
+                <option default="true" name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ConfirmEmptyLostAndFound">
+                <message name="message">
+                        Are you sure you want to permanently remove
+the contents of your Lost And Found folder?
+                </message>
+                <ignore name="ignore">
+                        When emptying your inventory Lost And Found folder
+                </ignore>
+                <option default="true" name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+        </alert>
+        <alert modal="true" name="CopySLURL">
+                <message name="message">
+                        The following SLURL has been copied to your clipboard:
+ [SLURL] 
+
+Put it in a web page to give others easy access to this location or
+try it out yourself by pasting it into the address bar of your web browser.
+                </message>
+                <ignore name="ignore">
+                        When copying a SLURL to your clipboard
+                </ignore>
+        </alert>
+        <alert modal="true" name="GraphicsPreferencesHelp">
+                <message name="message">
+                        This panel controls window size and resolution and the quality of the client&apos;s graphics.  The Preferences > Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings:
+
+Shaders: Enable or disable various types of pixel shaders. 
+
+Reflection Detail: Sets the types of objects that water can reflect.
+
+Avatar Rendering: Sets options that affect how the client renders avatars.
+
+Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.
+
+Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.
+
+Post Process Quality: Sets the resolution with which Glow is rendered. 
+
+Mesh Detail: Sets the amount of detail or number of triangles used in rendering certain objects. A higher value takes longer to render, but makes these objects appear with more detail.
+
+Lighting Detail: Selects what types of lights you would like to render.
+
+Terrain Detail: Sets the amount of detail you would like to see for the terrain texture. 
+                </message>
+        </alert>
+        <alert modal="true" name="WLSavePresetAlert">
+                <message name="message">
+                        Do you wish to overwrite the saved preset?
+                </message>
+                <option name="Save">
+                        Yes
+                </option>
+                <option name="Cancel">
+                        No
+                </option>
+        </alert>
+        <alert modal="true" name="WLDeletePresetAlert">
+                <message name="message">
+                        Do you wish to delete [SKY]?
+                </message>
+                <option name="Delete">
+                        Yes
+                </option>
+                <option name="Cancel">
+                        No
+                </option>
+        </alert>
+        <alert modal="true" name="WLNoEditDefault">
+                <message name="message">
+                        You cannot edit or delete a default preset.
+                </message>
+        </alert>
+        <alert modal="true" name="WLMissingSky">
+                <message name="message">
+                        This day cycle file references a missing sky file: [SKY].
+                </message>
+        </alert>
+        <alert modal="true" name="PPSaveEffectAlert">
+                <message name="message">
+                        PostProcess Effect exists. Do you still wish overwrite it?
+                </message>
+                <option name="Save">
+                        Yes
+                </option>
+                <option name="Cancel">
+                        No
+                </option>
+        </alert>
+        <alert modal="true" name="HelpEditSky">
+                <message name="message">
+                        Edit the WindLight sliders to create and save a set of skies.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEditDayCycle">
+                <message name="message">
+                        Set which skies to turn to throughout the day.
+                </message>
+        </alert>
+        <alert modal="true" name="EnvSettingsHelpButton">
+                <message name="message">
+                        These settings adjust the way the environment looks locally on your computer.  Your graphics card needs to support atmospheric shaders in order to have access to all of the settings.
+ 
+Adjust the &quot;Time of Day&quot; slider to change the day&apos;s phase locally on the viewer.
+ 
+Adjust the &quot;Cloud Cover&quot; slider to control how much the clouds cover the sky.
+ 
+Pick a color in the &quot;Water Color&quot; color picker to change the color of the water.
+ 
+Adjust the &quot;Water Fog&quot; slider to control how dense the fog is underwater.
+ 
+Click &quot;Use Estate Time&quot; to reset the time of day to the region&apos;s current time of day and remain linked to it.  
+ 
+Click &quot;Advanced Sky&quot; to bring up an editor with more advanced settings for the sky. 
+ 
+Click &quot;Advanced Water&quot; to bring up an editor with more advanced settings for the water.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpDayCycle">
+                <message name="message">
+                        The Day Cycle Editor gives you control over the sky during Second Life&apos;s day/night cycle. This is the cycle that is used by the Basic Environment Editor&apos;s Time of Day slider.
+
+The Day Cycle Editor works by setting keyframes. These are nodes (represented by the gray blips on the time graph) that have Sky Presets associated with them. As the Time of Day progresses, the WindLight sky &quot;animates&quot; as it interpolates between these keyframes. 
+
+The yellow arrow above the timeline represents your current view, based on Time of Day. Click and drag it to see how your day will animate. You may add or delete keyframes by pressing the Add Key and Delete Key buttons to the right of the timeline.
+
+You can set the time position of a keyframe by either dragging it along the timeline, or by setting its value manually in the Key Frame Settings frame. Within the Key Frame Settings frame, you&apos;ll be able to associate the keyframe with its respective WindLight preset.
+
+Length of Cycle dictates the overall duration of a &quot;day&quot;. Setting this to a low value (for instance, 2 min.) will mean your entire 24-hour timeline will animate in only two real minutes! Once you are satisfied with your timeline and keyframe cycle, use the Play and Stop buttons to preview the results. Remember- you can also move the yellow time-indicator arrow above the timeline to see the cycle animate interactively. Using the Use Estate Time button will synchronize your day length and time of day with the Estate&apos;s day cycle.
+
+Once you are pleased with your Day Cycle, you can save and load it with the Save Test Day and Load Test Day buttons. Note that, for now, we only allow one Day Cycle.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpBlueHorizon">
+                <message name="message">
+                        Use the Red/Green/Blue (RGB) sliders to adjust the color of the sky. You can use the Intensity (I) slider to move all three RGB sliders in unison.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpHazeHorizon">
+                <message name="message">
+                        Haze Horizon is one of the most useful parameters for 
+adjusting overall light exposure in the scene.  It is
+effective for simulating many exposure settings,
+such as white-outs from the sun and darker, 
+closed-iris settings.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpBlueDensity">
+                <message name="message">
+                        Blue Density affects the overall color saturation of the sky and fog. If you move the Intensity (I) slider to the right, colors will become brighter and more vibrant. If you move it all the way to the left, the colors will become duller, eventually fading to black and white. If you want to fine-tune the sky&apos;s color balance, you can control individual elements of saturation by using the Red/Green/Blue (RGB) sliders.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpHazeDensity">
+                <message name="message">
+                        Haze Density controls the level of dull, gray
+haze in the atmosphere.  It is effective for 
+simulating scenes with high levels of smoke
+and man-made pollutants.  It is also effective
+for simulating fog and mist.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpDensityMult">
+                <message name="message">
+                        The Density Multiplier can be used to affect the overall atmospheric density. At lower settings, it creates a feeling of &quot;thin air&quot;, and at higher settings, it creates a very heavy, smoggy effect.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpDistanceMult">
+                <message name="message">
+                        Adjusts WindLight&apos;s perceived distance.  A value of
+zero effectively turns off WindLight&apos;s influence
+on terrain and objects.  Values greater than 1 simulate
+greater distances for thicker atmospheric effects.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpMaxAltitude">
+                <message name="message">
+                        Max Altitude adjusts the altitude calculations WindLight
+performs when computing its atmospheric lighting.  At
+later times of day, it is useful for adjusting how
+&quot;deep&quot; the sunset appears.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpSunlightColor">
+                <message name="message">
+                        Adjusts the color and intensity of the direct light in the scene.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpSunAmbient">
+                <message name="message">
+                        Adjusts the color and intensity of ambient atmospheric light in the scene.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpSunGlow">
+                <message name="message">
+                        The Size slider controls the size of the sun.
+The Focus slider controls how blurred the sun 
+is over the sky.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpSceneGamma">
+                <message name="message">
+                        Adjust the screen&apos;s distribution of light and dark.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpStarBrightness">
+                <message name="message">
+                        Adjusts the brightness of the stars in the sky.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpTimeOfDay">
+                <message name="message">
+                        Controls the location of the sun in the sky.  
+Similar to elevation.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpEastAngle">
+                <message name="message">
+                        Controls the location of the sun in the sky.  
+Similar to azimuth.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpCloudColor">
+                <message name="message">
+                        Edits the color of the clouds.  It is generally
+recommended to keep it whitish,
+but hey, have fun if you want.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpCloudDetail">
+                <message name="message">
+                        Controls the detail image layered on top
+of the main cloud image.  X and Y control
+its position.  D (Density) controls how puffy or 
+fractured the clouds appear.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpCloudDensity">
+                <message name="message">
+                        Allows you to control the position of the clouds
+with the X and Y sliders and how dense they are
+with the the D slider.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpCloudCoverage">
+                <message name="message">
+                        Controls how much the clouds cover the sky.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpCloudScale">
+                <message name="message">
+                        Controls the scaling of the cloud image on the sky dome.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpCloudScrollX">
+                <message name="message">
+                        Controls the speed of the clouds as they move in the X direction.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpCloudScrollY">
+                <message name="message">
+                        Controls the speed of the clouds as they move in the Y direction.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpClassicClouds">
+                <message name="message">
+                        Check this box to enable rendering of Second Life&apos;s older classic clouds in addition to WindLight&apos;s clouds.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterFogColor">
+                <message name="message">
+                        Chooses the color of the underwater fog.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterFogDensity">
+                <message name="message">
+                        Controls how dense the water fog is and how far you can see underwater.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpUnderWaterFogMod">
+                <message name="message">
+                        Modifies the effect of the Fog Density Exponent to control how far you can see when your avatar is underwater.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterGlow">
+                <message name="message">
+                        Controls how much the surface of the water glows.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterNormalScale">
+                <message name="message">
+                        Controls the scaling of the three wavelets that make up the water.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterFresnelScale">
+                <message name="message">
+                        Controls how much light is reflected at different angles.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterFresnelOffset">
+                <message name="message">
+                        Controls how much light intensity is reflected.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterScaleAbove">
+                <message name="message">
+                        Controls how much light is refracted from looking above the surface of the water.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterScaleBelow">
+                <message name="message">
+                        Controls how much light is refracted from looking from below the surface of the water.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterBlurMultiplier">
+                <message name="message">
+                        Controls how waves and reflections are mixed.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterNormalMap">
+                <message name="message">
+                        Controls what normal map is layered across the water to determine reflections/refractions.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterWave1">
+                <message name="message">
+                        Controls where and how fast the large scaled version of the normal map moves in the X and Y direction.
+                </message>
+        </alert>
+        <alert modal="true" name="HelpWaterWave2">
+                <message name="message">
+                        Controls where and how fast the the small scaled version of the normal map moves in the X and Y direction.
+                </message>
+        </alert>
+        <alert name="NewSkyPreset">
+                <message name="message">
+                        Give me a name for the new sky.
+                </message>
+                <editline name="editline">
+                        New Preset
+                </editline>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ExistsSkyPresetAlert">
+                <message name="message">
+                        Preset already exists!
+                </message>
+        </alert>
+        <alert name="NewWaterPreset">
+                <message name="message">
+                        Give me a name for the new water preset.
+                </message>
+                <editline name="editline">
+                        New Preset
+                </editline>
+                <option name="OK">
+                        OK
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="ExistsWaterPresetAlert">
+                <message name="message">
+                        Preset already exists!
+                </message>
+        </alert>
+        <alert modal="true" name="WaterNoEditDefault">
+                <message name="message">
+                        You cannot edit or delete a default preset.
+                </message>
+        </alert>
+        <alert modal="true" name="ChatterBoxSessionStartError">
+                <message name="message">
+                        Unable to start a new chat session with [RECIPIENT].
+[REASON]
+                </message>
+                <option default="true" name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert modal="true" name="ChatterBoxSessionEventError">
+                <message name="message">
+                        [EVENT]
+[REASON]
+                </message>
+                <option default="true" name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert modal="true" name="ForceCloseChatterBoxSession">
+                <message name="message">
+                        Your chat session with [NAME] must close.
+[REASON]
+                </message>
+                <option default="true" name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert modal="true" name="Cannot_Purchase_an_Attachment">
+                <message name="message">
+                        Items may not be purchased while
+they are part of an attachment.
+                </message>
+        </alert>
+        <alert modal="true" name="DebitPermissionDetails"
+             title="About Requests for the Debit Permission">
+                <message name="message">
+                        Granting this request gives a script ongoing permission to take Linden dollars (L$) from your account. To revoke this permission, the object owner must delete the object or reset the scripts in the object.
+                </message>
+                <option default="true" name="OK">
+                        OK
+                </option>
+        </alert>
+        <alert modal="true" name="AutoWearNewClothing">
+                <message name="message">
+                        Would you like to automatically wear the clothing item you create?
+                </message>
+                <ignore name="ignore">
+                        Automatically wear new clothing
+                </ignore>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+        </alert>
+        <alert modal="true" name="BadURL">
+                <message name="message">
+                        Second Life doesn&apos;t know how to handle the link:
+ [SLURL]
+Most links are similar to this:
+
+secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-
+fd37083abc4c/about
+
+Please check the spelling and try again.
+                </message>
+        </alert>
+        <alert modal="true" name="NotAgeVerified">
+                <message name="message">
+                        You need to be age-verified in order to access this parcel.
+Would you like to visit the Second Life website to verify your age?
+
+[_URL]
+                </message>
+                <ignore name="ignore">
+                        Warn about lack of age verification
+                </ignore>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+                <url option="0">
+                        https://secondlife.com/account/verification.php
+                </url>
+        </alert>
+        <alert modal="true" name="Cannot enter parcel: no payment info on file">
+                <message name="message">
+                        This parcel requires that you have payment information on file before you can access it.
+Would you like to visit the Second Life website to set this up?
+
+[_URL]
+                </message>
+                <ignore name="ignore">
+                        Warn about lack of payment info
+                </ignore>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+                <url option="0">
+                        https://secondlife.com/account/
+                </url>
+        </alert>
+        <alert modal="true" name="MissingString">
+                <message name="message">
+                        The string [STRING_NAME] is missing from strings.xml
+                </message>
+        </alert>
+
+  <alert modal="true" name="ConfirmAutoPilot">
+    <message name="message">
+      Are you sure you want to move here?
+    </message>
+    <ignore name="ignore">
+      When using auto-pilot
+    </ignore>
+    <option name="Move">
+      Move
+    </option>
+    <option name="Cancel">
+      Cancel
+    </option>
+  </alert>
+  
+  <alert modal="true" name="ConfirmDoubleClickTP">
+    <message name="message">
+      Are you sure you want to teleport here?
+    </message>
+    <ignore name="ignore">
+      When double-click teleporting
+    </ignore>
+    <option name="Teleport">
+      Teleport
+    </option>
+    <option name="Cancel">
+      Cancel
+    </option>
+  </alert>
+
+  <alert modal="true" name="ConfirmTeleportHome">
                 <message name="message">
                         Are you sure you want to teleport home?
                 </message>
@@ -98,5 +2985,31 @@ WARNING: Don't restore if you aren't sure where the object will go!
                         Cancel
                 </option>
         </alert>
+  <alert modal="true" name="IMLogNotFound">
+    <message name="message">
+      IM history could not be found for [NAME].
+    </message>
+    <option name="OK">
+      OK
+    </option>
+  </alert>
+
+  <!-- [RLVa:KB] -->
+        <alert modal="true" name="FirstRLVGiveToRLV">
+                <message name="message">
+Folders starting with &apos;#RLV/~&apos; can automatically be placed under your #RLV shared folder after you accept the inventory offer.
+
+Please note that - if enabled - the accepted inventory items will instantly be available to scripts and will have full use of the RLV API which may cause unexpected or undesirable situations.
+
+Do you want to enable this feature?
+                </message>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+  </alert>
+  <!-- [/RLVa:KB] -->
 </alerts>
 <!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 5418364..c26d7ae 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -7,7 +7,24 @@
              follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
   max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
   word_wrap="true">
-  Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
+  The Imprudence Viewer was rocked hard by:
+  Jacek Antonelli, McCabe Maxsted, and Armin Weatherwax. 
+  http://www.imprudenceviewer.org
+  
+  Imprudence is so awesome thanks to contributions from many generous people:
+  
+  For their patches and code contributions, we thank Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Asuka Neely, Balp Allen, Carjay McGinnis, Dale Glass, Felix Duesenburg, Henri Beauchamp, Kitty Barnett, Latif Khalifa, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Nicholaz Beresford, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thomas Shikami, Vadim Bigbear, Zi Ree, and Zwagoth Klaar.
+  
+  For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
+  
+  Thanks also to the developers of the Green Life Emerald Viewer, Hippo Viewer, and Meerkat Viewer for viewer enhancements we have incorporated. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
+  
+  For a complete list of who did what, read the release notes!
+  
+
+  Second Life Copyright (C) 1999-2009 Linden Research Inc.
+  
+  Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
 
   Thank you to the following residents for helping to ensure that this is the best version yet: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, 
 Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, 
@@ -39,7 +56,11 @@ Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft
   Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
 
 
+  I get by with a little help from my friends. --Richard Starkey</text_editor>
   To be a success in business, be daring, be first, be different. --Henry Marchant</text_editor>
+  Begin, be bold and venture to be wise. -- Horace
+
+  If you don't like something, change it. If you can't change it, change your attitude. -- Maya Angelou </text_editor>
 
         <text_editor bottom_delta="174" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
new file mode 100644
index 0000000..be7de86
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+        name="animation list"
+        title="Animation List"
+        can_resize="true"
+        can_minimize="true"
+        can_close="true"
+        can_drag_on_left="false"
+    rect_control="FloaterAnimationListRect"
+        min_width="1000"
+        min_height="275"
+        >
+        <scroll_list
+                    name="animation_list"
+                    left="10"
+                    right="-10"
+                    top="-20"
+                    bottom="100"
+                    column_padding="0"
+                    can_resize="true"
+                    follows="left|top|bottom|right"
+                    draw_heading="true"
+                    multi_select="true"
+                    search_column="1"
+                    tool_tip="Hold shift or control while clicking to select multiple thingers"
+                    >
+                <!-- Icons relating to the avatar, currently: tracking, and marked -->
+                <column name="Anim Name" label="Anim Name" width="250"/>
+    <column name="Animation UUID" label="Animation UUID" width="250"/>
+    <!--<column name="object_name" label="Distance" dynamicwidth="true"/>-->
+                <column name="Source Object UUID" label="Source Object UUID" width="250"/>
+    <column name="Source Owner" label="Source Owner" width="250"/>
+    <!-- What the avatar is doing: producing sounds, rezzing, particles, etc -->
+        </scroll_list>
+        <panel 
+               name="options"
+               left="10"
+               right="-10"
+         top="90"       
+               bottom="10"      
+               border="true"
+               mouse_opaque="true"
+               bevel_style="in"
+               background_visible="true"
+               background_opaque="true"
+               follows="left|right|bottom"
+               bg_opaque_color="0,0,0,0.3"
+               bg_alpha_color="blue"
+               can_resize="false"
+        >
+        </panel>
+
+  <button bottom="55" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Stop Selected" left_delta="5"
+       mouse_opaque="true" name="Stop Selected"
+       tool_tip="Stop selected animations" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Revoke Selected" left_delta="155"
+       mouse_opaque="true" name="Revoke Selected"
+       tool_tip="Revokes animation permissions for object associated with the selections" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Stop+Revoke Selected" left_delta="155"
+       mouse_opaque="true" name="Stop+Revoke Selected"
+       tool_tip="Revokes animation permissions for object(s) associated with the selections, as well as stopping the anim" width="150" />
+  <button bottom_delta="0" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Open Owner Profile" left_delta="155"
+       mouse_opaque="true" name="Open Owner Profile"
+       tool_tip="Opens profile of the owner(s) of object(s) associated with the selections" width="150" />
+  <button bottom_delta="-25" enabled="false" follows="left|bottom" font="SansSerifSmall" halign="center"
+       height="20" label="Return Object" left_delta="-465"
+       mouse_opaque="true" name="Return Object"
+       tool_tip="Returns object(s) selected, if you have land powers" width="150" />
+
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
new file mode 100644
index 0000000..13c6b6c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+
+<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" enabled="true" follows="left|bottom" height="620"
+     hidden="false" left="300" min_height="420" min_width="630"
+     mouse_opaque="true" name="asset browser" title="Asset Browser" width="720">
+        
+        <inventory_panel allow_multi_select="false" border="true" bottom="-299" enabled="true"
+             follows="left|top" height="280" hidden="false" left="10"
+             mouse_opaque="true" name="inventory panel"
+             sort_order="TexturePickerSortOrder" width="231"/>
+
+        <button bottom="-350" follows="left|top" font="SansSerifSmall"
+                halign="center" height="20" hidden="false" label="Next &gt;&gt;"
+                left="160" mouse_opaque="true" name="button next" scale_image="TRUE"
+                width="80"/>
+                
+        <button bottom_delta="-30" follows="left|top" font="SansSerifSmall" 
+                halign="center" height="20" hidden="false" label="&lt;&lt; Previous"
+                left_delta="0" mouse_opaque="true" name="button previous" scale_image="TRUE"
+                width="80"/>
+                
+        <button bottom_delta="-30" follows="left|top" font="SansSerifSmall" 
+                halign="center" height="20" hidden="false" label="Refresh"
+                left_delta="0" mouse_opaque="true" name="button refresh" scale_image="TRUE"
+                width="80"/>
+                
+</floater>
+
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index 2a60a3b..e86bf71 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false"
+<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="true" can_tear_off="true" enabled="true" height="270" left="15"
      min_height="150" min_width="425" mouse_opaque="true" name="chat floater"
      rect_control="FloaterChatRect" title="Local Chat" width="435">
@@ -100,10 +100,14 @@
                         <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
                              tab_group="1" top="25">
         <string name="gesture_label">Gestures</string>
+        <spinner bottom="-22" decimal_digits="0" follows="left|bottom" height="20"
+             increment="1.00" initial_val="0" label="Channel" label_width="50" left="0"
+             max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
+             width="100" tool_tip="Set the default channel for inworld chat"/>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
                                      enabled="true" follows="left|right|bottom" font="SansSerif"
                                      handle_edit_keys_directly="false" height="20" label="Click here to chat."
-                                     left="0" max_length="254" mouse_opaque="true" name="Chat Editor"
+                                     left="105" max_length="254" mouse_opaque="true" name="Chat Editor"
                                      right="-70" select_all_on_focus_received="false" select_on_focus="false"
                                      tab_group="1" />
                                 <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chatterbox_vertical.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chatterbox_vertical.xml
new file mode 100644
index 0000000..8b1f41b
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chatterbox_vertical.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+     height="390" name="floater_chatterbox"
+     rect_control="ChatterboxRect" title="Communicate" width="392">
+  <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"
+             name="chatterbox_tabs" tab_position="left" tab_width="126" width="395" />
+  <string name="unread_count_string_singular">
+    Unread IM
+  </string>
+  <string name="unread_count_string_plural">
+    Unread IMs
+  </string>
+</multi_floater>
+
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
index 02001e9..f438262 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_choose_group.xml
@@ -18,4 +18,7 @@
         <button bottom="-236" font="SansSerif" halign="center" height="20" label="Cancel"
              label_selected="Cancel" left_delta="88" mouse_opaque="true" name="Cancel"
              width="80" />
+  <string name="none">
+    none
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
index b97b1e4..a8f699a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_customize.xml
@@ -1121,4 +1121,27 @@ scratch and wear it.
              height="20" label="Make Outfit..." label_selected="Make Outfit..."
              mouse_opaque="true" name="Make Outfit" left="100" scale_image="true"
              width="100" />
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom="-400" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left="8" mouse_opaque="true" name="AvatarHeightText" v_pad="0" width="140">
+    Avatar Height:
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left="8" mouse_opaque="true" name="HeightText" v_pad="0" width="140">
+    Avatar Height
+  </text>
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left="8" mouse_opaque="true" name="HeightText2" v_pad="0" width="140">
+    Avatar Height2
+  </text>
+
+  <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Export" label_selected="Export" right="-280" mouse_opaque="true" name="Export" scale_image="true" width="80" />
+  <button bottom="-536" follows="right|bottom" font="SansSerif" halign="center" height="20" hidden="false" label="Import" label_selected="Import" right="-370" mouse_opaque="true" name="Import" scale_image="true" width="80" />
+
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index df9657c..a600c86 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="570" min_height="570" min_width="780"
+     can_resize="true" height="590" min_height="590" min_width="780"
      name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
      width="780">
-        <tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
+        <tab_container bottom="-590" follows="left|top|right|bottom" height="570" left="0"
              mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="All" left="1" mouse_opaque="false" name="find_all_panel" width="778">
                         <string name="searching_text">
                                 Searching...
@@ -84,7 +84,7 @@
                         </string>
       <string name="default_search_page">"http://secondlife.com/app/search/index.php?"</string>
     </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
                      name="classified_panel" width="778">
                         <string name="searching_text">
@@ -159,7 +159,7 @@
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Delete" label_selected="Delete" left="80"
                              mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" 
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true" 
                                  draw_heading="true" follows="left|top|right|bottom" height="450" left="4" 
                                  mouse_opaque="true" multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
@@ -178,8 +178,8 @@
                              height="20" label="&lt; Prev" label_selected="&lt; Prev"
                              mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                 </panel>
-                <panel border="true" bottom="-549" default_tab_group="1"
-                     follows="left|top|right|bottom" height="533" label="Events" left="1"
+                <panel border="true" bottom="-569" default_tab_group="1"
+                     follows="left|top|right|bottom" height="553" label="Events" left="1"
                      mouse_opaque="false" name="events_panel" width="778">
                         <string name="searching_text">
                                 Searching...
@@ -285,8 +285,8 @@
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
                              height="20" label="Delete" label_selected="Delete" left="80"
                              mouse_opaque="true" name="Delete" width="80" />
-                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
-                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true" draw_heading="true" 
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
@@ -306,7 +306,7 @@
                              height="20" label="&lt; Prev" label_selected="&lt; Prev"
                              mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                 </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="Showcase" left="1" mouse_opaque="false" name="showcase_panel"
                      width="778">
         <string name="searching_text">Searching...</string>
@@ -338,7 +338,7 @@
         <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
         <string name="default_search_page">"http://secondlife.com/app/showcase/index.php?"</string>
     </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
                      width="778" default_tab_group="1">
                         <string name="searching_text">
@@ -411,8 +411,8 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left="208" mouse_opaque="true"
                              name="Search" tab_group="5" width="70" />
-                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
-                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true" draw_heading="true" 
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" tab_group="10" width="387">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
@@ -433,7 +433,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              height="20" label="&lt; Prev" label_selected="&lt; Prev"
                              mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                 </panel>
-                <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+                <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="Places" left="1" mouse_opaque="false" name="places_panel"
                      width="778">
                         <string name="searching_text">
@@ -550,10 +550,10 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left="121" mouse_opaque="true"
                              name="Search" width="95" />
-                        <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
+                        <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true"
                              draw_heading="true" 
                              
-                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="339">
                                 <column label="" name="icon" width="24" />
                                 <column label="" name="type" width="-1" />
@@ -571,7 +571,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              height="20" label="&lt; Prev" label_selected="&lt; Prev"
                              mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
                 </panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+    <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="People" left="1" mouse_opaque="false" name="people_panel"
                      width="778">
                         <string name="searching_text">
@@ -592,10 +592,10 @@ To buy direct, visit the land and click on the place name in the title bar.
                 <button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
                              label="Search" label_selected="Search" left="121" mouse_opaque="true"
                              name="Search" width="95" />
-      <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
+      <scroll_list background_visible="true" bottom="-533" column_padding="0" draw_border="true"
                              draw_heading="true" 
                                
-                             follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+                             follows="left|top|right|bottom" height="484" left="4" mouse_opaque="true"
                              multi_select="false" name="results" search_column="2" width="326">
         <column label="" name="icon" width="24" />
         <column label="" name="type" width="-1" />
@@ -612,7 +612,7 @@ To buy direct, visit the land and click on the place name in the title bar.
                              height="20" label="&lt; Prev" label_selected="&lt; Prev"
                              mouse_opaque="true" name="&lt; Prev" right="244" width="80" />
                 </panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+    <panel border="true" bottom="-569" follows="left|top|right|bottom" height="553"
                      label="Groups" left="1" mouse_opaque="false"
                      name="groups_panel"
                      width="778">
@@ -683,15 +683,15 @@ To buy direct, visit the land and click on the place name in the title bar.
       <string name="default_search_page">"http://secondlife.com/app/search/index_groups.php?"</string>
     </panel>
         </tab_container>
-        <panel bottom="-560" follows="right|top" height="470" left="340"
+        <panel bottom="-580" follows="right|top" height="490" left="340"
              name="classified_details_panel" width="440" />
-        <panel bottom="-560" follows="right|top" height="486" left="350" name="Panel Avatar"
+        <panel bottom="-580" follows="right|top" height="506" left="350" name="Panel Avatar"
              width="430" />
-        <panel bottom="-560" follows="right|top" height="470" left="340"
+        <panel bottom="-560" follows="right|top" height="490" left="340"
              name="event_details_panel" width="440" />
-        <panel bottom="-580" follows="right|top" height="515" left="350"
+        <panel bottom="-600" follows="right|top" height="535" left="350"
              name="group_details_panel_holder" width="430">
-                <panel bottom="0" follows="right|top" height="470" left="0" name="group_details_panel"
+                <panel bottom="0" follows="right|top" height="490" left="0" name="group_details_panel"
                      width="430" />
         </panel>
         <panel bottom="-560" follows="right|top" height="470" left="340"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index 6fef552..be8508f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -49,6 +49,8 @@
              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
              label="End Call" left_delta="0" name="end_call_btn" pad_right="10"
              visible="false" width="100" />
+  <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="105"
+          name="history_btn" visible="true" width="85" />
   <text bottom_delta="0" left="-240" height="14" width="230" name="inventory_send" halign="right" 
         text_color="LabelTextColor" follows="right|top" drop_shadow_visible="true"
         bg_visible="false" border_drop_shadow_visible="false" border_visible="false">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
index af60c11..2e97d64 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
@@ -49,11 +49,13 @@
                         <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
                              label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
-                             width="80" />
+                             width="92" />
                         <button bottom_delta="0" follows="left|top" halign="right" height="20"
                              image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
                              label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
-                             visible="false" width="80" />
+                             visible="false" width="92" />
+      <button bottom="-20" follows="left|top" halign="center" height="20" label="History" left_delta="97"
+              name="history_btn" visible="true" width="85" />
                         <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
                              label_selected="&gt; &gt;" left="143" name="toggle_active_speakers_btn"
                              right="176"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 3d1c569..103a11e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -205,5 +205,27 @@
                                 <on_click filter="" function="Inventory.SetSortBy" userdata="systemfolderstotop" />
                         </menu_item_check>
                 </menu>
+    <menu bottom_delta="64" drop_shadow="true" height="49"
+                     label="Search" left="0" mouse_opaque="false" name="Search" opaque="true"
+                     tear_off="true" width="118">
+      <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByName" height="18"
+                             label="By Name" left="0" mouse_opaque="true" name="By Name" width="118">
+        <on_click filter="" function="Inventory.SetSearchBy" userdata="name" />
+      </menu_item_check>
+      <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByCreator" height="18"
+           label="By Creator" left="0" mouse_opaque="true" name="By Creator" width="118">
+        <on_click filter="" function="Inventory.SetSearchBy" userdata="creator" />
+      </menu_item_check>
+      <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByDesc" height="18"
+          label="By Description" left="0" mouse_opaque="true" name="By Description" width="118">
+        <on_click filter="" function="Inventory.SetSearchBy" userdata="desc" />
+      </menu_item_check>
+      <menu_item_separator bottom_delta="-8" height="8" left="0" mouse_opaque="true" name="separator"
+                             width="118" />
+      <menu_item_check bottom_delta="-18" control_name="Inventory.SearchByAll" height="18"
+           label="By All" left="0" mouse_opaque="true" name="By All" width="118">
+        <on_click filter="" function="Inventory.SetSearchBy" userdata="all" />
+      </menu_item_check>
+    </menu>
         </menu_bar>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_login.xml b/linden/indra/newview/skins/default/xui/en-us/floater_login.xml
new file mode 100644
index 0000000..96e2aa3
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_login.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="false" can_drag_on_left="false" can_minimize="false"
+     can_resize="true" height="400" min_height="400" min_width="600"
+     name="floater_login" title="plasticwuzhere" width="600">
+
+  <!-- Grid Selector -->
+  <text type="string" length="1" enabled="true" name="grid_selector_label"
+                height="10" width="100" left="5" top="-20"
+                h_pad="0" v_pad="0" halign="left"
+                font="SansSerif"
+                follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+            drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Select a grid:
+  </text>
+  
+  <scroll_list background_visible="true" bottom_delta="25" draw_border="true"
+             draw_stripes="false" 
+             follows="top|left|bottom" height="340" left="5" multi_select="false"
+             name="grid_selector" width="170">
+    <column label="" name="grid" width="200" />
+  </scroll_list>
+  
+  <!-- Grid Selector Buttons -->
+  <button label="Add" label_selected="Delete" enabled="true" name="btn_add"
+                height="18" width="55" left="5" bottom_delta="-20"
+                halign="center"
+                follows="left|bottom" scale_image="true"
+            font="SansSerifSmall" mouse_opaque="true" />
+  <button label="Copy" label_selected="Add" enabled="true" name="btn_copy"
+                height="18" width="55" left_delta="58" bottom_delta="0"
+                halign="center"
+                follows="left|bottom" scale_image="true"
+            font="SansSerifSmall" mouse_opaque="true" />
+  <button label="Delete" label_selected="Copy" enabled="true" name="btn_delete"
+                height="18" width="55" left_delta="58" bottom_delta="0"
+                halign="center"
+                follows="left|bottom" scale_image="true"
+            font="SansSerifSmall" mouse_opaque="true" />
+
+  <!-- Grid Details -->
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     top="-25" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left_delta="60" mouse_opaque="true" name="gridnick_text" v_pad="0" width="120">
+    Grid Name:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="360"
+             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="40" mouse_opaque="true"
+             name="gridnick" select_all_on_focus_received="true" width="200" />
+
+
+  <!--
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="16"
+             left_delta="-90" mouse_opaque="true" name="first_name_text" v_pad="0" width="100">
+                First Name:
+        </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+   follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+   height="20" left_delta="90" max_length="45" mouse_opaque="true"
+   name="first_name" select_all_on_focus_received="true" width="200" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="16"
+             left_delta="-90" mouse_opaque="true" name="last_name_text" v_pad="0" width="100">
+    Last Name:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+   follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+   height="20" left_delta="90" max_length="45" mouse_opaque="true"
+   name="last_name" select_all_on_focus_received="true" width="200" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="16"
+             left_delta="-90" mouse_opaque="true" name="avatar_password_text" v_pad="0" width="120">
+                Password:
+        </text>
+        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="16" mouse_opaque="true"
+             name="avatar_password" select_all_on_focus_received="true" width="200" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="16"
+             left_delta="-90" mouse_opaque="true" name="start_location_text" v_pad="0"
+             width="95">
+    Start Location:
+  </text>
+  <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="18"
+             left_delta="90" max_chars="128" mouse_opaque="true"
+             name="start_location_combo" width="180">
+    <combo_item name="MyHome" value="My Home">
+      My Home
+    </combo_item>
+    <combo_item name="MyLastLocation" value="My Last Location">
+      My Last Location
+    </combo_item>
+    <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
+      &lt;Type region name&gt;
+    </combo_item>
+  </combo_box>
+  -->
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left_delta="-90" mouse_opaque="true" name="loginuri_text" v_pad="0" width="120">
+    Login URI:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerif" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="loginuri" select_all_on_focus_received="true" width="320" />
+
+  <button label="Get Grid Info" label_selected="Get Grid Info" enabled="true" name="btn_gridinfo"
+                height="18" width="100" bottom_delta="-22"
+                halign="center"
+                follows="left|top" scale_image="true"
+          font="SansSerifSmall" mouse_opaque="true" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-50" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left="182" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
+    Optional Fields
+  </text>
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left_delta="0" mouse_opaque="true" name="loginpage_text" v_pad="0" width="120">
+    Login Page:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="loginpage" select_all_on_focus_received="true" width="320" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+     font="SansSerif" h_pad="0" halign="left" height="16"
+     left_delta="-90" mouse_opaque="true" name="helperuri_text" v_pad="0" width="120">
+    Helper URI:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="helperuri" select_all_on_focus_received="true" width="320" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left_delta="-90" mouse_opaque="true" name="website_text" v_pad="0" width="120">
+    Website:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="website" select_all_on_focus_received="true" width="320" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left_delta="-90" mouse_opaque="true" name="support_text" v_pad="0" width="120">
+    Support URL:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="support" select_all_on_focus_received="true" width="320" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left_delta="-90" mouse_opaque="true" name="register_text" v_pad="0" width="120">
+    Account URL:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="register" select_all_on_focus_received="true" width="320" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+   bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+   font="SansSerif" h_pad="0" halign="left" height="16"
+   left_delta="-90" mouse_opaque="true" name="password_text" v_pad="0" width="120">
+    Password URL:
+  </text>
+  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+             follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="true"
+             height="20" left_delta="90" max_length="255" mouse_opaque="true"
+             name="password" select_all_on_focus_received="true" width="320" />
+  
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-4" follows="top|left" height="155" left_delta="-93" name="OptionalPrefsBorder" width="417" />
+
+  <!-- Combo box for multi avatar grid manager avatar name
+        <combo_box allow_text_entry="true" bevel_style="in" border_style="line" border_thickness="1"
+                bottom_delta="0" follows="left|top" font="SansSerif" handle_edit_keys_directly="true"
+                height="20" left="290" max_length="45" mouse_opaque="true"
+                name="name_combo" select_all_on_focus_received="true" width="185" />
+  -->
+  <!-- Buttons for mutli avatar grid manager
+  <button bottom="159" follows="top|right" font="SansSerif" halign="center"
+             height="20" label="New" label_selected="New"
+             left="480" mouse_opaque="true" name="new_btn" scale_image="TRUE"
+             width="70" />
+  -->
+  <!--
+  <button bottom="134" follows="top|right" font="SansSerif" halign="center"
+             height="20" label="Remove" label_selected="Remove"
+             left="480" mouse_opaque="true" name="remove_btn" scale_image="TRUE"
+             width="70" />
+-->
+
+  <!-- Checkbox for selecting a global avatar (for when combo box avatar selector works)
+  <check_box bottom="85" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Global Avatar"
+             left_delta="0" mouse_opaque="true" name="global_check" width="138" />
+
+  <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
+             initial_value="false" label="Remember password"
+             left_delta="165" mouse_opaque="true" name="remember_check" width="138" />
+  
+  <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
+     initial_value="false" label="secret level"
+     left_delta="165" mouse_opaque="true" name="gawd_mode" width="138" />
+  -->
+
+  <!-- Cancel/Connect Buttons -->
+
+  <!--
+  <button bottom="-44" follows="right|top" font="SansSerif" halign="center"
+             height="24" label="Set as Default" label_selected="Set as Default"
+             left="470" mouse_opaque="true" name="set_default" scale_image="TRUE"
+             width="110" />
+  -->
+
+  <!-- <button bottom="28" follows="right|bottom" font="SansSerif" halign="center"
+             height="24" label="Connect" label_selected="Connect"
+             left="280" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
+             width="100" />  -->
+  <button bottom="8" follows="right|bottom" font="SansSerif" halign="center"
+     height="24" label="Ok" label_selected="Apply" left="280"
+     mouse_opaque="true" name="btn_ok" scale_image="TRUE" width="100" />
+  <button bottom="8" follows="right|bottom" font="SansSerif" halign="center"
+     height="24" label="Apply" label_selected="Apply" left="385"
+     mouse_opaque="true" name="btn_apply" scale_image="TRUE" width="100" />
+        <button bottom="8" follows="right|bottom" font="SansSerif" halign="center"
+             height="24" label="Undo" label_selected="Undo" left="490"
+             mouse_opaque="true" name="btn_cancel" scale_image="TRUE" width="100" />
+  <!--
+        <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
+             left_delta="135" max_chars="40" mouse_opaque="true"
+             name="server_combo" width="200" />
+  -->
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 1a43be7..fca0379 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
      height="440" min_height="140" min_width="467" name="floater_about"
-     rect_control="FloaterMediaRect" title="Media Browser" width="820">
-        <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="800">
+     rect_control="FloaterMediaRect" title="Web Browser" width="560">
+        <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="540">
                 <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="nav_controls" user_resize="false"
                      width="800">
                         <button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 9f1e164..57f955f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -1,7 +1,107 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true"
-         can_tear_off="false" follows="top|right" height="220" min_height="64" min_width="64"
-         name="minimap" rect_control="FloaterMiniMapRect" width="200">
-    <panel bottom="2" follows="left|top|right|bottom" height="216" label="Mini Map"
-                 left="2" mouse_opaque="false" name="mini_mapview" width="196" />
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+         can_tear_off="false" follows="top|right" height="455" min_height="400" min_width="240"
+         name="minimap" rect_control="FloaterMiniMapRect" width="200" short_title="Mini-Map">
+
+  <panel label="Mini Map" name="mini_mapview"
+         top="-2" left="2" bottom="196" right="196"
+         follows="left|top|right|bottom" mouse_opaque="false"  />
+
+  <panel name="RadarPanel" label="Radar"
+         background_visible="true" bg_alpha_color="NetMapBackgroundColor"
+         left="2" top="196" right="196" height="120"
+         follows="left|right|bottom" border="false" mouse_opaque="true">
+
+    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="-20" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+       mouse_opaque="true" name="lblAvatarCount" v_pad="0"
+       width="220">
+      0
+    </text>
+    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+        bottom="-20" drop_shadow_visible="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="16" left="27"
+        mouse_opaque="true" name="avatars_in" v_pad="0"
+        width="220">
+      Avatars in
+    </text>
+    <slider bottom_delta="0" left_delta="55" follows="left|top" width="110" height="15"
+         name="near_me_range" label="" control_name="NearMeRange"
+         min_val="5" max_val="512" increment="1" initial_val="96" decimal_digits="0" />
+    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+         bottom_delta="0" left="190" drop_shadow_visible="true" follows="left|top"
+         font="SansSerifSmall" h_pad="0" halign="left" height="15"
+         mouse_opaque="true" name="meters" v_pad="0"
+         width="40">
+      m
+    </text>
+    <tab_container border="false" bottom_delta="-176" height="172" left="0" mouse_opaque="false"
+                       name="button_container" tab_position="top" follows="left|right|bottom" width="198">
+      <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
+                       label="Avatars" left="1" mouse_opaque="true" name="avatar_tab" width="198">
+        <button bottom="-25" follows="top|right" height="22" label="IM/Call"
+             left="-85" name="im_btn" tool_tip="Open Instant Message session"
+             width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
+             left_delta="0" name="profile_btn"
+             tool_tip="Show picture, groups, and other information" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
+             left_delta="0" name="offer_teleport_btn"
+             tool_tip="Offer this friend a teleport to your current location" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Track"
+             left_delta="0" name="track_btn"
+             tool_tip="Create a beacon to track friends you can map" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Invite..."
+             left_delta="0" name="invite_btn"
+             tool_tip="Remove this person from your friends list" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Add..."
+             left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
+             width="80" />
+      </panel>
+      <panel border="true" bottom="-160" follows="left|top|right|bottom" height="160"
+                       label="Estate" left="1" mouse_opaque="true" name="estate_tab" width="198">
+        <button bottom="-25" follows="top|right" height="22" label="Freeze..."
+             left="-85" name="freeze_btn" tool_tip=""
+             width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Eject..."
+             left_delta="0" name="eject_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Mute..."
+             left_delta="0" name="mute_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="0" follows="top|right" height="22" label="Unmute..."
+             left_delta="0" name="unmute_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Report..."
+             left_delta="0" name="ar_btn"
+             tool_tip="" width="80" />
+        <button bottom_delta="-25" follows="top|right" height="22" label="Kick..."
+             left_delta="0" name="estate_eject_btn" tool_tip=""
+             width="80" />
+      </panel>
+    </tab_container>
+    <scroll_list bottom="-190" width="104" height="143" left="4"
+         follows="left|bottom|right" draw_border="false" draw_heading="true"
+         draw_stripes="true" column_padding="5" sort_column="1" mouse_opaque="true"
+         background_visible="true" multi_select="false" name="RadarList">
+      <column name="avatar_name" label="Name" dynamicwidth="true" />
+      <column name="avatar_distance" label="Dist." width="48" />
+    </scroll_list>
+  </panel>
+  <string name="no_one_near">
+    No avatars within range
+  </string>
+  <string name="is_muted">
+    (muted)
+  </string>
+  <string name="is_typing">
+    (typing)
+  </string>
+  <string name="entering_chat_range">
+    [NAME] has entered chat range ([DISTANCE]m)
+  </string>
+  <string name="entering_sim_range">
+    [NAME] has entered the sim ([DISTANCE]m)
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
index 568f155..27a08c1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_new_outfit_dialog.xml
@@ -225,6 +225,12 @@ now wearing into it.
              width="489">
                 Items to include in outfit:
         </text>
+  <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+             label="Check All" left_delta="200" mouse_opaque="true"
+             name="Check All" scale_image="true" width="90" />
+  <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+             label="Uncheck All" left_delta="100" mouse_opaque="true"
+             name="Uncheck All" scale_image="true" width="90" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-196" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
index 631db0d..9cf7b5f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
@@ -43,7 +43,7 @@
         <button bottom_delta="0" follows="right|bottom" height="20" label="Send"
              left_delta="-106" name="send_btn" width="100" />
         <string name="default_subject">
-                Postcard from Second Life.
+                Postcard from a virtual world.
         </string>
         <string name="default_message">
                 Check this out!
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml b/linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml
new file mode 100644
index 0000000..191b31e
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="true" can_minimize="false"
+     can_resize="false" height="80" name="Import" title="Import progress" width="200" mouse_opaque="true">
+  <text height="15" left="10" name="name_label" top="-10"> Progress </text>  
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml b/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
index daf45cf..c67443f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_profile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="520" min_height="0" min_width="0"
+     can_resize="false" height="545" min_height="0" min_width="0"
      name="avatarinfo" title="Profile" width="420">
-        <panel bottom="-520" height="486" left="0" name="Panel Avatar" width="430" />
+        <panel bottom="-545" height="511" left="0" name="Panel Avatar" width="430" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_rlv_behaviour.xml b/linden/indra/newview/skins/default/xui/en-us/floater_rlv_behaviour.xml
new file mode 100644
index 0000000..d9e70e6
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_rlv_behaviour.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+     height="425" min_height="200" min_width="375" name="rlvBehaviours"
+     title="Active RLV Restrictions" width="350">
+  <scroll_list bottom="-400" draw_border="true" draw_heading="true"
+             follows="top|left|bottom|right" height="365" left="15" multi_select="false"
+             name="behaviour_list" right="-15">
+    <column label="Restriction" name="behaviour" width="170" />
+    <column label="Object Name" name="name" width="170" />
+  </scroll_list>
+</floater>
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
index b83a6df..653c75b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -35,6 +35,12 @@
                              width="138" />
                         <menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
                              mouse_opaque="true" name="Revert All Changes" width="138" />
+      <menu_item_separator bottom_delta="-66" height="8" left="0" mouse_opaque="true" name="separator"
+     width="138" />
+      <menu_item_call bottom_delta="-76" height="20" label="Save to Disk" left="0"
+     mouse_opaque="true" name="Save to Disk" width="138" />
+      <menu_item_call bottom_delta="-96" height="20" label="Load from Disk" left="0"
+     mouse_opaque="true" name="Load from Disk" width="138" />
                 </menu>
                 <menu bottom="665" drop_shadow="true" enabled="true" height="198"
                      left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index bb719cf..efe524c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" follows="left|top" height="526" name="Snapshot"
+<floater bottom="-320" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" height="546" name="Snapshot"
      rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
         <text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
              width="195">
@@ -140,9 +140,9 @@
         <check_box bottom_delta="-20" follows="left|top" label="Constrain Proportions" left="10"
              name="keep_aspect_check" />
         <slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15"
-             increment="1" initial_val="75" label="Image Quality" left="10"
+             increment="1" initial_val="75" label="Image Quality" left="10" label_width="80" 
              max_val="100" min_val="0" name="image_quality_slider" width="210" />
-        <check_box bottom_delta="0" follows="left|top" label="High resolution snapshot"
+        <check_box bottom_delta="-20" follows="left|top" label="High resolution snapshot"
              left="10" name="high_res_check" />
         <text bottom_delta="-28" follows="left|top" height="20" left="10"
              name="layer_type_label" width="50">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index a7ba9a6..959ebde 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="550" 
+<floater bottom="-374" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" height="565" 
      left="308" min_height="100" min_width="100" mouse_opaque="true"
      name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
      short_title="Build" width="272">
@@ -79,14 +79,18 @@
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Select Faces to Texture" left="4" mouse_opaque="true"
              name="radio select face" radio_style="true" width="114" />
-  <check_box bottom_delta="-22" control_name="SnapEnabled" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
-             left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-             height="16" label="Options..." label_selected="Options..." left_delta="75"
-             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+        <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Edit linked parts" left="4" mouse_opaque="true"
+             name="checkbox edit linked parts" width="114" />
+  <button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
+          halign="center" height="18" label="Link" label_selected="Link"
+          left="10" mouse_opaque="true" name="link_btn" width="68" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall"
+          halign="center" height="18" label="Unlink" label_selected="Unlink"
+          left_delta="75" mouse_opaque="true" name="unlink_btn" width="68" />
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+             bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
              mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
                 Ruler:
@@ -112,16 +116,13 @@
              font="SansSerifSmall" height="16" initial_value="true"
              label="Stretch Textures" left_delta="0" mouse_opaque="true"
              name="checkbox stretch textures" width="134" />
-  <check_box bottom_delta="-15" control_name="EditLinkedParts" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Edit linked parts" left="143" mouse_opaque="true"
-             name="checkbox edit linked parts" width="114" />
-  <button bottom_delta="-18" follows="left|top" font="SansSerifSmall"
-          halign="center" height="18" label="Link" label_selected="Link"
-          right="-5" mouse_opaque="true" name="link_btn" width="78" />
-  <button bottom_delta="-20" follows="left|top" font="SansSerifSmall"
-          halign="center" height="18" label="Unlink" label_selected="Unlink"
-          right="-5" mouse_opaque="true" name="unlink_btn" width="78" />
+  <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
+             left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
+        <button bottom_delta="-19" follows="left|top" font="SansSerifSmall"
+       halign="center" valign="center"
+             height="20" label="Options..." label_selected="Options..." left_delta="20"
+             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
 
 
 <!-- Help text -->
@@ -309,13 +310,13 @@
              increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
              mouse_opaque="true" name="slider force" width="80" />
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-         bottom="-151" left="118" drop_shadow_visible="true" follows="left|top"
+         bottom="-168" left="118" drop_shadow_visible="true" follows="left|top"
          font="SansSerifSmall" h_pad="0" halign="right" height="16"
          mouse_opaque="true" name="obj_count" v_pad="0" width="143">
     Selected objects: [COUNT]
   </text>
   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom="-163" left="118" drop_shadow_visible="true" follows="left|top"
+       bottom="-181" left="118" drop_shadow_visible="true" follows="left|top"
        font="SansSerifSmall" h_pad="0" halign="right" height="16"
        mouse_opaque="true" name="prim_count" v_pad="0" width="143">
     primitives: [COUNT]
@@ -323,7 +324,7 @@
 
 <!-- Sub-tabs -->
 
-        <tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
+        <tab_container bottom="-565" follows="left|top" height="384" left="0" mouse_opaque="false"
              name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
              tab_position="top" width="272">
                 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
@@ -380,20 +381,36 @@
                              height="20" label="Profile..." label_selected="Profile..." left_delta="94"
                              mouse_opaque="true" name="button owner profile" scale_image="TRUE"
                              width="78" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+                             mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
+        Last Owner:
+      </text>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+                             mouse_opaque="true" name="Last Owner Name" v_pad="0" width="88">
+        Thrax Linden
+      </text>
+      <button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
+                             height="20" label="Profile..." label_selected="Profile..." left_delta="94"
+                             mouse_opaque="true" name="button last owner profile" scale_image="TRUE"
+                             width="78" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-106" drop_shadow_visible="true" follows="left|top"
+                             bottom="-126" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
                              mouse_opaque="true" name="Group:" v_pad="0" width="78">
                                 Group:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-106" drop_shadow_visible="true" follows="left|top"
+                             bottom="-126" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
                              mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
                              width="88">
                                 The Lindens
                         </text>
-                        <button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"
+                        <button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center"
                              height="20" label="Set..." label_selected="Set..." left_delta="94"
                              mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -419,7 +436,7 @@
                         <string name="text deed">
                                 Deed
                         </string>
-                        <button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
+                        <button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
                              height="20" label="Deed..." label_selected="Deed..." left_delta="172"
                              mouse_opaque="true" name="button deed" scale_image="TRUE"
                              tool_tip="Group shared objects can be deeded by a group officer."
@@ -508,37 +525,37 @@
                                 </combo_item>
                         </combo_box>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-115" drop_shadow_visible="true" follows="left|top"
+                             bottom="-135" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
                              mouse_opaque="true" name="B:" v_pad="0" width="174">
                                 B:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-115" drop_shadow_visible="true" follows="left|top"
+                             bottom="-135" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="O:" v_pad="0" width="124">
                                 O;
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-115" drop_shadow_visible="true" follows="left|top"
+                             bottom="-135" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="G:" v_pad="0" width="74">
                                 G:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-127" drop_shadow_visible="true" follows="left|top"
+                             bottom="-147" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
                              mouse_opaque="true" name="E:" v_pad="0" width="174">
                                 E:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-127" drop_shadow_visible="true" follows="left|top"
+                             bottom="-147" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="N:" v_pad="0" width="124">
                                 N:
                         </text>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-127" drop_shadow_visible="true" follows="left|top"
+                             bottom="-147" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
                              mouse_opaque="true" name="F:" v_pad="0" width="74">
                                 F:
@@ -638,15 +655,15 @@
                         </text>
                         <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="X" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
+                             min_val="0.01" mouse_opaque="true" name="Scale X"
                              text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
+                             min_val="0.01" mouse_opaque="true" name="Scale Y"
                              text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
+                             min_val="0.01" mouse_opaque="true" name="Scale Z"
                              text_enabled_color="1, 1, 1, 1" width="96" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
@@ -755,12 +772,12 @@
                                 Skew
                         </text>
                         <spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
-                             increment="5" initial_val="0" left="121" max_val="95" min_val="0" 
-                             mouse_opaque="true" name="Scale 1" width="68" label=" " label_width="10"/>
-      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95" label_width="10"
-                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" label=" " />
-      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             increment="5" initial_val="0" left="121" max_val="95" min_val="0"
+                             mouse_opaque="true" name="Scale 1" width="68" />
+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+                             increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
+                             min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
                              mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
@@ -879,10 +896,10 @@
                         </text>
                         <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
                              increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
-                             mouse_opaque="true" name="Radius Offset" width="68" label=" " label_width="10" />
-      <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+                             mouse_opaque="true" name="Radius Offset" width="68" />
+                        <spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
                              increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
-                             mouse_opaque="true" name="Revolutions" width="68" label=" " label_width="10" />
+                             mouse_opaque="true" name="Revolutions" width="68" />
                         <texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
                              default_image_name="Default" follows="left|top" height="141"
                              label="Sculpt Texture" left="121" mouse_opaque="true"
@@ -1238,25 +1255,6 @@
                         Parcel Information
                 </text>
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom="-40" drop_shadow_visible="true" follows="left|top"
-                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
-                     mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
-                        Modify Parcel
-                </text>
-                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
-                     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
-                     width="112" />
-                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Join..." label_selected="Join..." left="48"
-                     mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
-                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
-                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
-                     mouse_opaque="true" name="label_parcel_info" v_pad="0" width="150">
-                        Parcel Information
-                </text>
-                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
                      font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
                      mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
index 9dcb96e..7038c93 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
@@ -11,17 +11,23 @@
              width="110">
                 Water Presets:
         </text>
-        <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
-             left_delta="110" max_chars="20" mouse_opaque="true"
+        <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
+             left_delta="120" max_chars="20" mouse_opaque="true"
              name="WaterPresetsCombo" width="150" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
+             mouse_opaque="true" name="prev" scale_image="true" width="20" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
+             mouse_opaque="true" name="next" scale_image="true" width="20" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="170"
+             label="New" label_selected="New" left_delta="40"
              mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Save" label_selected="Save" left_delta="80"
+             label="Save" label_selected="Save" left_delta="70"
              mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Delete" label_selected="Delete" left_delta="80"
+             label="Delete" label_selected="Delete" left_delta="70"
              mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="70" />
         <tab_container bottom="-240" follows="left|top" height="180" left="0"
              mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
index 906e7de..471b3e5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
@@ -4,29 +4,35 @@
      min_width="400" mouse_opaque="true" name="WindLight floater"
      rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
      width="700">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-50" drop_shadow_visible="true" follows="left|top|right"
              font="SansSerif" h_pad="0" halign="left" height="16"
              left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
              width="110">
-                Sky Presets:
-        </text>
-        <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
+    Sky Presets:
+  </text>
+  <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
              left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
              width="150" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
+             mouse_opaque="true" name="prev" scale_image="true" width="20" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
+             mouse_opaque="true" name="next" scale_image="true" width="20" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="170"
+             label="New" label_selected="New" left_delta="40"
              mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Save" label_selected="Save" left_delta="80"
+             label="Save" label_selected="Save" left_delta="70"
              mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Delete" label_selected="Delete" left_delta="80"
+             label="Delete" label_selected="Delete" left_delta="70"
              mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
              label="Day Cycle Editor" label_selected="Day Cycle Editor"
-             left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
-             scale_image="true" width="120" />
+             left_delta="100" mouse_opaque="true" name="WLDayCycleMenuButton"
+             scale_image="true" width="125" />
         <tab_container bottom="-220" follows="left|top" height="160" left="0"
              mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
                 <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
index 485ae9f..d1f5fc8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -19,8 +19,13 @@
     <on_click function="MiniMap.Center" userdata="1" />
     <on_check function="MiniMap.CheckCenter" userdata="1" />
   </menu_item_check>
+  <menu_item_check bottom_delta="-18" enabled="true" height="18" label="Rotate Mini-Map"
+          left="0" mouse_opaque="true" name="Rotate Mini-Map" width="128">
+    <on_click function="MiniMap.Rotate" userdata="" />
+    <on_check function="MiniMap.CheckRotate" userdata="" />
+  </menu_item_check>
   <menu_item_separator />
-  <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show Map"
+  <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show World Map"
                  left="0" mouse_opaque="true" name="Show Map" width="128">
     <on_click function="MiniMap.ShowWorldMap" userdata="" />
   </menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index 34c855d..6f4331d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -4,10 +4,10 @@
                 <on_click function="Object.Open" />
                 <on_enable function="Object.EnableOpen" />
         </menu_item_call>
-        <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
-                <on_click function="Object.Build" />
-                <on_enable function="EnableEdit" />
-        </menu_item_call>
+  <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
+    <on_click function="Object.Buy" />
+    <on_enable function="Object.EnableBuy" />
+  </menu_item_call>
         <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
                 <on_click function="Object.Touch" />
                 <on_enable function="Object.EnableTouch" userdata="Touch" name="EnableTouch"/>
@@ -29,22 +29,27 @@
                         <on_click function="Object.Delete" />
                         <on_enable function="Object.EnableDelete" />
                 </menu_item_call>
-                <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
-                        <on_click function="Object.AttachToAvatar" />
-                        <on_enable function="Object.EnableWear" />
-                </menu_item_call>
-                <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
-                        <on_click function="Tools.TakeCopy" />
-                        <on_enable function="Tools.EnableTakeCopy" />
-                </menu_item_call>
-                <pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
-                <pie_menu label="Attach &gt;" name="Object Attach" />
-                <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
-                        <on_click function="Object.Return" />
-                        <on_enable function="Object.EnableReturn" />
-                </menu_item_call>
-                <pie_menu label="More &gt;" name="Rate Menu">
-      <menu_item_separator />
+    <menu_item_call enabled="false" label="Build" mouse_opaque="true" name="Create">
+      <on_click function="Object.Build" />
+      <on_enable function="EnableEdit" />
+    </menu_item_call>
+
+    <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
+      <on_click function="Tools.TakeCopy" />
+      <on_enable function="Tools.EnableTakeCopy" />
+    </menu_item_call>
+    <pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
+    <pie_menu label="Attach &gt;" name="Object Attach" />
+    <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
+      <on_click function="Object.AttachToAvatar" />
+      <on_enable function="Object.EnableWear" />
+    </menu_item_call>
+    <pie_menu label="More &gt;" name="Rate Menu">
+      <menu_item_call label="Export" enabled="false" hidden="false"
+                      mouse_opaqu="true" name="Export">
+        <on_click function="Object.Export" />
+        <on_enable function="Object.EnableExport" />
+      </menu_item_call>
       <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
         <on_click function="Object.Mute" />
         <on_enable function="Object.EnableMute" />
@@ -54,7 +59,9 @@
         <on_click function="Object.ReportAbuse" />
         <on_enable function="Object.EnableReportAbuse" />
       </menu_item_call>
-      <menu_item_separator />
+      <menu_item_call enabled="false" label="Go Here" mouse_opaque="true" name="Go Here">
+        <on_click function="GoToObject" />
+      </menu_item_call>
       <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
         <on_click function="Object.Inspect" />
         <on_enable function="Object.EnableInspect" />
@@ -68,11 +75,11 @@
         <on_click function="Tools.Unlink" userdata="" />
         <on_enable function="Tools.EnableUnlink" />
       </menu_item_call>
-                </pie_menu>
-                <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
-                        <on_click function="Object.Buy" />
-                        <on_enable function="Object.EnableBuy" />
-                </menu_item_call>
+    </pie_menu>
+    <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
+      <on_click function="Object.Return" />
+      <on_enable function="Object.EnableReturn" />
+    </menu_item_call>
         </pie_menu>
         <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
                 <on_click function="Object.Edit" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index b0aecb1..24270d9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -32,6 +32,16 @@
       </menu_item_call>
     </menu>
     <menu_item_separator />
+          <menu_item_call name="Import" label="Import" enabled="false">
+      <on_click function="Object.Import" />
+      <on_enable function="Object.EnableImport" />
+    </menu_item_call>
+    <menu_item_call name="Upload + Import" label="Upload + Import"
+                    enabled="false">
+      <on_click function="Object.ImportUpload" />
+      <on_enable function="Object.EnableImport" />
+    </menu_item_call>
+    <menu_item_separator />
     <menu_item_call name="Close Window"
                     label="Close Window"
                     shortcut="control|W">
@@ -67,6 +77,10 @@
                 userdata="" />
     </menu_item_call>
     <menu_item_separator />
+    <menu_item_call name="Logout" label="Logout"
+                    shortcut="control|alt|Q">
+          <on_click function="File.Logout" userdata="" />
+    </menu_item_call>
     <menu_item_call name="Quit" label="Quit"
                     shortcut="control|Q">
       <on_click function="File.Quit" userdata="" />
@@ -383,6 +397,11 @@
       <on_click function="View.ToggleRenderType" userdata="hideparticles" />
       <on_check function="View.CheckRenderType" userdata="hideparticles" />
     </menu_item_check>
+    <menu_item_check name="Show HUD Attachments" label="Show HUD Attachments"
+                     shortcut="alt|shift|H">
+      <on_click function="View.ShowHUDAttachments" userdata="" />
+      <on_check function="View.CheckHUDAttachments" />
+    </menu_item_check>
     <menu_item_separator />
     <menu name="Zoom Level" create_jump_keys="true"
             label="Zoom Level" opaque="true" tear_off="true">
@@ -886,6 +905,25 @@
                 userdata="QuietSnapshotsToDisk" />
       <on_check control="QuietSnapshotsToDisk" />
     </menu_item_check>
+    <menu_item_call label="Ground Sit" name="Ground Sit" 
+                    shortcut="control|alt|s">
+      <on_click function="Advanced.ToggleSit" userdata="" />
+      <on_Check function="Advanced.CheckSit" userdata="" />
+    </menu_item_call>
+    <menu_item_check label="Phantom Avatar" name="Phantom" 
+                     shortcut="control|alt|p">
+      <on_click function="Advanced.TogglePhantom" userdata="" />
+      <on_check function="Advanced.CheckPhantom" userdata="" />
+    </menu_item_check>
+    <menu_item_check label="Animation List" name="Animation List">
+      <on_click function="ShowFloater" userdata="animation list" />
+      <on_check function="FloaterVisible" userdata="animation list" />
+    </menu_item_check>
+    <menu_item_check label="Asset Browser" name="asset browser" 
+                     shortcut="alt|shift|a">
+      <on_click function="Advanced.ToggleAssetBrowser" userdata="" />
+      <on_check function="Advanced.CheckAssetBrowser" userdata="" />
+    </menu_item_check>
     <menu_item_check name="Show Mouselook Crosshairs"
                      label="Show Mouselook Crosshairs">
       <on_click function="ToggleControl"
@@ -1069,13 +1107,6 @@
           <on_check function="Advanced.CheckFeature"
                     userdata="flexible" />
         </menu_item_check>
-        <menu_item_check name="HUD Attachments"
-                         label="HUD Attachments"
-                         shortcut="">
-          <on_click function="View.ShowHUDAttachments" userdata="" />
-          <on_check function="View.CheckHUDAttachments" />
-        </menu_item_check>
-
       </menu>
 
 
@@ -1369,6 +1400,80 @@
     </menu>
 
 
+    <!-- RLVa -->
+
+    <menu name="RLVa" drop_shadow="true" opaque="true" tear_off="true">
+
+      <menu name="Debug" drop_shadow="true" opaque="true" tear_off="true">
+
+        <menu_item_check name="Show Debug Messages"
+                         label="Show Debug Messages">
+          <on_click function="ToggleControl" userdata="RestrainedLifeDebug" />
+          <on_check control="RestrainedLifeDebug" />
+        </menu_item_check>
+
+        <menu_item_separator />
+
+        <menu_item_check name="Enable Legacy Naming"
+                         label="Enable Legacy Naming">
+          <on_click function="ToggleControl" userdata="RLVaEnableLegacyNaming" />
+          <on_check control="RLVaEnableLegacyNaming" />
+        </menu_item_check>
+
+      </menu>
+
+      <menu_item_separator />
+
+      <menu_item_check name="Enable Wear" label="Enable Wear">
+        <on_click function="ToggleControl" userdata="RLVaEnableWear" />
+        <on_check control="RLVaEnableWear" />
+      </menu_item_check>
+
+      <menu_item_separator />
+
+      <menu_item_check name="Hide locked layers" label="Hide locked layers">
+        <on_click function="ToggleControl" userdata="RLVaHideLockedLayers" />
+        <on_check control="RLVaHideLockedLayers" />
+      </menu_item_check>
+      
+      <menu_item_check name="Hide locked attachments"
+                       label="Hide locked attachments">
+        <on_click function="ToggleControl"
+                  userdata="RLVaHideLockedAttachments" />
+        <on_check control="RLVaHideLockedAttachments" />
+      </menu_item_check>
+      
+      <!--
+      <menu_item_check name="Hide locked inventory"
+                       label="Hide locked inventory">
+        <on_click function="ToggleControl"
+                  userdata="RLVaHideLockedInventory" />
+        <on_check control="RLVaHideLockedInventory" />
+      </menu_item_check>
+      -->
+
+      <menu_item_separator />
+
+      <menu_item_check name="Forbid Give to #RLV" label="Forbid Give to #RLV">
+        <on_click function="ToggleControl"
+                  userdata="RestrainedLifeForbidGiveToRLV" />
+        <on_check control="RestrainedLifeForbidGiveToRLV" />
+      </menu_item_check>
+
+      <menu_item_check name="Show Name Tags" label="Show Name Tags">
+        <on_click function="ToggleControl"
+                  userdata="RLVaShowNameTags" />
+        <on_check control="RLVaShowNameTags" />
+      </menu_item_check>
+
+      <menu_item_separator />
+
+      <menu_item_call name="Restrictions..." label="Restrictions...">
+        <on_click function="RLVa.Behaviors.Show" userdata="" />
+      </menu_item_call>
+
+    </menu>
+
 
     <!-- UI -->
 
@@ -1888,6 +1993,13 @@
                 userdata="ShowConsoleWindow" />
       <on_check control="ShowConsoleWindow" />
     </menu_item_check>
+
+    <menu_item_check name="Restrained Life Support"
+                     label="Restrained Life Support">
+      <on_click function="RLVa.Main.Toggle" />
+      <on_check function="RLVa.Main.Enabled" />
+    </menu_item_check>
+
     <menu_item_check name="Output Debug Minidump"
                      label="Output Debug Minidump">
       <on_click function="ToggleControl"
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 128e4bd..dd03a32 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -1,4 +1,1101 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <notifications>
+        <notify name="SystemMessageTip" tip="true">
+                <message name="message">
+                        [MESSAGE]
+                </message>
+        </notify>
+        <notify name="Cancelled" tip="true">
+                <message name="message">
+                        Cancelled
+                </message>
+        </notify>
+        <notify name="CancelledSit" tip="true">
+                <message name="message">
+                        Cancelled Sit
+                </message>
+        </notify>
+        <notify name="CancelledAttach" tip="true">
+                <message name="message">
+                        Cancelled Attach
+                </message>
+        </notify>
+        <notify name="ReplacedMissingWearable" tip="true">
+                <message name="message">
+                        Replaced missing clothing/body part with default.
+                </message>
+        </notify>
+        <notify name="FriendOnline" tip="true">
+                <message name="message">
+                        [FIRST] [LAST] is Online
+                </message>
+        </notify>
+        <notify name="FriendOffline" tip="true">
+                <message name="message">
+                        [FIRST] [LAST] is Offline
+                </message>
+        </notify>
+        <notify name="AddSelfFriend" tip="true">
+                <message name="message">
+                        You cannot add yourself as a friend.
+                </message>
+        </notify>
+        <notify name="UploadingAuctionSnapshot" tip="true">
+                <message name="message">
+                        Uploading in-world and web site snapshots...
+(Takes about 5 minutes.)
+                </message>
+        </notify>
+        <notify name="UploadPayment" tip="false">
+                <message name="message">
+                        You paid L$[AMOUNT] to upload.
+                </message>
+        </notify>
+        <notify name="UploadingSnapshot" tip="true">
+                <message name="message">
+                        Uploading in-world snapshot...
+(Takes a minute or so.)
+                </message>
+        </notify>
+        <notify name="UploadWebSnapshotDone" tip="true">
+                <message name="message">
+                        Web site snapshot upload done.
+                </message>
+        </notify>
+        <notify name="UploadSnapshotDone" tip="true">
+                <message name="message">
+                        In-world snapshot upload done
+                </message>
+        </notify>
+        <notify name="TerrainDownloaded" tip="true">
+                <message name="message">
+                        Terrain.raw downloaded
+                </message>
+        </notify>
+        <notify name="InMaxGroups" tip="true">
+                <message name="message">
+                        You are already in the maximum number of groups. You will need to leave a group before you can create one.
+                </message>
+        </notify>
+        <notify name="GestureMissing" tip="true">
+                <message name="message">
+                        Gesture [NAME] is missing from database.
+                </message>
+        </notify>
+        <notify name="UnableToLoadGesture" tip="true">
+                <message name="message">
+                        Unable to load gesture [NAME].
+Please try again.
+                </message>
+        </notify>
+        <notify name="InventoryLoaded" tip="true">
+                <message name="message">
+                        Your inventory is loaded.
+                </message>
+        </notify>
+        <notify name="LandmarkMissing" tip="true">
+                <message name="message">
+                        Landmark is missing from database.
+                </message>
+        </notify>
+        <notify name="UnableToLoadLandmark" tip="true">
+                <message name="message">
+                        Unable to load landmark.  Please try again.
+                </message>
+        </notify>
+        <notify name="CapsKeyOn" tip="true">
+                <message name="message">
+                        Your Caps Lock key is on.
+As this will affect the password you type in,
+you will probably want to turn it off.
+                </message>
+        </notify>
+        <notify name="NotecardMissing" tip="true">
+                <message name="message">
+                        Notecard is missing from database.
+                </message>
+        </notify>
+        <notify name="NotecardNoPermissions" tip="true">
+                <message name="message">
+                        Insufficient permissions to view notecard.
+                </message>
+        </notify>
+        <notify name="RezItemNoPermissions" tip="true">
+                <message name="message">
+                        Insufficient permissions to rez object.
+                </message>
+        </notify>
+        <notify name="UnableToLoadNotecard" tip="true">
+                <message name="message">
+                        Unable to load notecard.
+Please try again.
+                </message>
+        </notify>
+        <notify name="ScriptMissing" tip="true">
+                <message name="message">
+                        Script is missing from database.
+                </message>
+        </notify>
+        <notify name="ScriptNoPermissions" tip="true">
+                <message name="message">
+                        Insufficient permissions to view script.
+                </message>
+        </notify>
+        <notify name="UnableToLoadScript" tip="true">
+                <message name="message">
+                        Unable to load script.  Please try again.
+                </message>
+        </notify>
+        <notify name="IncompleteInventory" tip="true">
+                <message name="message">
+                        The complete contents you are offering are not yet
+locally available. Please try offering those items
+again in a minute.
+                </message>
+        </notify>
+        <notify name="CannotModifyProtectedCategories" tip="true">
+                <message name="message">
+                        You cannot modify protected categories.
+                </message>
+        </notify>
+        <notify name="CannotRemoveProtectedCategories" tip="true">
+                <message name="message">
+                        You cannot remove protected categories.
+                </message>
+        </notify>
+        <notify name="OfferedCard" tip="true">
+                <message name="message">
+                        You have offered a calling card to [FIRST] [LAST]
+                </message>
+        </notify>
+        <notify name="UnableToBuyWhileDownloading" tip="true">
+                <message name="message">
+                        Unable to buy while downloading object data.
+Please try again.
+                </message>
+        </notify>
+        <notify name="UnableToLinkWhileDownloading" tip="true">
+                <message name="message">
+                        Unable to link while downloading object data.
+Please try again.
+                </message>
+        </notify>
+        <notify name="CannotBuyObjectsFromDifferentOwners" tip="true">
+                <message name="message">
+                        Cannot buy objects from different owners at the same time.
+Please select a single object.
+                </message>
+        </notify>
+        <notify name="ObjectNotForSale" tip="true">
+                <message name="message">
+                        Object does not appear to be for sale.
+                </message>
+        </notify>
+        <notify name="EnteringGodMode" tip="true">
+                <message name="message">
+                        Entering god mode, level [LEVEL]
+                </message>
+        </notify>
+        <notify name="LeavingGodMode" tip="true">
+                <message name="message">
+                        Leaving god mode, level [LEVEL]
+                </message>
+        </notify>
+        <notify name="CopyFailed" tip="true">
+                <message name="message">
+                        Copy failed because you lack copy permission
+                </message>
+        </notify>
+        <notify name="InventoryAccepted" tip="true">
+                <message name="message">
+                        [NAME] accepted your inventory offer.
+                </message>
+        </notify>
+        <notify name="InventoryDeclined" tip="true">
+                <message name="message">
+                        [NAME] declined your inventory offer.
+                </message>
+        </notify>
+        <notify name="ObjectMessage" tip="true">
+                <message name="message">
+                        [NAME]: [MESSAGE]
+                </message>
+        </notify>
+        <notify name="CallingCardAccepted" tip="true">
+                <message name="message">
+                        Your calling card was accepted.
+                </message>
+        </notify>
+        <notify name="CallingCardDeclined" tip="true">
+                <message name="message">
+                        Your calling card was declined.
+                </message>
+        </notify>
+        <notify name="TeleportToLandmark" tip="true">
+                <message name="message">
+                        Now that you have reached the mainland, you can teleport to locations like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder.
+Double click on the landmark and click on Teleport to travel there.
+                </message>
+        </notify>
+        <notify name="TeleportToPerson" tip="true">
+                <message name="message">
+                        Now that you have reached the mainland, you can contact residents like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder.
+Double click on the card, click on Instant Message, and type a message.
+                </message>
+        </notify>
+        <notify name="CantSelectLandFromMultipleRegions" tip="true">
+                <message name="message">
+                        Can&apos;t select land across server boundaries.
+Try selecting a smaller piece of land.
+                </message>
+        </notify>
+        <notify name="GenerticNotify" tip="false">
+                <message name="message">
+                        [MESSAGE]
+                </message>
+        </notify>
+        <notify name="GroupVote" tip="false">
+                <message name="message">
+                        [NAME] has proposed to vote on:
+[MESSAGE]
+                </message>
+                <option name="VoteNow">
+                        Vote Now
+                </option>
+                <option name="Later">
+                        Later
+                </option>
+        </notify>
+        <notify name="GroupElection" tip="false">
+                <message name="message">
+                        [NAME] has started an election:
+[MESSAGE]
+                </message>
+                <option name="VoteNow">
+                        Vote Now
+                </option>
+                <option name="Later">
+                        Later
+                </option>
+        </notify>
+        <notify name="SystemMessage" tip="false">
+                <message name="message">
+                        [MESSAGE]
+                </message>
+        </notify>
+        <notify name="EventNotification" tip="false">
+                <message name="message">
+                        Event Notification:
+ 
+[NAME]
+[DATE]
+                </message>
+                <option name="Teleport">
+                        Teleport
+                </option>
+                <option name="Description">
+                        Description
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </notify>
+        <notify name="TransferObjectsHighlighted" tip="false">
+                <message name="message">
+                        All objects on this parcel that will transfer
+to the purchaser of this parcel are now highlighted.
+ 
+* Trees and grasses that will transfer are not highlighted.
+                </message>
+                <option name="Done">
+                        Done
+                </option>
+        </notify>
+        <notify name="DeactivatedGesturesTrigger" tip="false">
+                <message name="message">
+                        Deactivated gestures with same trigger:
+[NAMES]
+                </message>
+        </notify>
+        <notify name="InventoryNetworkCorruption" tip="false">
+                <message name="message">
+                        Inventory could not be loaded because of network corruption. This indicates a bad network connection.
+                </message>
+        </notify>
+        <notify name="NoQuickTime" tip="false">
+                <message name="message">
+                        Apple&apos;s QuickTime software does not appear to be installed on your system.
+If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player.
+                </message>
+        </notify>
+        <notify name="OwnedObjectsReturned" tip="false">
+                <message name="message">
+                        The objects you own on the selected parcel of land 
+have been returned back to your inventory.
+                </message>
+        </notify>
+        <notify name="OtherObjectsReturned" tip="false">
+                <message name="message">
+                        The objects on the selected parcel of land
+that is owned by [FIRST] [LAST]
+have been returned to his or her inventory.
+                </message>
+        </notify>
+        <notify name="OtherObjectsReturned2" tip="false">
+                <message name="message">
+                        The objects on the selected parcel of land 
+owned by the resident &apos;[NAME]&apos;
+have been returned to their owner.
+                </message>
+        </notify>
+        <notify name="GroupObjectsReturned" tip="false">
+                <message name="message">
+                        The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner&apos;s inventory.
+Transferable deeded objects have been returned to their previous owners.
+Non-transferable objects that are deeded to the group have been deleted.
+                </message>
+        </notify>
+        <notify name="UnOwnedObjectsReturned" tip="false">
+                <message name="message">
+                        The objects on the selected parcel that are NOT owned by you have been returned to their owners.
+                </message>
+        </notify>
+        <notify name="NotSafe" tip="false" unique="true">
+                <message name="message">
+                        This land has damage enabled (&apos;not safe&apos;).
+You can be hurt here. If you die, you will be teleported to your home location.
+                </message>
+        </notify>
+        <notify name="NoFly" tip="false" unique="true">
+                <message name="message">
+                        This land has flying disabled (&apos;no fly&apos;).
+You cannot fly here.
+                </message>
+        </notify>
+        <notify name="PushRestricted" tip="false" unique="true">
+                <message name="message">
+                        This land is &apos;No Pushing&apos;.
+You cannot push others here unless you own the land.
+                </message>
+        </notify>
+        <notify name="NoVoice" tip="false" unique="true">
+                <message name="message">
+                        This land has voice disabled.
+                </message>
+        </notify>
+        <notify name="NoBuild" tip="false" unique="true">
+                <message name="message">
+                        This land has building disabled (&apos;no build&apos;).
+You cannot create objects here.
+                </message>
+        </notify>
+        <notify name="ScriptsStopped" tip="false">
+                <message name="message">
+                        An administrator has temporarily stopped scripts in this region.
+                </message>
+        </notify>
+        <notify name="ScriptsNotRunning" tip="false">
+                <message name="message">
+                        This region is not running any scripts.
+                </message>
+        </notify>
+        <notify name="NoOutsideScripts" tip="false">
+                <message name="message">
+                        This land has outside scripts disabled
+(&apos;no outside scripts&apos;).
+No scripts will run except those belonging to the land owner.
+                </message>
+        </notify>
+        <notify name="ApproveURL" tip="false">
+                <message name="message">
+                        An object wants to display this web page on its surface:
+[URL]
+                </message>
+                <option name="LoadPage">
+                        Load Page
+                </option>
+                <option name="Don&apos;tLoad">
+                        Don&apos;t Load
+                </option>
+        </notify>
+        <notify name="ClaimPublicLand" tip="false">
+                <message name="message">
+                        Can only claim public land in region you&apos;re in.
+                </message>
+        </notify>
+        <notify name="ObjectGiveItem" tip="false">
+                <message name="message">
+                        An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME].
+                </message>
+                <option name="Keep">
+                        Keep
+                </option>
+                <option name="Discard">
+                        Discard
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="ObjectGiveItemUnknownUser" tip="false">
+                <message name="message">
+                        An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME].
+                </message>
+                <option name="Keep">
+                        Keep
+                </option>
+                <option name="Discard">
+                        Discard
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="UserGiveItem" tip="false">
+                <message name="message">
+                        [NAME] has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.
+                </message>
+                <option name="Keep">
+                        Keep
+                </option>
+                <option name="Discard">
+                        Discard
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="GodMessage" tip="false">
+                <message name="message">
+                        [NAME]
+[MESSAGE]
+                </message>
+        </notify>
+        <notify name="JoinGroup" tip="false">
+                <message name="message">
+                        [MESSAGE]
+                </message>
+                <option name="Join">
+                        Join
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Info">
+                        Info
+                </option>
+        </notify>
+        <notify name="JoinGroupOfficerNoFee" tip="false">
+                <message name="message">
+                        [NAME] has invited you
+to join a group as an officer.
+There is no cost to join this group.
+ 
+[MESSAGE]
+                </message>
+                <option name="Join">
+                        Join
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Info">
+                        Info
+                </option>
+        </notify>
+        <notify name="JoinGroupMember" tip="false">
+                <message name="message">
+                        [NAME] has invited you
+to join a group as a member.
+To join this group, you will have to pay a signup fee of L$[COST]
+ 
+[MESSAGE]
+                </message>
+                <option name="Join">
+                        Join
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Info">
+                        Info
+                </option>
+        </notify>
+        <notify name="JoinGroupMemberNoFee" tip="false">
+                <message name="message">
+                        [NAME] has invited you
+to join a group as a member.
+There is no cost to join this group.
+ 
+[MESSAGE]
+                </message>
+                <option name="Join">
+                        Join
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Info">
+                        Info
+                </option>
+        </notify>
+        <notify name="OfferTeleport" tip="false">
+                <message name="message">
+                        [NAME] has offered to teleport you
+to his or her location:
+ 
+[MESSAGE]
+                </message>
+                <option name="Teleport">
+                        Teleport
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </notify>
+        <notify name="GotoURL" tip="false">
+                <message name="message">
+                        [MESSAGE]
+[URL]
+                </message>
+                <option name="Later">
+                        Later
+                </option>
+                <option name="GoNow...">
+                        Go Now...
+                </option>
+        </notify>
+        <notify name="OfferFriendship" tip="false">
+                <message name="message">
+                        [NAME] is offering friendship.
+ 
+[MESSAGE]
+ 
+(By default, you will be able to see each other&apos;s online status.)
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
+        </notify>
+        <notify name="OfferFriendshipNoMessage" tip="false">
+                <message name="message">
+                        [NAME] is offering friendship.
+
+(By default, you will be able to 
+see each other&apos;s online status.)
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
+        </notify>
+        <notify name="FriendshipAccepted" tip="false">
+                <message name="message">
+                        [NAME] accepted your friendship offer.
+                </message>
+        </notify>
+        <notify name="FriendshipDeclined" tip="false">
+                <message name="message">
+                        [NAME] declined your friendship offer.
+                </message>
+        </notify>
+        <notify name="OfferCallingCard" tip="false">
+                <message name="message">
+                        [FIRST] [LAST] is offering their calling card.
+This will add a bookmark in your inventory
+so you can quickly IM this resident.
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
+        </notify>
+        <notify name="RegionRestartMinutes" tip="false">
+                <message name="message">
+                        Region is restarting in [MINUTES] minutes.
+If you remain in this region you will be logged out.
+                </message>
+        </notify>
+        <notify name="RegionRestartSeconds" tip="false">
+                <message name="message">
+                        Region is restarting in [SECONDS] seconds.
+If you remain in this region you will be logged out.
+                </message>
+        </notify>
+        <notify name="LoadWebPage" tip="false">
+                <message name="message">
+                        Load web page [URL]?
+ 
+[MESSAGE]
+ 
+From object: [OBJECTNAME], owner: [NAME]?
+                </message>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </notify>
+        <notify name="FailedToLoadWearableUnnamed" tip="false">
+                <message name="message">
+                        Oops!
+You tried to wear a [TYPE] and it did not load.
+
+Don't panic.
+Try again in a minute to give things a chance to settle down.
+                </message>
+        </notify>
+        <notify name="FailedToLoadWearable" tip="false">
+                <message name="message">
+                        Oops!
+You tried to wear [TYPE] named [DESC] and it did not load.
+
+Don't panic.
+Try again in a minute to give things a chance to settle down.
+                </message>
+        </notify>
+        <notify name="FailedToFindWearableUnnamed" tip="false">
+                <message name="message">
+                        Failed to find [TYPE] in database.
+                </message>
+        </notify>
+        <notify name="FailedToFindWearable" tip="false">
+                <message name="message">
+                        Failed to find [TYPE] named [DESC] in database.
+                </message>
+        </notify>
+        <notify caution="true" name="ScriptTakeMoney" tip="false">
+                <message name="message">
+                        Take Linden dollars (L$) from you
+                </message>
+        </notify>
+        <notify name="ActOnControlInputs" tip="false">
+                <message name="message">
+                        Act on your control inputs
+                </message>
+        </notify>
+        <notify name="RemapControlInputs" tip="false">
+                <message name="message">
+                        Remap your control inputs
+                </message>
+        </notify>
+        <notify name="AnimateYourAvatar" tip="false">
+                <message name="message">
+                        Animate your avatar
+                </message>
+        </notify>
+        <notify name="AttachToYourAvatar" tip="false">
+                <message name="message">
+                        Attach to your avatar
+                </message>
+        </notify>
+        <notify name="ReleaseOwnership" tip="false">
+                <message name="message">
+                        Release ownership and become public
+                </message>
+        </notify>
+        <notify name="LinkAndDelink" tip="false">
+                <message name="message">
+                        Link and delink from other objects
+                </message>
+        </notify>
+        <notify name="AddAndRemoveJoints" tip="false">
+                <message name="message">
+                        Add and remove joints with other objects
+                </message>
+        </notify>
+        <notify name="ChangePermissions" tip="false">
+                <message name="message">
+                        Change its permissions
+                </message>
+        </notify>
+        <notify name="TrackYourCamera" tip="false">
+                <message name="message">
+                        Track your camera
+                </message>
+        </notify>
+        <notify name="ControlYourCamera" tip="false">
+                <message name="message">
+                        Control your camera
+                </message>
+        </notify>
+        <notify name="ScriptQuestion" tip="false">
+                <message name="message">
+                        &apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
+ 
+[QUESTIONS]
+Is this OK?
+                </message>
+                <option name="Yes">
+                        Yes
+                </option>
+                <option name="No">
+                        No
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="ScriptQuestionCautionChatGranted" tip="false">
+                <message name="message">
+                        &apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].
+                </message>
+        </notify>
+        <notify name="ScriptQuestionCautionChatDenied" tip="false">
+                <message name="message">
+                        &apos;[OBJECTNAME]&apos;, an object owned by &apos;[OWNERNAME]&apos;, located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].
+                </message>
+        </notify>
+        <notify name="ScriptQuestionCautionWarn" tip="false">
+                <message name="message">
+                        An object wants permission to take Linden dollars (L$) from your account.
+                </message>
+        </notify>
+        <notify caution="true" name="ScriptQuestionCaution" tip="false">
+                <message name="message">
+                        &apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
+ 
+[QUESTIONS]
+If you do not trust this object and its creator, you should deny the request. For additional information, click the Details button.
+
+Grant this request?
+                </message>
+                <option name="Grant">
+                        Grant
+                </option>
+                <option default="true" name="Deny">
+                        Deny
+                </option>
+                <option name="Details">
+                        Details...
+                </option>
+        </notify>
+        <notify name="ScriptDialog" tip="false">
+                <message name="message">
+                        [FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
+[MESSAGE]
+                </message>
+                <option name="Ignore">
+                        Ignore
+                </option>
+        </notify>
+        <notify name="ScriptDialogGroup" tip="false">
+                <message name="message">
+                        [GROUPNAME]&apos;s &apos;[TITLE]&apos;
+[MESSAGE]
+                </message>
+                <option name="Ignore">
+                        Ignore
+                </option>
+        </notify>
+        <notify name="FirstBalanceIncrease" tip="false">
+                <message name="message">
+                        You just received L$[AMOUNT].
+Objects and other users may give you L$.
+Your balance is shown in the
+upper-right corner of the screen.
+                </message>
+        </notify>
+        <notify name="FirstBalanceDecrease" tip="false">
+                <message name="message">
+                        You just paid L$[AMOUNT].
+Your balance is shown in the upper-right 
+corner of the screen.
+                </message>
+        </notify>
+        <notify name="FirstSit" tip="false">
+                <message name="message">
+                        You are sitting.
+Use the arrow keys (or AWSD) to change the view.
+Click the &apos;Stand Up&apos; button to get up.
+                </message>
+        </notify>
+        <notify name="FirstMap" tip="false">
+                <message name="message">
+                        Click and drag to scroll the map.
+Double-click to teleport.
+Use the controls on the right to find things
+and display different backgrounds.
+                </message>
+        </notify>
+<!-- TODO: Make sure all the notifications from Imprudence <= 1.2 are out of here before deleting this. -->
+  <notify name="FirstMiniMap" tip="false">
+    <message name="message">
+      Right-click the Mini-Map for more options.
+    </message>
+  </notify>
+        <notify name="FirstBuild" tip="false">
+                <message name="message">
+                        You can build new objects in some areas of [SECOND_LIFE].
+Use the tools in the upper left to build, and try 
+holding down Ctrl or Alt to rapidly switch tools.
+Press Esc to stop building.
+                </message>
+        </notify>
+        <notify name="FirstLeftClickNoHit" tip="false">
+                <message name="message">
+                        Left-clicking interacts with special objects. 
+If the mouse pointer changes to a hand, 
+you can interact with the object.  
+Right-click always shows a menu of things you can do.
+                </message>
+        </notify>
+        <notify name="FirstTeleport" tip="false">
+                <message name="message">
+                        This region doesn't allow point-to-point teleports, so you've been transported to the nearest telehub. 
+Your destination is marked with a tall beacon. 
+Follow the red arrow to the beacon, or click the arrow to dismiss the beacon.
+                </message>
+        </notify>
+        <notify name="FirstOverrideKeys" tip="false">
+                <message name="message">
+                        Your movement keys are now being handled by an object.  
+Try the arrow keys or AWSD to see what they do.  
+Some objects (like guns) require you to go into mouselook  to use them. 
+Press &apos;M&apos; to do this.
+                </message>
+        </notify>
+        <notify name="FirstAppearance" tip="false">
+                <message name="message">
+                        You are editing your appearance.  
+To rotate and zoom view, use the arrow keys. 
+When you are finished, press &apos;Save All&apos; 
+to save your look and exit.  
+You can edit your appearance as often as you like.
+                </message>
+        </notify>
+        <notify name="FirstInventory" tip="false">
+                <message name="message">
+                        This is your inventory, which contains objects, notecards, clothing, and other things you own.
+* To wear an object or outfit folder, drag it onto yourself.
+* To bring an object into the world, drag it onto the ground.
+* To read a notecard, double-click it.
+                </message>
+        </notify>
+        <notify name="FirstSandbox" tip="false">
+                <message name="message">
+                        This is a sandbox region.
+Objects you build here may be deleted after
+you leave the area, Sandboxes clean on a regular basis, please refer to the information at the top of the screen next to the region name.
+ 
+Sandbox regions are uncommon, and are marked with signs.
+                </message>
+        </notify>
+        <notify name="FirstFlexible" tip="false">
+                <message name="message">
+                        This object is flexible. 
+Flexible objects may not be physical and must be phantom 
+until the flexible checkbox is unchecked.
+                </message>
+        </notify>
+        <notify name="FirstDebugMenus" tip="false">
+                <message name="message">
+                        You have enabled the Advanced menu. 
+This menu contains features useful for developers debugging Second Life.
+To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D.
+                </message>
+        </notify>
+        <notify name="FirstSculptedPrim" tip="false">
+                <message name="message">
+                        You are editing a sculpted prim.  
+Sculpted prims require a special texture to specify their shape.  
+You can find example sculpted textures in the inventory library.
+                </message>
+        </notify>
+        <notify name="FirstMedia" tip="false">
+                <message name="message">
+                        You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
+                </message>
+        </notify>
+  <!-- [RLVa:KB] -->
+  <notify name="FirstRLVDetach" tip="false">
+    <message name="message">
+One of your attachments was made nondetachable using Restrained Life.
+Please note that this also disables the &apos;Wear&apos; option on all prim attachments in your inventory unless they are properly named.
+
+For more information search for &apos;Restrained Life&apos; on the SL wiki.
+    </message>
+  </notify>
+  <notify name="FirstRLVFartouch" tip="false">
+    <message name="message">
+You have been fartouch restricted: you will be unable to touch objects farther than 1.5m from your avatar until the restriction is lifted.
+
+Tip: if an object is out of range the mouse cursor will not change as you hover over it and you'll hear an error sound if you try to right-click it.
+    </message>
+  </notify>
+  <!-- [/RLVa:KB] -->
+  <notify name="MaxListSelectMessage" tip="true">
+                <message name="message">
+                        You may only select up to [MAX_SELECT] items
+from this list.
+                </message>
+        </notify>
+        <notify name="VoiceInviteP2P" tip="false" unique="true">
+                <message name="message">
+                        [NAME] is inviting you to a Voice Chat call. 
+Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="AutoUnmuteByIM" tip="false">
+                <message name="message">
+                        [FIRST] [LAST] was sent an instant message and has been automatically unmuted.
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByMoney" tip="false">
+                <message name="message">
+                        [FIRST] [LAST] was given money and has been automatically unmuted.
+                </message>
+        </notify>
+        <notify name="AutoUnmuteByInventory" tip="false">
+                <message name="message">
+                        [FIRST] [LAST] was offered inventory and has been automatically unmuted.
+                </message>
+        </notify>
+        <notify name="VoiceInviteGroup" tip="false" unique="true">
+                <message name="message">
+                        [NAME] has joined a Voice Chat call with the group [GROUP]. 
+Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="VoiceInviteAdHoc" tip="false" unique="true">
+                <message name="message">
+                        [NAME] has joined a Voice Chat call with a conference chat.. 
+Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this user.
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="InviteAdHoc" tip="false" unique="true">
+                <message name="message">
+                        [NAME] is inviting you to a conference chat. 
+Click Accept to join the chat or Decline to decline the invitation. Click Mute to mute this user.
+                </message>
+                <option name="Accept">
+                        Accept
+                </option>
+                <option name="Decline">
+                        Decline
+                </option>
+                <option name="Mute">
+                        Mute
+                </option>
+        </notify>
+        <notify name="VoiceChannelFull" tip="true" unique="true">
+                <message name="message">
+                        The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later.
+                </message>
+        </notify>
+        <notify name="ProximalVoiceChannelFull" tip="true" unique="true">
+                <message name="message">
+                        We&apos;re sorry.  This area has reached maximum capacity for voice conversations.  Please try to use voice in another area.
+                </message>
+        </notify>
+        <notify name="VoiceChannelDisconnected" tip="true" unique="true">
+                <message name="message">
+                        You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnected to spatial voice chat.
+                </message>
+        </notify>
+        <notify name="VoiceChannelDisconnectedP2P" tip="true" unique="true">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] has ended the call.  You will now be reconnected to spatial voice chat.
+                </message>
+        </notify>
+        <notify name="P2PCallDeclined" tip="true" unique="true">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] has declined your call.  You will now be reconnected to spatial voice chat.
+                </message>
+        </notify>
+        <notify name="P2PCallNoAnswer" tip="true" unique="true">
+                <message name="message">
+                        [VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to spatial voice chat.
+                </message>
+        </notify>
+        <notify name="VoiceChannelJoinFailed" tip="true" unique="true">
+                <message name="message">
+                        Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to spatial voice chat.
+                </message>
+        </notify>
+        <notify duration="10" name="VoiceLoginRetry" tip="true" unique="true">
+                <message name="message">
+                        We are creating a voice channel for you. This may take up to one minute.
+                </message>
+        </notify>
+        <notify name="Cannot enter parcel: not a group member" tip="true">
+                <message name="message">
+                        Cannot enter parcel, you are not a member of the appropriate group.
+                </message>
+        </notify>
+        <notify name="Cannot enter parcel: banned" tip="true">
+                <message name="message">
+                        Cannot enter parcel, you have been banned.
+                </message>
+        </notify>
+        <notify name="Cannot enter parcel: not on access list" tip="true">
+                <message name="message">
+                        Cannot enter parcel, you are not on the access list.
+                </message>
+        </notify>
+        <notify name="VoiceNotAllowed" tip="true" unique="true">
+                <message name="message">
+                        You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
+                </message>
+        </notify>
+        <notify name="VoiceCallGenericError" tip="true" unique="true">
+                <message name="message">
+                        An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
+                </message>
+        </notify>
+        <notify caution="true" duration="10" name="ServerVersionChanged" tip="true">
+                <message name="message">
+                        The region you have entered is running a different simulator version. Click this message for details.
+                </message>
+        </notify>
+        <notify caution="true" name="UnableToOpenCommandURL" tip="true">
+                <message name="message">
+                        The URL you clicked cannot be opened from this web browser.
+                </message>
+        </notify>
 </notifications>
 <!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index a3a4b1a..921cd8e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -1,430 +1,414 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="-550" height="486" left="350" name="Panel Avatar" width="430">
-        <tab_container bottom="-486" height="486" left="0" mouse_opaque="false" name="tab"
+<panel bottom="-575" height="511" left="350" name="Panel Avatar" width="430">
+  <tab_container bottom="-511" height="511" left="0" mouse_opaque="false" name="tab"
              tab_min_width="50" tab_position="top" width="419">
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+    <panel border="true" bottom="-507" follows="left|top|right|bottom" height="491"
                      label="2nd Life" left="1" mouse_opaque="true" name="2nd Life" width="418">
-                        <string name="CaptionTextAcctInfo">
-                                [ACCTTYPE]
+      <string name="CaptionTextAcctInfo">
+[ACCTTYPE]
 [PAYMENTINFO]
 [AGEVERIFICATION]
-                        </string>
-                        <string name="AcctTypeResident">
-                                Resident
-                        </string>
-                        <string name="AcctTypeTrial">
-                                Trial
-                        </string>
-                        <string name="AcctTypeCharterMember">
-                                Charter Member
-                        </string>
-                        <string name="AcctTypeEmployee">
-                                Linden Lab Employee
-                        </string>
-                        <string name="PaymentInfoUsed">
-                                Payment Info Used
-                        </string>
-                        <string name="PaymentInfoOnFile">
-                                Payment Info On File
-                        </string>
-                        <string name="NoPaymentInfoOnFile">
-                                No Payment Info On File
-                        </string>
-                        <string name="AgeVerified">
-                                Age-verified
-                        </string>
-                        <string name="NotAgeVerified">
-                                Not Age-verified
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Name:" v_pad="0" width="70">
-                                Name:
-                        </text>
-                        <name_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom="-24" enabled="false" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
-                             max_length="254" mouse_opaque="false" name="name"
-                             width="180" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="online_yes" v_pad="0" width="121">
-                                Currently Online
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="label" v_pad="0" width="121">
-                                Born:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line"
+      </string>
+      <string name="AcctTypeResident">
+        Resident
+      </string>
+      <string name="AcctTypeTrial">
+        Trial
+      </string>
+      <string name="AcctTypeCharterMember">
+        Charter Member
+      </string>
+      <string name="AcctTypeEmployee">
+        Linden Lab Employee
+      </string>
+      <string name="PaymentInfoUsed">
+        Payment Info Used
+      </string>
+      <string name="PaymentInfoOnFile">
+        Payment Info On File
+      </string>
+      <string name="NoPaymentInfoOnFile">
+        No Payment Info On File
+      </string>
+      <string name="AgeVerified">
+        Age-verified
+      </string>
+      <string name="NotAgeVerified">
+        Not Age-verified
+      </string>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-23" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifsmall" h_pad="0" halign="left" height="16" right="-12"
+                             mouse_opaque="true" name="online_yes" v_pad="0" width="145">
+        Currently: Online
+      </text>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left_delta="0"
+                             mouse_opaque="true" name="online_no" v_pad="0" width="145">
+        Currently: Offline
+      </text>
+      <button bottom_delta="-19" font="SansSerif" halign="center" height="20"
+                             label="Instant Message..." label_selected="Instant Message..."
+                             right="-12" mouse_opaque="true" name="Instant Message..."
+                             tool_tip="Instant Message (IM)" width="145" />
+      <button bottom_delta="-23" font="SansSerif" halign="center" height="20"
+                             label="Offer Teleport..." label_selected="Offer Teleport..."
+                             left_delta="0" mouse_opaque="true" name="Offer Teleport..." width="145" />
+      <button bottom_delta="-34" font="SansSerif" halign="center" height="20"
+                             label="Add to Friends..." label_selected="Add to Friends..." left_delta="0"
+                             mouse_opaque="true" name="Add Friend..." width="145" />
+      <button bottom_delta="-23" font="SansSerif" halign="center" height="20"
+                             label="Invite to Group..." label_selected="Invite to Group..." left_delta="0"
+                             mouse_opaque="true" name="Invite to Group..." width="145" />
+      <button bottom_delta="-23" font="SansSerif" halign="center" height="20" label="Find on Map"
+                             label_selected="Find on Map" left_delta="0" mouse_opaque="true"
+                             name="Find on Map" width="145" />
+      <button bottom_delta="-34" font="SansSerif" halign="center" height="20" label="Pay..."
+                             label_selected="Pay..." left_delta="0" mouse_opaque="true" name="Pay..."
+                             width="145" />
+      <button bottom_delta="-23" font="SansSerif" halign="center" height="20" label="Mute"
+                             label_selected="Mute" left_delta="0" mouse_opaque="true" name="Mute"
+                             width="145" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
+                             mouse_opaque="true" name="label" v_pad="0" width="145">
+        Born:
+      </text>
+      <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
+                             font="SansSerifSmall" height="18" is_unicode="false" right="-12"
                              max_length="254" mouse_opaque="false" name="born"
-                             width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="label2" v_pad="0" width="121">
-                                Account:
-                        </text>
-                        <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
-                             mouse_opaque="false" name="acct_border" width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false"
+                             width="145" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
+                             mouse_opaque="true" name="label2" v_pad="0" width="145">
+        Account:
+      </text>
+      <view_border bevel_style="in" bottom_delta="-52" follows="left|top" height="52" right="-12"
+                             mouse_opaque="false" name="acct_border" width="145" />
+      <text bg_visible="false" border_drop_shadow_visible="false"
                              border_visible="true" bottom_delta="0" drop_shadow_visible="true"
-                             follows="left|top" font="SansSerifSmall" height="48" left="279"
+                             follows="left|top" font="SansSerifSmall" height="48" left="264"
                              mouse_opaque="false" name="acct" width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-12"
                              mouse_opaque="true" name="partner_label"
                              tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-                             v_pad="0" width="130">
-                                Partner:
-                        </text>
-                        <button bottom_delta="2" follows="left|top" font="SansSerif" halign="center"
+                             v_pad="0" width="145">
+        Partner:
+      </text>
+      <button bottom_delta="1" follows="left|top" font="SansSerif" halign="center"
                              height="18" label="i" label_selected="i" left_delta="44"
                              mouse_opaque="true" name="partner_info"
-                             tool_tip="Click to open partner&apos;s profile" width="18" />
-                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+                             tool_tip="Click to open partner&apos;s profile" width="20" />
+      <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
                              height="18" label="?" label_selected="?" left_delta="24"
-                             mouse_opaque="true" name="partner_help" width="18" />
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
+                             mouse_opaque="true" name="partner_help" width="20" />
+      <line_editor bevel_style="in" border_style="line"
+                             border_thickness="1" bottom_delta="-19" enabled="true" follows="left|top"
+                             font="SansSerifSmall" height="18" is_unicode="false" right="-12"
                              max_length="254" mouse_opaque="false" name="partner_edit"
                              tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-                             width="121">
-                                [FIRST] [LAST]
-                        </line_editor>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-44" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Photo:" v_pad="0" width="70">
-                                Photo:
-                        </text>
-                        <texture_picker allow_no_texture="true" bottom="-179" can_apply_immediately="false"
-                             default_image_name="None" follows="left|top" height="151" label=""
-                             left="79" mouse_opaque="true" name="img"
-                             tool_tip="Click to choose a picture" width="180" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-183" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Groups:" v_pad="0" width="70">
-                                Groups:
-                        </text>
-                        <scroll_list background_visible="true" bottom="-258" column_padding="5" draw_border="true"
-                             follows="left|top" height="90" left="79" mouse_opaque="false"
-                             multi_select="false" name="groups" width="321" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-280" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="About:" v_pad="0" width="70">
-                                About:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="(500 chars)" v_pad="0" width="70">
-                                (500 chars)
-                        </text>
-                        <text_editor bottom="-375" embedded_items="false"
-                             enabled="true" follows="left|top" font="SansSerifSmall" height="110"
-                             is_unicode="false" left="79" max_length="511" mouse_opaque="true"
-                             name="about" width="321" word_wrap="true" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-403" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="Give item:" v_pad="0" width="75">
-                                Give item:
-                        </text>
-                        <view_border blevel_style="in" border_thickness="0" bottom="-466" follows="left|top"
-                             height="466" left_delta="4" mouse_opaque="false" name="drop_target_rect"
-                             width="409" />
-                        <view_border blevel_style="in" bottom="-403" follows="left|top" height="16" left_delta="75"
-                             mouse_opaque="false" name="drop_target_rect_vis" width="321" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             width="145">
+        [FIRST] [LAST]
+      </line_editor>
+      <name_editor bevel_style="in" border_style="line"
+                             border_thickness="1" bottom="-23" enabled="false" follows="left|top"
+                             font="SansSerifSmall" height="16" is_unicode="false" left="12"
+                             max_length="254" mouse_opaque="false" name="name"
+                             width="235" />
+      <texture_picker allow_no_texture="true" bottom="271" can_apply_immediately="false"
+                             default_image_name="None" follows="left|top" height="192" label=""
+                             left="12" mouse_opaque="true" name="img" scale_image="false" auto-resize="false"
+                             tool_tip="Click to choose a picture" width="235" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-6" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
+                             mouse_opaque="true" name="About:" v_pad="0" width="170">
+        About (500 chars):
+      </text>
+      <text_editor bottom_delta="-137" embedded_items="false"
+                             enabled="true" follows="left|top" font="SansSerifSmall" height="137"
+                             is_unicode="false" left_delta="0" max_length="511" mouse_opaque="true"
+                             name="about" width="235" word_wrap="true" />
+
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" halign="left" height="16" left="12"
+                             mouse_opaque="true" name="Groups:" width="70">
+        Groups:
+      </text>
+      <scroll_list background_visible="true" bottom_delta="-80" column_padding="5" draw_border="true"
+                             follows="left|top" height="80" left_delta="0" mouse_opaque="false"
+                             multi_select="false" name="groups" width="235" />
+      <view_border blevel_style="in" bottom_delta="0" follows="left|top" height="80" right="-12"
+                             mouse_opaque="false" name="drop_target_rect_vis" width="145" />
+      <view_border blevel_style="in" border_thickness="0" bottom_delta="0" follows="left|top"
+                             height="80" left_delta="0" mouse_opaque="false" name="drop_target_rect"
+                             width="145" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="40" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="center" height="16" right="-28"
+                             mouse_opaque="true" name="drop target"
+                             tool_tip="Drop inventory items here to give them to this resident." v_pad="2"
+                             width="115">
+        Drop inventory here
+      </text>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
-                             mouse_opaque="true" name="Give inventory"
-                             tool_tip="Drop inventory items here to give them to this person." v_pad="2"
-                             width="321">
-                                Drop inventory item here.
-                        </text>
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Show in search" left="75" mouse_opaque="true"
+                             mouse_opaque="true" name="Give inventory 2" width="115"
+                             tool_tip="Drop inventory items here to give them to this resident.">
+        to give to resident
+      </text>
+      <check_box bottom="1" follows="left|top" font="SansSerifSmall" height="16"
+                             initial_value="false" label="Show profile in search" left="18" mouse_opaque="true"
                              name="allow_publish"
                              tool_tip="Publish extra profile information such as description and image in Search."
-                             width="130" />
-                        <button bottom="-425" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?"
+                             width="145" />
+      <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="18"
+                             label="?" label_selected="?" left_delta="150" mouse_opaque="true" name="?"
                              width="20" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map"
-                             label_selected="Find on Map" left="24" mouse_opaque="true"
-                             name="Find on Map" width="100" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20"
-                             label="Offer Teleport..." label_selected="Offer Teleport..."
-                             left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="140" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20"
-                             label="Add Friend..." label_selected="Add Friend..." left_delta="142"
-                             mouse_opaque="true" name="Add Friend..." width="130" />
-                        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Pay..."
-                             label_selected="Pay..." left="24" mouse_opaque="true" name="Pay..."
-                             width="100" />
-                        <button bottom_delta="0" font="SansSerif" halign="center" height="20"
-                             label="Instant Message..." label_selected="Instant Message..."
-                             left_delta="102" mouse_opaque="true" name="Instant Message..."
-                             tool_tip="Instant Message (IM)" width="140" />
-                        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Mute"
-                             label_selected="Mute" left_delta="142" mouse_opaque="true" name="Mute"
-                             width="130" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                       label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
-                  <line_editor bevel_style="in" border_style="line"
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+                     label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
+      <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="10"
                              max_length="254" mouse_opaque="true" name="url_edit"
                              width="400" />
       <flyout_button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
                              height="18" label="Load" label_selected="Load" left="10"
-                             mouse_opaque="true" name="load" enabled="false" 
+                             mouse_opaque="true" name="load" enabled="false"
                              tool_tip="Load this profile page with embedded web browser." width="80" >
         <flyout_button_item value="open" name="open_item">In external browser</flyout_button_item>
         <flyout_button_item value="home" name="home_item">Home URL</flyout_button_item>
       </flyout_button>
-                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+      <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
                              height="18" label="?" label_selected="?" left_delta="85"
                              mouse_opaque="true" name="web_profile_help" width="18" />
-                        <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Automatically load web profiles"
                              left_delta="30" mouse_opaque="true" name="auto_load"
                              tool_tip="Automatically load ALL profile webpages without asking first."
                              width="127" />
-                        <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
+      <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
                              ignore_ui_scale="false" left="10" name="profile_html" start_url=""
                              width="400" />
-                        <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
+      <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
                              top="25" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-36" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
                              mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
-                                I Want To:
-                        </text>
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+        I Want To:
+      </text>
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Build" left_delta="70" mouse_opaque="true"
                              name="chk0" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Explore" left_delta="170" mouse_opaque="true"
                              name="chk1" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Meet" left_delta="-170" mouse_opaque="true"
                              name="chk2" width="57" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Be Hired" left_delta="170" mouse_opaque="true"
                              name="chk6" width="92" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Group" left_delta="-170" mouse_opaque="true"
                              name="chk3" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Buy" left_delta="170" mouse_opaque="true"
                              name="chk4" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Sell" left_delta="-170" mouse_opaque="true"
                              name="chk5" width="50" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
                              name="chk7" width="92" />
-                        <line_editor bevel_style="in" border_style="line"
+      <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="want_to_edit"
                              width="330" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
                              mouse_opaque="true" name="Skills:" v_pad="0" width="70">
-                                Skills:
-                        </text>
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+        Skills:
+      </text>
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Textures" left_delta="70" mouse_opaque="true"
                              name="schk0" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Architecture" left_delta="170"
                              mouse_opaque="true" name="schk1" width="93" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Event Planning" left_delta="0"
                              mouse_opaque="true" name="schk2" width="105" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Modeling" left_delta="-170"
                              mouse_opaque="true" name="schk3" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Scripting" left_delta="0" mouse_opaque="true"
                              name="schk4" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+      <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Custom Characters" left_delta="170"
                              mouse_opaque="true" name="schk5" width="127" />
-                        <line_editor bevel_style="in" border_style="line"
+      <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="skills_edit"
                              width="330" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
+                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="12"
                              mouse_opaque="true" name="Languages:" v_pad="0" width="70">
-                                Languages:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line"
+        Languages:
+      </text>
+      <line_editor bevel_style="in" border_style="line"
                              border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
                              font="SansSerifSmall" height="16" is_unicode="false" left="74"
                              max_length="254" mouse_opaque="true" name="languages_edit"
                              width="330" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="Picks" left="1" mouse_opaque="true" name="Picks" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
                              mouse_opaque="true"
                              name="Tell everyone about your favorite places in Second Life." v_pad="0"
                              width="302">
-                                Tell everyone about your favorite places in Second Life.
-                        </text>
-                        <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+        Tell everyone about your favorite places in Second Life.
+      </text>
+      <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="New..." label_selected="New..." left="114"
                              mouse_opaque="true" name="New..." width="75" />
-                        <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
+      <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Delete..." label_selected="Delete..." left_delta="79"
                              mouse_opaque="true" name="Delete..." width="75" />
-                        <tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false"
+      <tab_container bottom="-411" follows="left|top" height="363" left="12" mouse_opaque="false"
                              name="picks tab" tab_position="left" width="412" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
                              h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
                              name="loading_text" v_pad="0" width="302">
-                                Loading...
-                        </text>
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+        Loading...
+      </text>
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="Classified" left="1" mouse_opaque="true" name="Classified"
                      width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-20" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
                              mouse_opaque="true"
                              name="Place an ad in Second Life&apos;s classified listings." v_pad="0"
                              width="302">
-                                Place an ad in Second Life&apos;s classified listings.
-                        </text>
-                        <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+        Place an ad in Second Life&apos;s classified listings.
+      </text>
+      <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
                              height="20" label="New..." label_selected="New..." left="114"
                              mouse_opaque="true" name="New..." width="75" />
-                        <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
+      <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
                              label="Delete..." label_selected="Delete..." left_delta="79"
                              mouse_opaque="true" name="Delete..." width="75" />
-                        <tab_container bottom="-443" follows="left|top" height="395" left="4" mouse_opaque="false"
+      <tab_container bottom="-443" follows="left|top" height="395" left="12" mouse_opaque="false"
                              name="classified tab" tab_position="left" width="412" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
                              h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
                              name="loading_text" v_pad="0" width="302">
-                                Loading...
-                        </text>
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+        Loading...
+      </text>
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-36" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Photo:" v_pad="0" width="61">
-                                Photo:
-                        </text>
-                        <texture_picker allow_no_texture="true" bottom="-171" can_apply_immediately="false"
-                             default_image_name="None" follows="left|top" height="151" label=""
-                             left="70" mouse_opaque="true" name="img"
-                             tool_tip="Click to choose a picture" width="135" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-203" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Info:" v_pad="0" width="61">
-                                Info:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="(250 chars)" v_pad="0" width="65">
-                                (250 chars)
-                        </text>
-                        <text_editor bottom="-347" embedded_items="false"
-                             enabled="true" follows="left|top" font="SansSerifSmall" height="160"
-                             is_unicode="false" left="70" max_length="254" mouse_opaque="false"
-                             name="about" width="330" word_wrap="true" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
+      <texture_picker allow_no_texture="true" bottom="220" can_apply_immediately="false"
+                             default_image_name="None" follows="left|top" height="235" label=""
+                             left="12" mouse_opaque="true" name="img"
+                             tool_tip="Click to choose a picture" width="235" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-8" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+                             mouse_opaque="true" name="Info:" v_pad="0" width="161">
+        Info (250 chars):
+      </text>
+      <text_editor bottom_delta="-179" embedded_items="false"
+                             enabled="true" follows="left|top" font="SansSerifSmall" height="178"
+                             is_unicode="false" left="12" max_length="254" mouse_opaque="false"
+                             name="about" width="378" word_wrap="true" />
+    </panel>
+    <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
                      label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">
-                        <string name="Loading">
-                                Loading...
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      <string name="Loading">
+        Loading...
+      </string>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-52" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="48" left="10"
                              mouse_opaque="true" name="label" v_pad="0" width="412">
-                                Use this space to record your notes about this person.  Keep track
-of trades in progress, joint projects, etc.  Only you can see these
-notes.  This person cannot see them, nor can other people.
-                        </text>
-                        <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
+        Use this space to record your notes about this person.  Keep track
+        of trades in progress, joint projects, etc.  Only you can see these
+        notes.  This person cannot see them, nor can other people.
+      </text>
+      <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
                              font="SansSerif" height="256" is_unicode="false" left="10"
                              max_length="1023" mouse_opaque="true" name="notes edit" width="400"
                              word_wrap="false" />
-                </panel>
-        </tab_container>
-        <button bottom="-483" font="SansSerif" halign="center" height="20" label="OK"
+    </panel>
+  </tab_container>
+  <button bottom="-508" font="SansSerif" halign="center" height="20" label="OK"
              label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" />
-        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"
+  <button bottom="-508" font="SansSerif" halign="center" height="20" label="Cancel"
              label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
              width="100" />
-        <button bottom_delta="132" font="SansSerif" halign="center" height="20" label="Kick"
-             label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Freeze"
-             label_selected="Freeze" left="4" mouse_opaque="true" name="Freeze"
+  <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Kick"
+             label_selected="Kick" left="12" mouse_opaque="true" name="Kick" width="72" />
+  <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Freeze"
+             label_selected="Freeze" left_delta="76" mouse_opaque="true" name="Freeze"
              tool_tip="Stop this resident&apos;s movement and chat." width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20"
-             label="Unfreeze" label_selected="Unfreeze" left="4" mouse_opaque="true"
+  <button bottom_delta="0" font="SansSerif" halign="center" height="20"
+             label="Unfreeze" label_selected="Unfreeze" left_delta="76" mouse_opaque="true"
              name="Unfreeze" tool_tip="Thaw resident" width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="CSR"
-             label_selected="CSR" left="4" mouse_opaque="true" name="csr_btn"
+  <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="CSR"
+             label_selected="CSR" left_delta="76" mouse_opaque="true" name="csr_btn"
              tool_tip="Open customer service tool for this resident" width="72" />
-        <string name="ShowOnMapNonFriend">
-                Show location on the map.
-Disabled because you have not
-formed a friendship with them.
-        </string>
-        <string name="ShowOnMapFriendOffline">
-                Show location on the map.
+  <string name="ShowOnMapNonFriend">
+    Show location on the map.
+    Disabled because you have not
+    formed a friendship with them.
+  </string>
+  <string name="ShowOnMapFriendOffline">
+    Show location on the map.
     Disabled because they are not online.
-        </string>
-        <string name="ShowOnMapFriendOnline">
-                Show location on the map.
-        </string>
-        <string name="TeleportGod">
-                Force a teleport to your location.
-        </string>
-        <string name="TeleportPrelude">
-                Offer a teleport to your location.
-Disabled until you leave Orientation Island.
-        </string>
-        <string name="TeleportNormal">
-                Offer a teleport to your location.
-        </string>
-        <string name="Loading">
-                Loading...
-        </string>
+  </string>
+  <string name="ShowOnMapFriendOnline">
+    Show location on the map.
+  </string>
+  <string name="TeleportGod">
+    Force a teleport to your location.
+  </string>
+  <string name="TeleportPrelude">
+    Offer a teleport to your location.
+    Disabled until you leave Orientation Island.
+  </string>
+  <string name="TeleportNormal">
+    Offer a teleport to your location.
+  </string>
+  <string name="Loading">
+    Loading...
+  </string>
+  <string name="HiddenLabel">
+    (hidden)
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 464ecac..ac3a74a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -8,13 +8,17 @@
         <button bottom="-23" follows="left|bottom" font="SansSerif" halign="center" height="20"
              label="Local Chat" left="7" name="History"
              tool_tip="Click here to see what has been said" width="93" />
+  <spinner bottom="-24" decimal_digits="0" follows="left|bottom" height="20" 
+                         increment="1.00" initial_val="0" label="Channel" label_width="50" left="107"
+                         max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
+                         width="100" tool_tip="Set the default channel for inworld chat"/>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
              follows="left|right|bottom" font="SansSerif"
              handle_edit_keys_directly="false" height="20" label="Click here to chat."
-             left="107" max_length="254" name="Chat Editor"
+             left="212" max_length="254" name="Chat Editor"
              select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
-             tool_tip="Press Enter to say, Ctrl-Enter to shout." width="105" />
-        <flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="109"
+             tool_tip="Press Enter to say, Ctrl-Enter to shout." width="5" />
+        <flyout_button bottom="-23" follows="right|bottom" height="20" label="Say" left_delta="4"
              list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
              width="80">
                 <flyout_button_item value="shout" name="shout_item">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index c47985b..0bc7866 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -36,4 +36,7 @@
              label="Search..." name="Search..." width="80" />
         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
              label="Leave" name="Leave" width="80" />
+  <string name="none">
+                none
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index 4e0e69b..eef04e8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -1,56 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" follows="left|top|right|bottom" height="600" left="0"
-     mouse_opaque="true" name="panel_login" width="800">
-        <web_browser border_visible="false" bottom="0" follows="top|left|bottom|right" left="0"
-             name="login_html" right="-1"
-             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
-             top="-1" />
+
+<panel name="panel_login" 
+       bottom="0" left="0" height="600" width="800"
+       follows="left|top|right|bottom" mouse_opaque="true" >
+
+        <web_browser name="login_html" 
+               bottom="0" top="-1" left="0" right="-1"
+               border_visible="false" follows="top|left|bottom|right"
+                     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" />
         <string name="real_url">
                 http://secondlife.com/app/login/
         </string>
         <string name="forgot_password_url">
                 http://secondlife.com/account/request.php
         </string>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="54" drop_shadow_visible="true" follows="left|bottom"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="32" mouse_opaque="true" name="first_name_text" v_pad="0" width="120">
-                First Name:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
-             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" left="32" max_length="31" mouse_opaque="true"
-             name="first_name_edit" select_all_on_focus_received="true" width="120" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="54" drop_shadow_visible="true" follows="left|bottom"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="164" mouse_opaque="true" name="last_name_text" v_pad="0" width="120">
-                Last Name:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
-             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" left="164" max_length="31" mouse_opaque="true"
-             name="last_name_edit" select_all_on_focus_received="true" width="120" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="54" drop_shadow_visible="true" follows="left|bottom"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="296" mouse_opaque="true" name="password_text" v_pad="0" width="120">
-                Password:
-        </text>
-        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
-             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
-             height="20" left="296" max_length="16" mouse_opaque="true"
-             name="password_edit" select_all_on_focus_received="true" width="120" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="10" drop_shadow_visible="true" follows="left|bottom"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="32" mouse_opaque="true" name="start_location_text" v_pad="0"
-             width="95">
+
+
+  <!-- START LOCATION -->
+
+        <text name="start_location_text" 
+              bottom="8" left="24" height="16" width="95"
+        follows="left|bottom" h_pad="0" halign="right" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerifSmall" mouse_opaque="true">
                 Start Location:
         </text>
-        <combo_box allow_text_entry="true" bottom="8" follows="left|bottom" height="18"
-             left_delta="97" max_chars="128" mouse_opaque="true"
-             name="start_location_combo" width="155">
+        <combo_box name="start_location_combo"
+             bottom_delta="2" left_delta="100" height="16" width="150"
+             follows="left|bottom" font="SansSerifSmall"
+             mouse_opaque="true" allow_text_entry="true" max_chars="128">
                 <combo_item name="MyHome" value="My Home">
                         My Home
                 </combo_item>
@@ -61,36 +40,129 @@
                         &lt;Type region name&gt;
                 </combo_item>
         </combo_box>
-        <check_box bottom="10" control_name="RememberPassword" 
-         follows="left|bottom" font="SansSerifSmall" height="16"
-             initial_value="false" label="Remember password"
-             left_delta="163" mouse_opaque="true" name="remember_check" width="138" />
-        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
-             height="24" label="Log In" label_selected="Log In"
-             left="435" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
-             width="120" />
-        <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
-             left_delta="135" max_chars="20" mouse_opaque="true"
-             name="server_combo" width="120" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="45" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" font-style="UNDERLINE" h_pad="0" halign="right" height="16"
-             left="-210" mouse_opaque="true" name="create_new_account_text" v_pad="0" width="200"
-             hover="true" hover_color="50 115 185">
+
+
+  <!-- FIRST NAME -->
+
+        <text name="first_name_text" 
+              bottom="56" left="24" height="16" width="120"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+                First Name:
+        </text>
+        <line_editor name="first_name_edit" 
+               bottom_delta="-20" left_delta="0" height="20" width="120"
+               follows="left|bottom" font="SansSerif"
+               bevel_style="in" border_style="line" border_thickness="1" 
+               max_length="16" mouse_opaque="true"
+                     handle_edit_keys_directly="true"
+               select_all_on_focus_received="true" />
+
+
+  <!-- LAST NAME -->
+
+        <text name="last_name_text" 
+              bottom_delta="20" left_delta="130" height="16" width="120"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+                Last Name:
+        </text>
+        <line_editor name="last_name_edit" 
+               bottom_delta="-20" left_delta="0" height="20" width="120"
+               follows="left|bottom" font="SansSerif"
+               bevel_style="in" border_style="line" border_thickness="1" 
+               max_length="16" mouse_opaque="true"
+                     handle_edit_keys_directly="true"
+               select_all_on_focus_received="true" />
+
+
+  <!-- PASSWORD -->
+
+        <text name="password_text" 
+              bottom_delta="20" left_delta="130" height="16" width="120"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+                Password:
+        </text>
+        <line_editor name="password_edit" 
+               bottom_delta="-20" left_delta="0" height="20" width="120"
+               follows="left|bottom" font="SansSerif"
+               bevel_style="in" border_style="line" border_thickness="1" 
+               max_length="16" mouse_opaque="true"
+                     handle_edit_keys_directly="true"
+               select_all_on_focus_received="true" />
+        <check_box name="remember_check" label="Remember password"
+             bottom_delta="-24" left_delta="0" height="16" width="140"
+             follows="left|bottom" font="SansSerifSmall" 
+                   initial_value="false" mouse_opaque="true"  />
+
+
+  <!-- GRIDS -->
+
+        <text name="grid_text" 
+              bottom="56" left_delta="150" height="16" width="120"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerif" mouse_opaque="true">
+                Grid:
+        </text>
+        <combo_box name="server_combo"
+             bottom_delta="-20" left_delta="0" height="20" width="120"
+             follows="left|bottom" allow_text_entry="false"
+             max_chars="20" mouse_opaque="true" />
+        <button name="grid_btn" label="Grid Manager"
+          bottom_delta="-24" left_delta="10" height="16" width="100"
+          follows="left|bottom" font="SansSerifSmall" halign="center"
+                      mouse_opaque="true" scale_image="TRUE" />
+
+
+  <!-- LOG IN -->
+
+        <button name="connect_btn" label="Log In"
+          bottom="34" left_delta="140" height="24" width="120"
+          follows="left|bottom" font="SansSerif" halign="center"
+                mouse_opaque="true" scale_image="TRUE" />
+
+
+  <!-- ACCOUNT / FORGOT PASSWORD -->
+
+        <text name="create_new_account_text"
+              bottom="45" left="-210" height="16" width="200"
+        follows="right|bottom" h_pad="0" halign="right" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+        font="SansSerifSmall" font-style="UNDERLINE"
+        mouse_opaque="true" hover="true" hover_color="50 115 185">
                 Sign up for account
         </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="25" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" font-style="UNDERLINE" h_pad="0" halign="right" height="16"
-             left="-210" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="200"
-             hover="true" hover_color="50 115 185">
+
+        <text name="forgot_password_text"
+              bottom="25" left="-210" height="16" width="200"
+        follows="right|bottom" h_pad="0" halign="right" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+        font="SansSerifSmall" font-style="UNDERLINE"
+        mouse_opaque="true" hover="true" hover_color="50 115 185">
                 Forgot your name or password?
         </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="5" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" h_pad="0" halign="right" height="16"
-             left="-310" mouse_opaque="true" name="channel_text" v_pad="0" width="300"
-             hover="true" hover_color="50 115 185">
+
+
+  <!-- CHANNEL & VERSION -->
+
+        <text name="channel_text"
+              bottom="5" left="-310" height="16" width="300"
+        follows="right|bottom" h_pad="0" halign="right" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+        font="SansSerifSmall" mouse_opaque="true"
+        hover="true" hover_color="50 115 185">
                 [VERSION]
         </text>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
index 1a93341..19faa62 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel background_opaque="false" background_visible="true" bg_alpha_color="NetMapBackgroundColor"
-         border="false" follows="left|top|right|bottom" height="216" label="Mini Map"
+         border="false" follows="left|top|right|bottom" height="716" label="Mini Map"
          mouse_opaque="false" name="mini_mapview" width="196">
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                  bottom="-40" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index e785909..8ad4fff 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -45,16 +45,21 @@
                                      use_bounding_rect="true" width="395" />
                         </layout_stack>
                 </layout_panel>
-                <layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false"
+    <layout_panel auto_resize="false" bottom="0" left="0" min_width="184" mouse_opaque="false"
+                        name="windlight_remote_container" use_bounding_rect="true" user_resize="false"
+                        width="186">
+      <panel background_visible="false" border="false" bottom="0" name="windlight_remote" />
+    </layout_panel>
+    <layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false"
                      name="media_remote_container" use_bounding_rect="true" user_resize="false"
                      width="220">
-                        <panel background_visible="false" border="false" bottom="0" name="media_remote" />
-                </layout_panel>
-                <layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false"
+      <panel background_visible="false" border="false" bottom="0" name="media_remote" />
+    </layout_panel>
+    <layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false"
                      name="voice_remote_container" use_bounding_rect="true" user_resize="false"
                      width="128">
-                        <panel background_visible="false" border="false" bottom="0" name="voice_remote" />
-                </layout_panel>
+      <panel background_visible="false" border="false" bottom="0" name="voice_remote" />
+    </layout_panel>
         </layout_stack>
   <string name="unread_count_string_plural">
     New IMs
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 62ada26..5926374 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -15,7 +15,7 @@
                 Streaming Preferences:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-280" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
                 Audio Preferences:
@@ -28,6 +28,10 @@
              label="Play Streaming Music When Available (uses more bandwidth)"
              left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
              width="339" />
+  <check_box bottom_delta="-20" control_name="ShowStreamTitle" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+             label="Show stream info in chat" left="162" mouse_opaque="true"
+       name="show_stream_title" radio_style="false" width="338" />
         <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play Streaming Media When Available (uses more bandwidth)"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 50d1d68..e9ab27c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -30,48 +30,52 @@
              mouse_opaque="false" name="text_box2" v_pad="0" width="128">
                 Chat Color:
         </text>
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="UserChatColor"
              enabled="true" follows="left|top" height="47" label="You" left="148"
-             mouse_opaque="true" name="user" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
+             mouse_opaque="true" name="user" width="54" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="1 1 1 1" control_name="AgentChatColor"
-             enabled="true" follows="left|top" height="47" label="Others" left_delta="54"
-             mouse_opaque="true" name="agent" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
+             enabled="true" follows="left|top" height="56" label="Others" left_delta="68"
+             mouse_opaque="true" name="agent" width="54" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="0.6 0.6 1 1"
-             enabled="true" follows="left|top" height="47" label="IM" left_delta="54"
-             mouse_opaque="true" name="im" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
+             enabled="true" follows="left|top" height="56" label="IMs" left_delta="68"
+             mouse_opaque="true" name="im" width="54" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="0.8 1 1 1"
-             enabled="true" follows="left|top" height="47"  label="System" left_delta="54"
-             mouse_opaque="true"
-             name="system" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-100"
+             enabled="true" follows="left|top"
+             height="56" label="System" left_delta="68" mouse_opaque="true"
+             name="system" width="54" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-108"
              can_apply_immediately="true" color="0.82 0.82 0.99 1"
              control_name="ScriptErrorColor" enabled="true" follows="left|top"
-             height="47"  label="Errors" left_delta="54" mouse_opaque="true"
-             name="script_error" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
+             height="56" label="Errors" left_delta="68" mouse_opaque="true"
+             name="script_error" width="54" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              control_name="ObjectChatColor" enabled="true" follows="left|top"
              height="47"  label="Objects" left="148" mouse_opaque="true"
-             name="objects" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
+             name="objects" width="54" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
+             can_apply_immediately="true" color="0.7 0.9 0.7 1"
+       control_name="ObjectIMColor" enabled="true" follows="left|top"
+             height="56" label="Object IMs" left_delta="68" mouse_opaque="true"
+       name="object_ims" width="54" />
+  <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.7 0.9 0.7 1"
              enabled="true" follows="left|top"
-             height="47" label="Owner" left_delta="54" mouse_opaque="true" name="owner"
-             width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
+             height="56" label="Owner" left_delta="68" mouse_opaque="true" name="owner"
+             width="54" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0 0 0 1"
              enabled="true" follows="left|top"
-             height="47" label="Bubble" left_delta="54" mouse_opaque="true"
-             name="background" width="44" />
-        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-150"
+             height="56" label="Bubble" left_delta="68" mouse_opaque="true"
+             name="background" width="54" />
+        <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-165"
              can_apply_immediately="true" color="0.6 0.6 1 1"
-             enabled="true" follows="left|top" height="47"
-             label="URLs" left_delta="54" mouse_opaque="true" name="links" width="44" />
-        
+             enabled="true" follows="left|top" height="56"
+             label="URLs" left_delta="68" mouse_opaque="true" name="links" width="54" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-28" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
@@ -121,35 +125,41 @@
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Close chat bar after hitting return" left="148" mouse_opaque="true"
              name="close_chat_on_return_check" radio_style="false" width="237" />
-        <check_box bottom_delta="-20" enabled="true"
+        <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Arrow keys always move avatar when chatting" left="148"
              mouse_opaque="true" name="arrow_keys_move_avatar_check" radio_style="false"
              width="237" />
-        <check_box bottom_delta="-20" enabled="true"
+        <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
+        <check_box bottom_delta="-20" enabled="true"
   <check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Show script errors and warnings as regular chat" left="148"
              mouse_opaque="true" name="script_errors_as_chat" radio_style="false"
              width="275" />
         <check_box bottom_delta="-20" enabled="true"
+        <check_box bottom_delta="-18" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play typing animation when chatting" left="148" mouse_opaque="true"
              name="play_typing_animation" radio_style="false" width="237" />
+  <check_box bottom_delta="-18" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false" 
+       label="Show custom chat channel" left="148" mouse_opaque="true"
+             name="toggle_channel_control" radio_style="false" width="237" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-369" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-379" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box7" v_pad="0" width="128">
                 Bubble Chat:
         </text>
-        <check_box bottom="-376" control_name="UseChatBubbles" enabled="true" follows="left|top"
+        <check_box bottom="-386" control_name="UseChatBubbles" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show chat bubbles" left="148" mouse_opaque="true"
              name="bubble_text_chat" radio_style="false" width="237" />
-        <slider bottom="-392" can_edit_text="false" control_name="ChatBubbleOpacity"
+        <slider bottom="-402" can_edit_text="false" control_name="ChatBubbleOpacity"
              decimal_digits="3" enabled="true" follows="left|top" height="12"
              increment="0.05" initial_val="1" label="Opacity" left="148" max_val="1"
              min_val="0" mouse_opaque="true" name="bubble_chat_opacity" show_text="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 5989e7d..6b17ab3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -62,9 +62,13 @@
                 UI Size:
         </text>
         <slider bottom="-217" can_edit_text="true"
-             decimal_digits="3" enabled="true" height="16" increment="0.025"
+             decimal_digits="3" enabled="true" height="16" increment="0.001"
              initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
-             name="ui_scale_slider" show_text="true" value="1" width="256" />
+             name="ui_scale_slider" show_text="true" value="1" width="220" />
+  <button bottom="-221" enabled="true" follows="left|top"
+             font="SansSerif" halign="center" height="22" label="Reset"
+             label_selected="Reset" left_delta="226" mouse_opaque="true"
+             name="reset_ui_size" scale_image="true" width="80" />
         <check_box bottom="-236" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Use resolution independent scale" left="151" mouse_opaque="true"
@@ -73,7 +77,23 @@
              follows="left|top" height="16" increment="1" initial_val="300"
              label="Away Timeout:" label_width="141" left="10" max_val="600"
              min_val="30" mouse_opaque="true" name="afk_timeout_spinner" width="202" />
-        <check_box bottom="-286" enabled="true"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
+     mouse_opaque="true" name="UI Size:" v_pad="0" width="128">
+    Mini-map notify:
+  </text>
+  <check_box bottom_delta="0" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+             label="Entering chat range" left="151"
+             mouse_opaque="true" name="mini_map_notify_chat" radio_style="false"
+             width="256" />
+  <check_box bottom_delta="0" enabled="true"
+     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+     label="Entering sim" left="330"
+     mouse_opaque="true" name="mini_map_notify_sim" radio_style="false"
+     width="256" />
+        <check_box bottom="-304" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
              label="Notify when Linden dollars (L$) spent or received" left="151"
              mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 527309e..c663ae2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -6,8 +6,12 @@
              left="470" name="GraphicsPreferencesHelpButton" width="22" />
         <check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall"
              height="16" initial_value="false"
-             label="Run Second Life in a window" left="10" mouse_opaque="true"
+             label="Run Imprudence in a window" left="10" mouse_opaque="true"
              name="windowed mode" radio_style="false" width="100" />
+  <check_box bottom_delta="0" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+       label="Show WindLight toolbar" left="275" mouse_opaque="true"
+             name="toggle_windlight_control" radio_style="false" width="237" />
         <text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
              embedded_items="false" enabled="false" follows="left|top"
              font="SansSerifSmall" height="20" hide_border="true"
@@ -247,7 +251,7 @@
         <slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="8" initial_val="160" label="Draw Distance:"
-             label_width="140" left="215" max_val="512" min_val="64" mouse_opaque="true"
+             label_width="140" left="215" max_val="512" min_val="32" mouse_opaque="true"
              name="DrawDistance" show_text="true" width="255" />
         <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index ee00455..9b18e11 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -49,55 +49,59 @@
        initial_value="false" label="Show online Friend notifications" left="148"
        mouse_opaque="true" name="friends_online_notify_checkbox"
        radio_style="false" width="256" />
+  <check_box bottom_delta="-20" enabled="true"
+           follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+           label="Vertical IM tabs (requires restart)" left_delta="0" mouse_opaque="true"
+           name="vertical-imtabs-toggle" radio_style="false" width="270" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-125" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box3" v_pad="0" width="128">
     Busy Mode Response:
   </text>
-  <text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top"
+  <text_editor type="string" length="1" bottom_delta="-60" embedded_items="false" enabled="true" follows="left|top"
              font="SansSerifSmall" height="70" left="148" max_length="255"
              mouse_opaque="true" name="busy_response" width="330" word_wrap="true" />
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-218" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom_delta="-33" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
              mouse_opaque="false" name="text_box4" v_pad="0" width="128">
     Logging Options:
   </text>
-  <check_box bottom="-225" enabled="true"
+  <check_box bottom_delta="-7" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Save a log of IM on my computer" left="148"
              mouse_opaque="true" name="log_instant_messages" radio_style="false"
              width="237" />
-  <check_box bottom="-245" enabled="true"
+  <check_box bottom_delta="-20" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Show timestamps in IM log" left="168"
              mouse_opaque="true" name="log_instant_messages_timestamp" radio_style="false"
              width="217" />
-  <check_box bottom="-265" enabled="true" follows="left|top"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show the end of last IM conversation" left="168" mouse_opaque="true"
              name="log_show_history" radio_style="false" width="217" />
-  <check_box bottom="-285" enabled="true" follows="left|top"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false" label="Save a log of Local Chat on my computer"
              left="148" mouse_opaque="true" name="log_chat" radio_style="false"
              width="237" />
-  <check_box bottom="-305" enabled="true" follows="left|top"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in Local Chat log" left="168" mouse_opaque="true"
              name="log_chat_timestamp" radio_style="false" width="217" />
-  <check_box bottom="-325" enabled="true" follows="left|top"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show incoming IM in Local Chat log" left="168" mouse_opaque="true"
              name="log_chat_IM" radio_style="false" width="217" />
-  <check_box bottom="-345" enabled="true" follows="left|top"
+  <check_box bottom_delta="-20" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Include date with timestamps" left="148" mouse_opaque="true"
              name="log_date_timestamp" radio_style="false" width="237" />
-  <button bottom="-367" follows="right|bottom" font="SansSerif" halign="center"
+  <button bottom_delta="-22" follows="right|bottom" font="SansSerif" halign="center"
              height="20" label="Change Path" label_selected="Change Path" left="170"
              mouse_opaque="true" name="log_path_button" width="90" />
-  <line_editor border_drop_shadow_visible="false" border_visible="false" bottom="-366"
+  <line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="1"
              drop_shadow_visible="true" enabled="false" follows="top|left|right"
              font="SansSerifSmall" halign="right" height="19" left="248"
              max_length="254" mouse_opaque="false" name="log_path_string" right="-20" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 48da432..655859a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -8,10 +8,10 @@
              mouse_opaque="false" name="text_box" v_pad="0" width="200">
                 Maximum Bandwidth:
         </text>
-        <slider bottom_delta="-25" can_edit_text="true"
+        <slider bottom_delta="-25" can_edit_text="true" control_name="ThrottleBandwidthKBPS"
              decimal_digits="0" enabled="true" follows="left|top" height="15"
-             increment="10" initial_val="50" left_delta="0" max_val="1500" min_val="50"
-             mouse_opaque="true" name="max_bandwidth" show_text="true" value="500"
+             increment="10" initial_val="1000" left_delta="0" max_val="5000" min_val="50"
+             mouse_opaque="true" name="max_bandwidth" show_text="true" value="1000"
              width="180" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="4" drop_shadow_visible="true" enabled="true"
@@ -25,22 +25,15 @@
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
              height="10" left="12" mouse_opaque="false" name="cache_size_label_l"
              v_pad="0" width="200">
-                Disk Cache Size:
+                Disk Cache Size (MB):
         </text>
-        <slider bottom_delta="-25" can_edit_text="true"
+        <slider bottom_delta="-25" can_edit_text="true" control_name="CacheSize"
              decimal_digits="0" enabled="true" follows="left|top" height="15"
              increment="10" initial_val="50" left_delta="0" max_val="1000" min_val="10"
              mouse_opaque="true" name="cache_size" show_text="true" width="180" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="4" drop_shadow_visible="true" enabled="true"
-             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
-             height="10" left_delta="186" mouse_opaque="false" name="text_box5"
-             v_pad="0" width="40">
-                MB
-        </text>
         <button bottom="-55" bottom_delta="-4" enabled="true" follows="left|bottom"
              font="SansSerif" halign="center" height="22" label="Clear Cache" left="340"
-             left_delta="30" mouse_opaque="true" name="clear_cache" scale_image="true"
+             left_delta="186" mouse_opaque="true" name="clear_cache" scale_image="true"
              width="100" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-70" bottom_delta="-17" drop_shadow_visible="true" enabled="true"
@@ -51,7 +44,7 @@
         </text>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-28"
              enabled="false" follows="left|top" font="SansSerif"
-             handle_edit_keys_directly="true" height="20" left_delta="7"
+             handle_edit_keys_directly="true" height="20" left_delta="0"
              max_length="4096" mouse_opaque="true" name="cache_location"
              select_all_on_focus_received="false" width="470" word_wrap="false" />
         <button bottom_delta="-25" enabled="true" follows="left|top" font="SansSerif"
@@ -61,12 +54,12 @@
              font="SansSerif" halign="center" height="22" label="Reset"
              label_selected="Set" left_delta="103" mouse_opaque="true"
              name="reset_cache" scale_image="true" width="100" />
-        <check_box bottom="-173" bottom_delta="-35"
+        <check_box bottom="-173" bottom_delta="-25" control_name="ConnectionPortEnabled"
              enabled="true" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Custom Port Connection" left="12"
              mouse_opaque="true" name="connection_port_enabled" radio_style="false"
              width="256" />
-        <spinner bottom="-193" bottom_delta="-20"
+        <spinner bottom="-193" bottom_delta="-20" control_name="ConnectionPort"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="1" initial_val="13000" label="Port Number:" label_width="75"
              left_delta="20" max_val="13050" min_val="13000" mouse_opaque="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml
new file mode 100644
index 0000000..b9c6fc3
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_controls.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+     enabled="true" follows="right|bottom" height="20" left="0"
+     name="windlight_controls" width="182">
+  <button bottom="-21" follows="left|bottom" font="SansSerif" halign="center" height="20"
+             label="Editor" left="4" name="Environment"
+             tool_tip="Click here to adjust world environment" width="80" />
+  <flyout_button bottom="-21" follows="left|bottom" height="20" label="Sky" left_delta="82" width="71"
+       list_position="above" mouse_opaque="true" name="Presets" tool_tip="Windlight presets">
+  </flyout_button>
+  <button bottom="-22" follows="left|bottom" font="SansSerif" halign="center" height="22" toggle="true" 
+             label="" left_delta="72" name="Popup" scale_image="true" control_name="ShowWindlightSettingsPopup" 
+       tool_tip="Click here to adjust draw distance" width="22" />
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
new file mode 100644
index 0000000..8be72fc
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
+     enabled="true" follows="right|bottom" height="20" left="0" mouse_opaque="true"
+     name="windlight_remote" use_bounding_rect="true" width="182">
+        <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="22" left="0" width="182" />
+        <panel bottom="3" filename="panel_windlight_controls.xml" name="panel_windlight_controls" height="20" left="0" width="182" />
+  <string name="atmosphere">
+    Atmosphere
+  </string>
+  <string name="lighting">
+    Lighting
+  </string>
+    <string name="clouds">
+    Clouds
+  </string>
+    <string name="advanced_water">
+    Advanced Water
+  </string>
+  <string name="sunrise">
+    Sunrise
+  </string>
+  <string name="sunset">
+    Midday
+  </string>
+  <string name="noon">
+    Noon
+  </string>
+  <string name="midnight">
+    Midnight
+  </string>
+  <string name="revert_region">
+    Revert to Region Default
+  </string>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
new file mode 100644
index 0000000..4cb49a3
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
+     follows="right|bottom" height="67" left="0" mouse_opaque="true"
+     name="windlight_remote" use_bounding_rect="true" width="182">
+        <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" />
+        <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip"
+       decimal_digits="0" enabled="true" height="18"
+       increment="8" initial_val="160" label="Draw Distance:"
+       label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true"
+       name="DrawDistance" show_text="true" width="170" />
+  <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
+       decimal_digits="0" enabled="true" follows="left|top" height="18"
+       increment="256" initial_val="4096"
+       label="Max. Particles:" label_width="78" left_delta="0"
+       max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
+       show_text="true" width="176" />
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="12"
+             left="170" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
+             width="8">
+    m
+  </text>
+        <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" />
+  <string name="atmosphere">
+    Atmosphere
+  </string>
+  <string name="lighting">
+    Lighting
+  </string>
+  <string name="clouds">
+    Clouds
+  </string>
+  <string name="advanced_water">
+    Advanced Water
+  </string>
+  <string name="sunrise">
+    Sunrise
+  </string>
+  <string name="sunset">
+    Midday
+  </string>
+  <string name="noon">
+    Noon
+  </string>
+  <string name="midnight">
+    Midnight
+  </string>
+  <string name="revert_region">
+    Revert to Region Default
+  </string>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_about.xml b/linden/indra/newview/skins/default/xui/fr/floater_about.xml
index b6dd0b1..1287465 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -1,35 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>

-<floater name="floater_about" title="A propos de Second Life">

-        <text_editor name="credits_editor">

-                Second Life existe grâce aux efforts de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl et de nombreuses autres personnes.

-

-  Tous nos remerciements aux résidents suivants pour avoir testé cette version (la meilleure qui soit jusqu&apos;à présent) :  able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar

-

-  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion

-  APR Copyright (C) 2000-2004 The Apache Software Foundation

-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)

-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.

-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).

-  GL Copyright (C) 1999-2004 Brian Paul.

-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.

-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)

-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.

-  ogg/vorbis Copyright (C) 2001, Xiphophorus

-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.

-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga

-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.

-  zlib Copyright (C) 1995-2002 Jean-loup Gailly et Mark Adler.

-  google-perftools Copyright (c) 2005, Google Inc.

-  

-  Tous droits réservés.  Voir licenses.txt pour plus de détails.

-

-  Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)

-

-

-  Pour réussir dans les affaires, soyez audacieux, créatif et différent. - Henry Marchant

-        </text_editor>

-        <string name="you_are_at">

-                Votre position : [POSITION]

-        </string>

-</floater>

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="A propos de Second Life">
+        <text_editor name="credits_editor">
+  The Imprudence Viewer was rocked hard by:
+  Jacek Antonelli, McCabe Maxsted, and Armin Weatherwax. 
+  http://www.imprudenceviewer.org
+  
+  Imprudence is so awesome thanks to contributions from many generous people:
+  
+  For their patches and code contributions, we thank Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Asuka Neely, Balp Allen, Carjay McGinnis, Dale Glass, Felix Duesenburg, Henri Beauchamp, Kitty Barnett, Latif Khalifa, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Nicholaz Beresford, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thomas Shikami, Vadim Bigbear, Zi Ree, and Zwagoth Klaar.
+  
+  For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
+  
+  Thanks also to the developers of the Green Life Emerald Viewer, Hippo Viewer, and Meerkat Viewer for viewer enhancements we have incorporated. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
+  
+  For a complete list of who did what, read the release notes!
+  
+
+  Second Life Copyright (C) 1999-2009 Linden Research Inc.
+  
+        Second Life existe grâce aux efforts de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les et de nombreuses autres personnes.
+
+  Tous nos remerciements aux résidents suivants pour avoir testé cette version (la meilleure qui soit jusqu&apos;à présent) :  able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+
+  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+  APR Copyright (C) 2000-2004 The Apache Software Foundation
+  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+  GL Copyright (C) 1999-2004 Brian Paul.
+  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+  ogg/vorbis Copyright (C) 2001, Xiphophorus
+  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+  zlib Copyright (C) 1995-2002 Jean-loup Gailly et Mark Adler.
+  google-perftools Copyright (c) 2005, Google Inc.
+  
+  Tous droits réservés.  Voir licenses.txt pour plus de détails.
+
+  Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+
+
+  Pour réussir dans les affaires, soyez audacieux, créatif et différent. - Henry Marchant
+        </text_editor>
+        <string name="you_are_at">
+                Votre position : [POSITION]
+        </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_about.xml b/linden/indra/newview/skins/default/xui/ja/floater_about.xml
index 9306a6c..ce318a5 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -1,7 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Second Life����">
         <text_editor name="credits_editor">
-                Second Life�� Philip�Tessa�Andrew�Cory�James�Ben�Char�Charlie�Colin�Dan�Daniel�Doug�Eric�Hamlet�Haney�Eve�Hunter�Ian�Jeff�Jennifer�Jim�John�Lee�Mark�Peter�Phoenix�Richard�Robin�Xenon�Steve�Tanya�Eddie�Avi�Frank�Bruce�Aaron�Alice�Bob�Debra�Eileen�Helen�Janet�Louie�Leviathania�Stefan�Ray�Kevin�Tom�Mikeb�MikeT�Burgess�Elena�Tracy�Bill�Todd�Ryan�Zach�Sarah�Nova�Tim�Stephanie�Michael�Evan�Nicolas�Catherine�Rachelle�Dave�Holly�Bub�Kelly�Magellan�Ramzi�Don�Sabin�Jill�Rheya�Jeska�Torley�Kona�Callum�Charity�Ventrella�Jack�Vektor�Iris�Chris�Nicole�Mick�Reuben�Blue�Babbage�Yedwab�Deana�Lauren�Brent�Pathfinder�Chadrick�Altruima�Jesse�Teeny�Monroe�Icculus�David�Tess�Lizzie�Patsy�Isaac�Lawrence�Cyn�Bo�Gia�Annette�Marius�Tbone�Jonathan�Karen�Ginsu�Satoko�Yuko�Makiko�Thomas�Harry�Seth�Alexei�Brian�Guy�Runitai�Ethan�Data�Cornelius�Kenny�Swiss�Zero�Natria�Wendy�Stephen�Teeple�Thumper�Lucy�Dee�Mia�Liana�Warren�Branka�Aura�beez�Milo�Hermia�Red�Thrax�Joe�Sally�Magenta�Mogura�Paul�Jose�Rejean�Henrik�Lexie�Amber�Logan�Xan�Nora�Morpheus�Donovan�Leyla�MichaelFrancis�Beast�Cube�Bucky�Joshua�Stryfe�Harmony�Teresa�Claudia�Walker�Glenn�Fritz�Fordak�June�Cleopetra�Jean�Ivy�Betsy�Roosevelt�Spike�Ken�Which�Tofu�Chiyo�Rob�Zee�dustin�George�Del�Matthew�Cat�Jacqui�Lightfoot�Adrian�Viola�Alfred�Noel�Irfan�Sunil�Yool�Rika�Jane�Xtreme�Frontier�a2�Neo�Siobhan�Yoz�Justin�Elle�Qarl�Benjamin�Isabel�Gulliver�Everett�Christopher�Izzy�Stephany�Garry�Sejong�Sean�Tobin�Iridium�Meta�Anthony�Jeremy�JP�Jake�Maurice�Madhavi�Leopard�Kyle�Joon�Kari�Bert�Belinda�Jon�Kristi�Bridie�Pramod�KJ�Socrates�Maria�Ivan�Aric�Yamasaki�Adreanne�Jay�MitchK�Ceren�Coco�Durl�Jenny�Periapse�Kartic�Storrs�Lotte�Sandy�Rohn�Colossus�Zen�BigPapi�Brad�Pastrami�Kurz�Mani�Neuro�Jaime�MJ�Rowan�Sgt�Elvis�Gecko�Samuel�Sardonyx�Leo�Bryan�Niko�Soft�Poppy�Rachel�Aki�Angelo�Banzai�Alexa�Sue�CeeLo�Bender�CG�Gillian�Pelle�Nick�Echo�Zara�Christine�Shamiran�Emma�Blake�Keiko�Plexus�Joppa�Sidewinder�Erica�Ashlei�Twilight�Kristen�Brett�Q�Enus�Simon�Bevis�Kraft�Kip�Chandler�Ron�LauraP�Ram�KyleJM�Scouse�Prospero�Melissa�Marty�Nat�Hamilton�Kend�Lordan�Jimmy�Kosmo�Seraph�Green�Ekim�Wiggo�JT�Rome�Doris�Miz�Benoc�Whump�Trinity�Patch�Kate�TJ�Bao�Joohwan�Christy�Sofia�Matias�Cogsworth�Johan�Oreh�Cheah�Angela�Brandy�Mango�Lan�Aleks�Gloria�Heidy�Mitchell�Space�Colton�Bambers�Einstein�Maggie�Malbers�Rose�Winnie�Stella�Milton�Rothman�Niall�Marin�Allison�Katie�Dawn�Katt�Dusty�Kalpana�Judy�Andrea�Ambroff�Infinity�Gail�Rico�Raymond�Yi�William�Christa�M�Teagan�Scout�Molly�Dante�Corr�Dynamike�Usi�Kaylee�Vidtuts�Lil�Danica�Sascha�Kelv�Jacob�Nya�Rodney�Brandon�Elsie�Blondin�Grant�Katrin�Nyx�Gabriel�Locklainn�Claire�Devin�Minerva�Monty�Austin�Bradford�Si�Keira�H�Caitlin�Dita�Makai�Jenn�Ann�Meredith�Clare�Joy�Praveen�Cody�Edmund�Ruthe�Sirena�Gayathri�Spider�FJ�Davidoff�Tian�Jennie�Louise�Oskar�Landon�Noelle�Jarv�Ingrid�Al�Sommer�Doc�Aria�Huin�Gray�Lili�Vir�DJ�Yang�T�Simone�Maestro�Scott�Charlene�Quixote�Amanda�Susan�Zed�Anne�Enkidu�Esbee�Joroan�Katelin�Roxie�Tay�Scarlet�Kevin�Johnny�Wolfgang�Andren�Bob�Howard�Merov�Rand�Ray�Michon�Newell�Galen�Dessie�Les�Michon�Jenelle�Geo�Siz�Shapiro�Pete�Calyle�Selene�Allen�Phoebe�Goldin�Kimmora�Dakota�Slaton�Lindquist�Zoey�Hari�Othello�Rohit�Sheldon�Petra�Viale�Gordon�Kaye�Pink�Ferny�Emerson�Davy�Bri�Chan�Juan�Robert�Terrence�Nathan�Carl����他多数�人��よ��作��れ���。
+  The Imprudence Viewer was rocked hard by:
+  Jacek Antonelli, McCabe Maxsted, and Armin Weatherwax. 
+  http://www.imprudenceviewer.org
+  
+  Imprudence is so awesome thanks to contributions from many generous people:
+  
+  For their patches and code contributions, we thank Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Asuka Neely, Balp Allen, Carjay McGinnis, Dale Glass, Felix Duesenburg, Henri Beauchamp, Kitty Barnett, Latif Khalifa, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Nicholaz Beresford, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thomas Shikami, Vadim Bigbear, Zi Ree, and Zwagoth Klaar.
+  
+  For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
+  
+  Thanks also to the developers of the Green Life Emerald Viewer, Hippo Viewer, and Meerkat Viewer for viewer enhancements we have incorporated. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
+  
+  For a complete list of who did what, read the release notes!
+  
+
+  Second Life Copyright (C) 1999-2009 Linden Research Inc.
+  
+        Second Life�� Philip�Tessa�Andrew�Cory�James�Ben�Char�Charlie�Colin�Dan�Daniel�Doug�Eric�Hamlet�Haney�Eve�Hunter�Ian�Jeff�Jennifer�Jim�John�Lee�Mark�Peter�Phoenix�Richard�Robin�Xenon�Steve�Tanya�Eddie�Avi�Frank�Bruce�Aaron�Alice�Bob�Debra�Eileen�Helen�Janet�Louie�Leviathania�Stefan�Ray�Kevin�Tom�Mikeb�MikeT�Burgess�Elena�Tracy�Bill�Todd�Ryan�Zach�Sarah�Nova�Tim�Stephanie�Michael�Evan�Nicolas�Catherine�Rachelle�Dave�Holly�Bub�Kelly�Magellan�Ramzi�Don�Sabin�Jill�Rheya�Jeska�Torley�Kona�Callum�Charity�Ventrella�Jack�Vektor�Iris�Chris�Nicole�Mick�Reuben�Blue�Babbage�Yedwab�Deana�Lauren�Brent�Pathfinder�Chadrick�Altruima�Jesse�Teeny�Monroe�Icculus�David�Tess�Lizzie�Patsy�Isaac�Lawrence�Cyn�Bo�Gia�Annette�Marius�Tbone�Jonathan�Karen�Ginsu�Satoko�Yuko�Makiko�Thomas�Harry�Seth�Alexei�Brian�Guy�Runitai�Ethan�Data�Cornelius�Kenny�Swiss�Zero�Natria�Wendy�Stephen�Teeple�Thumper�Lucy�Dee�Mia�Liana�Warren�Branka�Aura�beez�Milo�Hermia�Red�Thrax�Joe�Sally�Magenta�Mogura�Paul�Jose�Rejean�Henrik�Lexie�Amber�Logan�Xan�Nora�Morpheus�Donovan�Leyla�MichaelFrancis�Beast�Cube�Bucky�Joshua�Stryfe�Harmony�Teresa�Claudia�Walker�Glenn�Fritz�Fordak�June�Cleopetra�Jean�Ivy�Betsy�Roosevelt�Spike�Ken�Which�Tofu�Chiyo�Rob�Zee�dustin�George�Del�Matthew�Cat�Jacqui�Lightfoot�Adrian�Viola�Alfred�Noel�Irfan�Sunil�Yool�Rika�Jane�Xtreme�Frontier�a2�Neo�Siobhan�Yoz�Justin�Elle�Qarl�Benjamin�Isabel�Gulliver�Everett�Christopher�Izzy�Stephany�Garry�Sejong�Sean�Tobin�Iridium�Meta�Anthony�Jeremy�JP�Jake�Maurice�Madhavi�Leopard�Kyle�Joon�Kari�Bert�Belinda�Jon�Kristi�Bridie�Pramod�KJ�Socrates�Maria�Ivan�Aric�Yamasaki�Adreanne�Jay�MitchK�Ceren�Coco�Durl�Jenny�Periapse�Kartic�Storrs�Lotte�Sandy�Rohn�Colossus�Zen�BigPapi�Brad�Pastrami�Kurz�Mani�Neuro�Jaime�MJ�Rowan�Sgt�Elvis�Gecko�Samuel�Sardonyx�Leo�Bryan�Niko�Soft�Poppy�Rachel�Aki�Angelo�Banzai�Alexa�Sue�CeeLo�Bender�CG�Gillian�Pelle�Nick�Echo�Zara�Christine�Shamiran�Emma�Blake�Keiko�Plexus�Joppa�Sidewinder�Erica�Ashlei�Twilight�Kristen�Brett�Q�Enus�Simon�Bevis�Kraft�Kip�Chandler�Ron�LauraP�Ram�KyleJM�Scouse�Prospero�Melissa�Marty�Nat�Hamilton�Kend�Lordan�Jimmy�Kosmo�Seraph�Green�Ekim�Wiggo�JT�Rome�Doris�Miz�Benoc�Whump�Trinity�Patch�Kate�TJ�Bao�Joohwan�Christy�Sofia�Matias�Cogsworth�Johan�Oreh�Cheah�Angela�Brandy�Mango�Lan�Aleks�Gloria�Heidy�Mitchell�Space�Colton�Bambers�Einstein�Maggie�Malbers�Rose�Winnie�Stella�Milton�Rothman�Niall�Marin�Allison�Katie�Dawn�Katt�Dusty�Kalpana�Judy�Andrea�Ambroff�Infinity�Gail�Rico�Raymond�Yi�William�Christa�M�Teagan�Scout�Molly�Dante�Corr�Dynamike�Usi�Kaylee�Vidtuts�Lil�Danica�Sascha�Kelv�Jacob�Nya�Rodney�Brandon�Elsie�Blondin�Grant�Katrin�Nyx�Gabriel�Locklainn�Claire�Devin�Minerva�Monty�Austin�Bradford�Si�Keira�H�Caitlin�Dita�Makai�Jenn�Ann�Meredith�Clare�Joy�Praveen�Cody�Edmund�Ruthe�Sirena�Gayathri�Spider�FJ�Davidoff�Tian�Jennie�Louise�Oskar�Landon�Noelle�Jarv�Ingrid�Al�Sommer�Doc�Aria�Huin�Gray�Lili�Vir�DJ�Yang�T�Simone�Maestro�Scott�Charlene�Quixote�Amanda�Susan�Zed�Anne�Enkidu�Esbee�Joroan�Katelin�Roxie�Tay�Scarlet�Kevin�Johnny�Wolfgang�Andren�Bob�Howard�Merov�Rand�Ray�Michon�Newell�Galen�Dessie�Les����他多数�人��よ��作��れ���。
 
   ���ージョンを�れ���最高�も���るよ���力を�����以下��人�皆様�深�感������。 able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
index 08c91f1..0e3153c 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_choose_group.xml
@@ -5,4 +5,7 @@
         </text>
         <button label="OK" label_selected="OK" name="OK" />
         <button label="�り消�" label_selected="�り消�" name="Cancel" />
+  <string name="none">
+                グループ��
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
index 785fd86..adfdcd4 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -13,4 +13,7 @@
         <button label="抜�る" name="Leave" />
         <button label="作�..." name="Create" />
         <button label="検索..." name="Search..." />
+  <string name="none">
+                グループ��
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_about.xml b/linden/indra/newview/skins/default/xui/ko/floater_about.xml
index 8d532b7..075e8ea 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_about.xml
@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="세컨드��프 정보">
         <text_editor name="credits_editor">
-                세컨드��프 제작�들: Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl, 그 외� 많� 분들� 수고해 주셨습니다.
+  The Imprudence Viewer was rocked hard by:
+  Jacek Antonelli, McCabe Maxsted, and Armin Weatherwax. 
+  http://www.imprudenceviewer.org
+  
+  Imprudence is so awesome thanks to contributions from many generous people:
+  
+  For their patches and code contributions, we thank Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Asuka Neely, Balp Allen, Carjay McGinnis, Dale Glass, Felix Duesenburg, Henri Beauchamp, Kitty Barnett, Latif Khalifa, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Nicholaz Beresford, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thomas Shikami, Vadim Bigbear, Zi Ree, and Zwagoth Klaar.
+  
+  For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
+  
+  Thanks also to the developers of the Green Life Emerald Viewer, Hippo Viewer, and Meerkat Viewer for viewer enhancements we have incorporated. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
+  
+  For a complete list of who did what, read the release notes!
+  
+
+  Second Life Copyright (C) 1999-2009 Linden Research Inc.
+  
+        세컨드��프 제작�들: Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, 그 외� 많� 분들� 수고해 주셨습니다.
 
   현재 버전� 최�� 버전� � 수 있�� �와주신 여러분께 �사드립니다: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
diff --git a/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml b/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
index 2cb821a..53bb889 100644
--- a/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
+++ b/linden/indra/newview/skins/default/xui/ko/floater_choose_group.xml
@@ -5,4 +5,7 @@
         </text>
         <button label="확�" label_selected="확�" name="OK" />
         <button label="취소" label_selected="취소" name="Cancel" />
+  <string name="none">
+                그룹 없�
+  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_groups.xml b/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
index cdd28a6..8e66006 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_groups.xml
@@ -13,4 +13,7 @@
         <button label="탈퇴" name="Leave" width="90"/>
         <button label="만들기" name="Create" width="90"/>
         <button label="검색" name="Search..." width="90"/>
+  <string name="none">
+                그룹 없�
+  </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/zh/floater_about.xml b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
index 334e7eb..fbcb953 100644
--- a/linden/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -1,7 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="关于第二人生">
         <text_editor name="credits_editor">
-                第二人生的推出应感谢以下人物的贡献： Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl 以�更多人。 
+  The Imprudence Viewer was rocked hard by:
+  Jacek Antonelli, McCabe Maxsted, and Armin Weatherwax. 
+  http://www.imprudenceviewer.org
+  
+  Imprudence is so awesome thanks to contributions from many generous people:
+  
+  For their patches and code contributions, we thank Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Asuka Neely, Balp Allen, Carjay McGinnis, Dale Glass, Felix Duesenburg, Henri Beauchamp, Kitty Barnett, Latif Khalifa, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Nicholaz Beresford, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thomas Shikami, Vadim Bigbear, Zi Ree, and Zwagoth Klaar.
+  
+  For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
+  
+  Thanks also to the developers of the Green Life Emerald Viewer, Hippo Viewer, and Meerkat Viewer for viewer enhancements we have incorporated. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
+  
+  For a complete list of who did what, read the release notes!
+  
+
+  Second Life Copyright (C) 1999-2009 Linden Research Inc.
+  
+        第二人生的推出应感谢以下人物的贡献： Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les 以�更多人。 
 
 感谢以下居民，他们的帮助��了这次第二人生的版本是有�以�最出色的: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
 
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index a69f43f..f9bf283 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -68,7 +68,8 @@
 <TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
 <TextEmbeddedItemColor value="0, 0, 128, 255" />            <!-- Text of items embedded in notecards -->
 <TextDefaultColor value="0, 20, 0, 255"/>                   <!-- Non-keyword text in the script editor -->
-<ScriptBgReadOnlyColor value="180, 180, 180, 255" />        <!-- Not used -->
+<TextLinkColor value="0, 20, 255, 255"/>
+<TextLinkHoverColor value="0, 50, 255, 255"/>
  
 <!-- LISTBOXES -->
 <ScrollBgReadOnlyColor value="255, 255, 255, 140" />    <!-- Background of read only lists -->
@@ -81,7 +82,8 @@
 <ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->
 <ScrollbarThumbColor value="120, 160, 200, 255" />      <!-- Scroll bar -->
 <ScrollbarTrackColor value="183, 202, 220, 255" />      <!-- Scroll bar background -->
- 
+<ScrollReadOnlyColor value="180, 180, 180, 255" />      <!-- Color for inactive but not disabled lists -->
+  
 <!-- MENUS -->
 <MenuBarBgColor value="185, 200, 220, 230" />               <!-- Menu bar background -->
 <MenuBarGodBgColor value="100, 200, 130, 230" />            <!-- Menu bar background with God Mode enabled -->
@@ -160,6 +162,9 @@
 <MapAvatar value="0, 255, 0, 255" />                    <!-- Your avatar's glyph color -->
 <MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
 <MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
+<MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
+<MapImpDev value="90, 45, 101, 255" />                  <!-- Imprudence developers glyph color -->
+<MapPartner value="214, 40, 107, 255" />                <!-- (unused) Your avatar's partner's glyph color -->
  
 <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
diff --git a/linden/indra/newview/skins/silver/textures/arrow_left.tga b/linden/indra/newview/skins/silver/textures/arrow_left.tga
new file mode 100644
index 0000000..43fbf12
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/arrow_left.tga
diff --git a/linden/indra/newview/skins/silver/textures/arrow_right.tga b/linden/indra/newview/skins/silver/textures/arrow_right.tga
new file mode 100644
index 0000000..a92ac9c
--- /dev/null
+++ b/linden/indra/newview/skins/silver/textures/arrow_right.tga
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml
deleted file mode 100644
index 025a616..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_chatterbox.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="390" name="floater_chatterbox"
-     rect_control="ChatterboxRect" title="Communicate" width="392">
-<icon enabled="false" image_name="tabarea.tga"
-             bg_alpha_color="blue" color="DefaultShadowLight" border="false"
-             bottom="-389" follows="left|right|bottom" height="17" left="1" scale_image="true"
-             mouse_opaque="false" name="chatterbox_tab_container" width="391"></icon>
-    <tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"
-             name="chatterbox_tabs" tab_position="bottom" tab_width="80" width="395" />
-</multi_floater>
-
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
deleted file mode 100644
index 12ae6dc..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_script_ed_panel.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
-     left="0" mouse_opaque="true" name="script panel" width="500">
-        <text_editor type="string" length="1" bottom="-393"
-             embedded_items="false" enabled="true" follows="left|top|right|bottom"
-             font="Monospace" height="376" ignore_tab="false" left="4"
-             max_length="65536" mouse_opaque="true" name="Script Editor" width="492"
-             word_wrap="true" show_line_numbers="true">
-                Loading...
-        </text_editor>
-        <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="20" label="Save" label_selected="Save" left="360"
-             mouse_opaque="true" name="Save_btn" width="128" />
-        <scroll_list background_visible="true" bottom="-457" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true"
-             follows="left|right|bottom" height="60" left="4" mouse_opaque="true"
-             multi_select="false" name="lsl errors" width="492" />
-        <combo_box allow_text_entry="false" bottom="-499" enabled="true" follows="left|bottom"
-             height="20" label="Insert..." left="12" max_chars="20" mouse_opaque="true"
-             name="Insert..." width="128" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-473" drop_shadow_visible="true" enabled="true"
-             follows="left|bottom" font="SansSerifSmall" h_pad="0" halign="left"
-             height="12" left="12" mouse_opaque="true" name="line_col" v_pad="0"
-             width="128" />
-        <menu_bar bottom="-15" drop_shadow="false" enabled="true" follows="left|top|right"
-             height="18" left="8" mouse_opaque="false" name="script_menu" opaque="false"
-             tear_off="false" width="476">
-                <menu bottom="0" drop_shadow="true" enabled="true" height="62"
-                     left="0" mouse_opaque="false" name="File" opaque="true" tear_off="false"
-                     width="138">
-                        <menu_item_call bottom_delta="-30" height="20" label="Save" left="0" mouse_opaque="true"
-                             name="Save" width="138" />
-                        <menu_item_separator bottom_delta="-38" height="8" left="0" mouse_opaque="true" name="separator"
-                             width="138" />
-                        <menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
-                             mouse_opaque="true" name="Revert All Changes" width="138" />
-                </menu>
-                <menu bottom="665" drop_shadow="true" enabled="true" height="198"
-                     left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
-                     width="139">
-                        <menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
-                             mouse_opaque="true" name="Undo" width="139" />
-                        <menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
-                             mouse_opaque="true" name="Redo" width="139" />
-                        <menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator" width="139" />
-                        <menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
-                             mouse_opaque="true" name="Cut" width="139" />
-                        <menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
-                             mouse_opaque="true" name="Copy" width="139" />
-                        <menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
-                             mouse_opaque="true" name="Paste" width="139" />
-                        <menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator2" width="139" />
-                        <menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
-                             mouse_opaque="true" name="Select All" width="139" />
-                        <menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
-                             mouse_opaque="true" name="Deselect" width="139" />
-                        <menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator3" width="139" />
-                        <menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
-                             left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
-                </menu>
-                <menu bottom="-18" drop_shadow="true" enabled="true" height="34"
-                     left="0" mouse_opaque="false" name="Help" opaque="true" tear_off="false"
-                     width="112">
-                        <menu_item_call bottom="-30" enabled="true" height="20" label="Help..." left="0"
-                             mouse_opaque="true" name="Help..." width="112" />
-                        <menu_item_call bottom="-30" enabled="true" height="20" label="LSL Wiki Help..." left="0"
-                             mouse_opaque="true" name="LSL Wiki Help..." width="112" />
-                </menu>
-        </menu_bar>
-        <string name="loading">
-                Loading...
-        </string>
-        <string name="can_not_view">
-                You are not allowed to view this script.
-        </string>
-        <string name="public_objects_can_not_run">
-                Public Objects cannot run scripts
-        </string>
-        <string name="script_running">
-                Running
-        </string>
-</panel>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_script_queue.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_script_queue.xml
deleted file mode 100644
index c44457c..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_script_queue.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-763" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="400" left="408" min_height="100"
-     min_width="100" mouse_opaque="true" name="queue" title="Reset Progress"
-     width="300">
-        <button bottom="-392" enabled="true" follows="right|bottom" font="SansSerif"
-             halign="center" height="24" label="Close" label_selected="Close" left="220"
-             mouse_opaque="true" name="close" width="64" />
-        <scroll_list background_visible="true" bottom="-364" column_padding="5" draw_border="true"
-             draw_heading="false" draw_stripes="true" enabled="true"
-             follows="left|top|right|bottom" height="344" left="4" mouse_opaque="true"
-             multi_select="false" name="queue output" width="292" />
-</floater>
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
index 11859cc..d801251 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/floater_windlight_options.xml
@@ -4,29 +4,35 @@
      min_width="400" mouse_opaque="true" name="WindLight floater"
      rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
      width="700">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-50" drop_shadow_visible="true" follows="left|top|right"
              font="SansSerif" h_pad="0" halign="left" height="16"
              left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
              width="110">
-                Sky Presets:
-        </text>
-        <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
+    Sky Presets:
+  </text>
+  <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
              left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
              width="150" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
+             mouse_opaque="true" name="prev" scale_image="true" width="20" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
+             mouse_opaque="true" name="next" scale_image="true" width="20" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="170"
+             label="New" label_selected="New" left_delta="40"
              mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Save" label_selected="Save" left_delta="80"
+             label="Save" label_selected="Save" left_delta="70"
              mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Delete" label_selected="Delete" left_delta="80"
+             label="Delete" label_selected="Delete" left_delta="70"
              mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
              label="Day Cycle Editor" label_selected="Day Cycle Editor"
-             left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
-             scale_image="true" width="120" />
+             left_delta="100" mouse_opaque="true" name="WLDayCycleMenuButton"
+             scale_image="true" width="125" />
         <tab_container bottom="-220" follows="left|top" height="160" left="0"
              mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
                 <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
deleted file mode 100644
index 62738dc..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_avatar.xml
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="-550" height="486" left="350" name="Panel Avatar" width="430">
-        <tab_container bottom="-486" height="486" left="0" mouse_opaque="false" name="tab"
-             tab_min_width="50" tab_position="top" width="419">
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="2nd Life" left="1" mouse_opaque="true" name="2nd Life" width="418">
-                        <string name="CaptionTextAcctInfo">
-                                [ACCTTYPE]
-[PAYMENTINFO]
-[AGEVERIFICATION]
-                        </string>
-                        <string name="AcctTypeResident">
-                                Resident
-                        </string>
-                        <string name="AcctTypeTrial">
-                                Trial
-                        </string>
-                        <string name="AcctTypeCharterMember">
-                                Charter Member
-                        </string>
-                        <string name="AcctTypeEmployee">
-                                Linden Lab Employee
-                        </string>
-                        <string name="PaymentInfoUsed">
-                                Payment Info Used
-                        </string>
-                        <string name="PaymentInfoOnFile">
-                                Payment Info On File
-                        </string>
-                        <string name="NoPaymentInfoOnFile">
-                                No Payment Info On File
-                        </string>
-                        <string name="AgeVerified">
-                                Age-verified
-                        </string>
-                        <string name="NotAgeVerified">
-                                Not Age-verified
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Name:" v_pad="0" width="70">
-                                Name:
-                        </text>
-                        <name_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom="-24" enabled="false" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
-                             max_length="254" mouse_opaque="false" name="name"
-                             width="180" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="online_yes" v_pad="0" width="121">
-                                Currently Online
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="label" v_pad="0" width="121">
-                                Born:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
-                             max_length="254" mouse_opaque="false" name="born"
-                             width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="label2" v_pad="0" width="121">
-                                Account:
-                        </text>
-                        <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="48" left="279"
-                             mouse_opaque="false" name="acct_border" width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false"
-                             border_visible="true" bottom_delta="0" drop_shadow_visible="true"
-                             follows="left|top" font="SansSerifSmall" height="48" left="279"
-                             mouse_opaque="false" name="acct" width="121" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="279"
-                             mouse_opaque="true" name="partner_label"
-                             tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-                             v_pad="0" width="130">
-                                Partner:
-                        </text>
-                        <button bottom_delta="2" follows="left|top" font="SansSerif" halign="center"
-                             height="16" label="i" label_selected="i" left_delta="44"
-                             mouse_opaque="true" name="partner_info"
-                             tool_tip="Click to open partner&apos;s profile" width="18" />
-                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-                             height="16" label="?" label_selected="?" left_delta="24"
-                             mouse_opaque="true" name="partner_help" width="18" />
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="279"
-                             max_length="254" mouse_opaque="false" name="partner_edit"
-                             tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
-                             width="121">
-                                [FIRST] [LAST]
-                        </line_editor>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-44" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Photo:" v_pad="0" width="70">
-                                Photo:
-                        </text>
-                        <texture_picker allow_no_texture="true" bottom="-179" can_apply_immediately="false"
-                             default_image_name="None" follows="left|top" height="151" label=""
-                             left="79" mouse_opaque="true" name="img"
-                             tool_tip="Click to choose a picture" width="180" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-183" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Groups:" v_pad="0" width="70">
-                                Groups:
-                        </text>
-                        <scroll_list background_visible="true" bottom="-258" column_padding="5" draw_border="true"
-                             follows="left|top" height="90" left="79" mouse_opaque="false"
-                             multi_select="false" name="groups" width="321" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-280" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="About:" v_pad="0" width="70">
-                                About:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="(500 chars)" v_pad="0" width="70">
-                                (500 chars)
-                        </text>
-                        <text_editor bottom="-375" embedded_items="false"
-                             enabled="true" follows="left|top" font="SansSerifSmall" height="110"
-                             is_unicode="false" left="79" max_length="511" mouse_opaque="true"
-                             name="about" width="321" word_wrap="true" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-403" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="Give item:" v_pad="0" width="75">
-                                Give item:
-                        </text>
-                        <view_border blevel_style="in" border_thickness="0" bottom="-466" follows="left|top"
-                             height="466" left_delta="4" mouse_opaque="false" name="drop_target_rect"
-                             width="409" />
-                        <view_border blevel_style="in" bottom="-403" follows="left|top" height="16" left_delta="75"
-                             mouse_opaque="false" name="drop_target_rect_vis" width="321" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="center" height="16" left_delta="0"
-                             mouse_opaque="true" name="Give inventory"
-                             tool_tip="Drop inventory items here to give them to this person." v_pad="2"
-                             width="321">
-                                Drop inventory item here.
-                        </text>
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Show in search" left="75" mouse_opaque="true"
-                             name="allow_publish"
-                             tool_tip="Publish extra profile information such as description and image in Search."
-                             width="130" />
-                        <button bottom="-423" follows="left|top" font="SansSerif" halign="center" height="16"
-                             label="?" label_selected="?" left_delta="145" mouse_opaque="true" name="?"
-                             width="20" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map"
-                             label_selected="Find on Map" left="24" mouse_opaque="true"
-                             name="Find on Map" width="100" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20"
-                             label="Offer Teleport..." label_selected="Offer Teleport..."
-                             left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="140" />
-                        <button bottom="-428" font="SansSerif" halign="center" height="20"
-                             label="Add Friend..." label_selected="Add Friend..." left_delta="142"
-                             mouse_opaque="true" name="Add Friend..." width="130" />
-                        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Pay..."
-                             label_selected="Pay..." left="24" mouse_opaque="true" name="Pay..."
-                             width="100" />
-                        <button bottom_delta="0" font="SansSerif" halign="center" height="20"
-                             label="Instant Message..." label_selected="Instant Message..."
-                             left_delta="102" mouse_opaque="true" name="Instant Message..."
-                             tool_tip="Instant Message (IM)" width="140" />
-                        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Mute"
-                             label_selected="Mute" left_delta="142" mouse_opaque="true" name="Mute"
-                             width="130" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="Web" left="1" mouse_opaque="true" name="WebProfile" width="418">
-                  <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-18" enabled="false" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="10"
-                             max_length="254" mouse_opaque="true" name="url_edit"
-                             width="400" />
-                        <flyout_button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="18" label="Load" label_selected="Load" left="10"
-                             mouse_opaque="true" name="load" enabled="false" 
-                             tool_tip="Load this profile page with embedded web browser." width="80" >
-                                <flyout_button_item value="open" name="open_item">In external browser</flyout_button_item>
-                                <flyout_button_item value="home" name="home_item">Home URL</flyout_button_item>
-                        </flyout_button>
-                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-                             height="18" label="?" label_selected="?" left_delta="85"
-                             mouse_opaque="true" name="web_profile_help" width="18" />
-                        <check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Automatically load web profiles"
-                             left_delta="30" mouse_opaque="true" name="auto_load"
-                             tool_tip="Automatically load ALL profile webpages without asking first."
-                             width="127" />
-                        <web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"
-                             ignore_ui_scale="false" left="10" name="profile_html" start_url=""
-                             width="400" />
-                        <text bottom="5" follows="bottom|left|right" left="15" name="status_text" right="-70"
-                             top="25" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="Interests" left="1" mouse_opaque="true" name="Interests" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-36" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="I Want To:" v_pad="0" width="70">
-                                I Want To:
-                        </text>
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Build" left_delta="70" mouse_opaque="true"
-                             name="chk0" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Explore" left_delta="170" mouse_opaque="true"
-                             name="chk1" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Meet" left_delta="-170" mouse_opaque="true"
-                             name="chk2" width="57" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Be Hired" left_delta="170" mouse_opaque="true"
-                             name="chk6" width="92" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Group" left_delta="-170" mouse_opaque="true"
-                             name="chk3" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Buy" left_delta="170" mouse_opaque="true"
-                             name="chk4" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Sell" left_delta="-170" mouse_opaque="true"
-                             name="chk5" width="50" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Hire" left_delta="170" mouse_opaque="true"
-                             name="chk7" width="92" />
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
-                             max_length="254" mouse_opaque="true" name="want_to_edit"
-                             width="330" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Skills:" v_pad="0" width="70">
-                                Skills:
-                        </text>
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Textures" left_delta="70" mouse_opaque="true"
-                             name="schk0" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Architecture" left_delta="170"
-                             mouse_opaque="true" name="schk1" width="93" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Event Planning" left_delta="0"
-                             mouse_opaque="true" name="schk2" width="105" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Modeling" left_delta="-170"
-                             mouse_opaque="true" name="schk3" width="90" />
-                        <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Scripting" left_delta="0" mouse_opaque="true"
-                             name="schk4" width="90" />
-                        <check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-                             initial_value="false" label="Custom Characters" left_delta="170"
-                             mouse_opaque="true" name="schk5" width="127" />
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="-20" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
-                             max_length="254" mouse_opaque="true" name="skills_edit"
-                             width="330" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-30" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Languages:" v_pad="0" width="70">
-                                Languages:
-                        </text>
-                        <line_editor bevel_style="in" border_style="line"
-                             border_thickness="1" bottom_delta="0" enabled="true" follows="left|top"
-                             font="SansSerifSmall" height="16" is_unicode="false" left="74"
-                             max_length="254" mouse_opaque="true" name="languages_edit"
-                             width="330" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="Picks" left="1" mouse_opaque="true" name="Picks" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
-                             mouse_opaque="true"
-                             name="Tell everyone about your favorite places in Second Life." v_pad="0"
-                             width="302">
-                                Tell everyone about your favorite places in Second Life.
-                        </text>
-                        <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                             height="20" label="New..." label_selected="New..." left="114"
-                             mouse_opaque="true" name="New..." width="75" />
-                        <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Delete..." label_selected="Delete..." left_delta="79"
-                             mouse_opaque="true" name="Delete..." width="75" />
-                        <tab_container bottom="-411" follows="left|top" height="363" left="4" mouse_opaque="false"
-                             name="picks tab" tab_position="left" width="412" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
-                             name="loading_text" v_pad="0" width="302">
-                                Loading...
-                        </text>
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="Classified" left="1" mouse_opaque="true" name="Classified"
-                     width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-20" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="114"
-                             mouse_opaque="true"
-                             name="Place an ad in Second Life&apos;s classified listings." v_pad="0"
-                             width="302">
-                                Place an ad in Second Life&apos;s classified listings.
-                        </text>
-                        <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                             height="20" label="New..." label_selected="New..." left="114"
-                             mouse_opaque="true" name="New..." width="75" />
-                        <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
-                             label="Delete..." label_selected="Delete..." left_delta="79"
-                             mouse_opaque="true" name="Delete..." width="75" />
-                        <tab_container bottom="-443" follows="left|top" height="395" left="4" mouse_opaque="false"
-                             name="classified tab" tab_position="left" width="412" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-70" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-                             h_pad="0" halign="left" height="20" left="114" mouse_opaque="false"
-                             name="loading_text" v_pad="0" width="302">
-                                Loading...
-                        </text>
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="1st Life" left="1" mouse_opaque="true" name="1st Life" width="418">
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-36" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Photo:" v_pad="0" width="61">
-                                Photo:
-                        </text>
-                        <texture_picker allow_no_texture="true" bottom="-171" can_apply_immediately="false"
-                             default_image_name="None" follows="left|top" height="151" label=""
-                             left="70" mouse_opaque="true" name="img"
-                             tool_tip="Click to choose a picture" width="135" />
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-203" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
-                             mouse_opaque="true" name="Info:" v_pad="0" width="61">
-                                Info:
-                        </text>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="right" height="16" left="0"
-                             mouse_opaque="true" name="(250 chars)" v_pad="0" width="65">
-                                (250 chars)
-                        </text>
-                        <text_editor bottom="-347" embedded_items="false"
-                             enabled="true" follows="left|top" font="SansSerifSmall" height="160"
-                             is_unicode="false" left="70" max_length="254" mouse_opaque="false"
-                             name="about" width="330" word_wrap="true" />
-                </panel>
-                <panel border="true" bottom="-482" follows="left|top|right|bottom" height="466"
-                     label="My Notes" left="1" mouse_opaque="true" name="My Notes" width="418">
-                        <string name="Loading">
-                                Loading...
-                        </string>
-                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-52" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="48" left="10"
-                             mouse_opaque="true" name="label" v_pad="0" width="412">
-                                Use this space to record your notes about this person.  Keep track
-of trades in progress, joint projects, etc.  Only you can see these
-notes.  This person cannot see them, nor can other people.
-                        </text>
-                        <text_editor bottom_delta="-260" embedded_items="false" enabled="true" follows="left|top"
-                             font="SansSerif" height="256" is_unicode="false" left="10"
-                             max_length="1023" mouse_opaque="true" name="notes edit" width="400"
-                             word_wrap="false" />
-                </panel>
-        </tab_container>
-        <button bottom="-483" font="SansSerif" halign="center" height="20" label="OK"
-             label_selected="OK" left="208" mouse_opaque="true" name="OK" width="100" />
-        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Cancel"
-             label_selected="Cancel" left_delta="105" mouse_opaque="true" name="Cancel"
-             width="100" />
-        <button bottom_delta="132" font="SansSerif" halign="center" height="20" label="Kick"
-             label_selected="Kick" left="4" mouse_opaque="true" name="Kick" width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Freeze"
-             label_selected="Freeze" left="4" mouse_opaque="true" name="Freeze"
-             tool_tip="Stop this resident&apos;s movement and chat." width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20"
-             label="Unfreeze" label_selected="Unfreeze" left="4" mouse_opaque="true"
-             name="Unfreeze" tool_tip="Thaw resident" width="72" />
-        <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="CSR"
-             label_selected="CSR" left="4" mouse_opaque="true" name="csr_btn"
-             tool_tip="Open customer service tool for this resident" width="72" />
-        <string name="ShowOnMapNonFriend">
-                Show location on the map.
-Disabled because you have not
-formed a friendship with them.
-        </string>
-        <string name="ShowOnMapFriendOffline">
-                Show location on the map.
-    Disabled because they are not online.
-        </string>
-        <string name="ShowOnMapFriendOnline">
-                Show location on the map.
-        </string>
-        <string name="TeleportGod">
-                Force a teleport to your location.
-        </string>
-        <string name="TeleportPrelude">
-                Offer a teleport to your location.
-Disabled until you leave Orientation Island.
-        </string>
-        <string name="TeleportNormal">
-                Offer a teleport to your location.
-        </string>
-        <string name="Loading">
-                Loading...
-        </string>
-</panel>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 158d092..76a176d 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -773,26 +773,28 @@ class LinuxManifest(ViewerManifest):
 
         self.package_file = installer_name + '.tar.bz2'
 
-        if("package" in self.args['actions'] or
-           "unpacked" in self.args['actions']):
-
-            # temporarily move directory tree so that it has the right
-            # name in the tarfile
-            self.run_command("mv %(dst)s %(inst)s" % {
-                'dst': self.get_dst_prefix(),
-                'inst': self.build_path_of(installer_name)})
-            try:
-                # --numeric-owner hides the username of the builder for
-                # security etc.
-                self.run_command('tar -C %(dir)s --numeric-owner -cjf '
-                                 '%(inst_path)s.tar.bz2 %(inst_name)s' % {
-                    'dir': self.get_build_prefix(),
-                    'inst_name': installer_name,
-                    'inst_path':self.build_path_of(installer_name)})
-            finally:
-                self.run_command("mv %(inst)s %(dst)s" % {
-                    'dst': self.get_dst_prefix(),
-                    'inst': self.build_path_of(installer_name)})
+        # Disabled for now. It's a waste of time to package every compile.
+
+        # if("package" in self.args['actions'] or
+        #    "unpacked" in self.args['actions']):
+        #
+        #     # temporarily move directory tree so that it has the right
+        #     # name in the tarfile
+        #     self.run_command("mv %(dst)s %(inst)s" % {
+        #         'dst': self.get_dst_prefix(),
+        #         'inst': self.build_path_of(installer_name)})
+        #     try:
+        #         # --numeric-owner hides the username of the builder for
+        #         # security etc.
+        #         self.run_command('tar -C %(dir)s --numeric-owner -cjf '
+        #                          '%(inst_path)s.tar.bz2 %(inst_name)s' % {
+        #             'dir': self.get_build_prefix(),
+        #             'inst_name': installer_name,
+        #             'inst_path':self.build_path_of(installer_name)})
+        #     finally:
+        #         self.run_command("mv %(inst)s %(dst)s" % {
+        #             'dst': self.get_dst_prefix(),
+        #             'inst': self.build_path_of(installer_name)})
 
 
 class Linux_i686Manifest(LinuxManifest):
@@ -823,14 +825,11 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
 
-            self.path("libopenal.so") # symlink
             self.path("libopenal.so.1")
-            self.path("libalut.so")
+            self.path("libalut.so.0")
 
             # Gstreamer libs
-            self.path("libgstbase-0.10.so") # symlink
             self.path("libgstbase-0.10.so.0")
-            self.path("libgstreamer-0.10.so") # symlink
             self.path("libgstreamer-0.10.so.0")
             self.path("libgstaudio-0.10.so.0")
             self.path("libgstbase-0.10.so.0")
@@ -847,18 +846,10 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libgstvideo-0.10.so.0")
 
             # Gstreamer plugin dependencies
-            self.path("libavcodec.so.52")
-            self.path("libavformat.so.52")
-            self.path("libavutil.so.49")
-            self.path("libxvidcore.so.4")
-            self.path("libfaac.so.0")
-            self.path("libfaad.so.1")
-            self.path("libmp3lame.so.0")
             self.path("libogg.so.0")
+            self.path("libtheora.so.0")
             self.path("libvorbis.so.0")
             self.path("libvorbisenc.so.2")
-            self.path("libxml2.so.2")
-            self.path("libxvidcore.so.4")
 
             # Gstreamer plugins
             if self.prefix("gstreamer-plugins"):
@@ -873,7 +864,6 @@ class Linux_i686Manifest(LinuxManifest):
                 self.path("libgstdecodebin2.so")
                 self.path("libgstdecodebin.so")
                 self.path("libgstesd.so")
-                self.path("libgstffmpegcolorspace.so")
                 self.path("libgstffmpeg.so")
                 self.path("libgstgnomevfs.so")
                 self.path("libgsticydemux.so")
diff --git a/linden/install.xml b/linden/install.xml
index c2053d6..964c3ef 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -461,16 +461,16 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>2f1a9e14f9213c2c9564c1c1cfdd6d47</string>
+            <string>674b2a79cef8ddd28f53b28b44dcffe2</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-linux-20080817.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/glib-2.20.5-linux-20091009.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>3d5e29d444dde4815b36082eedfc775a</string>
+            <string>b1e0e16472c0e5d3b6291870e3f20b0c</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glib-2.0-windows-20080817.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/glib-2.18.4-windows-03162009.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -498,9 +498,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>c829b638b6eef71ca63418cb9aea46a2</string>
+            <string>591900261bddbe3d1e579f7e6070081a</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gstreamer-linux-20080613.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux-20091005.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
@@ -512,9 +512,9 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>f8db21e781735ba5dd84f3043d20e882</string>
+            <string>70ffd9d5e1c45a634be1beed70371784</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.22-windows-04172009.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.22-windows-20090903.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -524,21 +524,32 @@
         <string>lgpl</string>
         <key>packages</key>
         <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>2cce992f4506fbc11f827aa80eb499f4</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-linux-20091008.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>9693550810903d5bca10e018fccd7994</string>
+            <string>77b954b9313459cb7cd6046bf91de296</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-20090608.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-20090903.tar.bz2</uri>
           </map>
         </map>
       </map>
-      <key>gtk-atk-pango-glib</key>
+      <key>gtk-etc</key>
       <map>
         <key>copyright</key>
-        <string>Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald</string>
+        <string>Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+atk: Copyright 2001 Sun Microsystems Inc.
+cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Red Hat, Inc.
+
+</string>
         <key>description</key>
-        <string>Libraries associated with GTK for gui features. atk: interfaces for accessibility; glib: low-level core functionality for using GTK+ and GNOME; pango: layout/rendering of text w/ emphasis on internationalization.</string>
+        <string>GTK+ and associated libraries (atk, cairo, pango, pixman)</string>
         <key>license</key>
         <string>lgpl</string>
         <key>packages</key>
@@ -546,16 +557,9 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>21c16a74f8fc9a62e3ab944a6eb7403d</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-linux-20080616.tar.bz</uri>
-          </map>
-          <key>windows</key>
-          <map>
-            <key>md5sum</key>
-            <string>d963750bcd333a108b3697d220c87d09</string>
+            <string>143844d33c5075bf30f8af1fd86a6f09</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gtk-atk-pango-glib-windows-20080613.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/gtk-etc-linux-20091008.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -729,9 +733,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>a3975dcdb9a3ba0ca179b673b5e9b55e</string>
+            <string>200bdf3c5a5489210fcee965f639a3f9</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-windows-20090306.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/libpng-1.2.34-1-windows-04172009.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -763,9 +767,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>4b5d2dcfe8a49b73fb69f10aab441092</string>
+            <string>cec4328f5808b49836c467831a5f285e</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux-20080613.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/libxml2-2.7.4-r1-linux-20091005.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
@@ -914,7 +918,7 @@ anguage Infrstructure (CLI) international standard</string>
         <key>description</key>
         <string>Ogg: container format Vorbis: audio compression scheme</string>
         <key>license</key>
-        <string>ogg-vorbis</string>
+        <string>xiph-bsd</string>
         <key>packages</key>
         <map>
           <key>darwin</key>
@@ -927,9 +931,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>6dc0536329a0aadf76e3054ffd4da61c</string>
+            <string>92c614b34fc283588625805076d58e93</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.2.0-linux-20081201.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-linux-20091003.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
@@ -947,79 +951,79 @@ anguage Infrstructure (CLI) international standard</string>
           </map>
         </map>
       </map>
-      <key>openSSL</key>
+      <key>openal</key>
       <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2008 by authors.</string>
+        <key>description</key>
+        <string>3D Audio library</string>
         <key>license</key>
-        <string>openSSL</string>
+        <string>lgpl</string>
         <key>packages</key>
         <map>
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>a7b49e0f3eedbd5de117a3524c414b3a</string>
+            <string>f30b851e089108978c8218295a405159</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-darwin-20080812.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/openal-darwin-20090418.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>f219ef07b02e2abb9282345c3a8f2b39</string>
+            <string>6f69d70ec18a3c3c2dee81bf6331c784</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-linux-20080812.tar.bz2</uri>
-          </map>
-          <key>linux64</key>
-          <map>
-            <key>md5sum</key>
-            <string>00b23f28a2457d9dabbaff0b29ee7323</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8g-linux64-20080909.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/openal-linux-20091009.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>dd85209081b832e836de6e1538541d89</string>
+            <string>7c33758dc0a047c244de03133dd76c2a</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8j-windows-20090129.tar.bz2</uri>
+            <uri>http://imprudence.s3.amazonaws.com/extras/openal-soft-1.6.372-windows-01262009.tar.bz2</uri>
           </map>
         </map>
       </map>
-      <key>openal-soft</key>
+      <key>openSSL</key>
       <map>
-        <key>copyright</key>
-        <string>Copyright (C) 2008 by authors.</string>
-        <key>description</key>
-        <string>3D Audio library</string>
         <key>license</key>
-        <string>lgpl</string>
+        <string>openSSL</string>
         <key>packages</key>
         <map>
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>a0757244e3e6688fde2ffeea35cc1f96</string>
+            <string>a7b49e0f3eedbd5de117a3524c414b3a</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-darwin-20080924.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-darwin-20080812.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>f0d9a8d1318b519cffe6c40c9cac4e21</string>
+            <string>f219ef07b02e2abb9282345c3a8f2b39</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-linux-20081010c-59a71b14-plughw.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-linux-20080812.tar.bz2</uri>
+          </map>
+          <key>linux32</key>
+          <map>
+            <key>md5sum</key>
+            <string>1037114c5b7ad906daca2b4820080b5b</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8g-linux-i686-gcc-4.1-20080915.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>5ad0a3ab623356c1ad61394ba238f99f</string>
+            <string>00b23f28a2457d9dabbaff0b29ee7323</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-soft-1.6.372-linux64-20081219.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8g-linux64-20080909.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>a0757244e3e6688fde2ffeea35cc1f96</string>
+            <string>8a75180cae12d268071c090abb031ba5</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-windows-20080924.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-windows-20080613.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -1115,6 +1119,25 @@ anguage Infrstructure (CLI) international standard</string>
           </map>
         </map>
       </map>
+      <key>theora</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright (C) 2002-2009 Xiph.org Foundation</string>
+        <key>description</key>
+        <string>Ogg Theora video format</string>
+        <key>license</key>
+        <string>xiph-bsd</string>
+        <key>packages</key>
+        <map>
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>a6e6e250efaf3f25db4699d9b5dfec4b</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/theora-linux-20091003.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
       <key>tut</key>
       <map>
         <key>copyright</key>
@@ -1258,9 +1281,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>9ad657cc5146fef77ffa8dd1c069018f</string>
+            <string>0efbf671a0d686bb0141895e91fbfc46</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-windows-20080723.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/libs/zlib-1.1.4-windows-20090829.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -1408,7 +1431,7 @@ Cass Everitt - cass@r3.nu
         <key>url</key>
         <string>http://www.mozilla.org/MPL/MPL-1.1.html</string>
       </map>
-      <key>ogg-vorbis</key>
+      <key>xiph-bsd</key>
       <map>
         <key>url</key>
         <string>http://www.xiph.org/licenses/bsd/</string>
diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index 5069918..1db9bb3 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -64,7 +64,7 @@ def add_indra_lib_path():
 base_dir = add_indra_lib_path()
 
 import copy
-import md5
+from hashlib import md5
 import optparse
 import os
 import platform
@@ -75,8 +75,6 @@ import tempfile
 import urllib2
 import urlparse
 
-from sets import Set as set, ImmutableSet as frozenset
-
 from indra.base import llsd
 from indra.util import helpformatter
 
@@ -106,7 +104,7 @@ class InstallFile(object):
         return "ifile{%s:%s}" % (self.pkgname, self.url)
 
     def _is_md5sum_match(self):
-        hasher = md5.new(file(self.filename, 'rb').read())
+        hasher = md5(file(self.filename, 'rb').read())
         if hasher.hexdigest() == self.md5sum:
             return  True
         return False