189 files changed, 16438 insertions, 1911 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 34aa29f..bb07922 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -61,6 +61,7 @@ include_directories(
     )
 
 set(viewer_SOURCE_FILES
+        jcfloater_animation_list.cpp
     llagent.cpp
     llagentdata.cpp
     llagentlanguage.cpp
@@ -121,6 +122,7 @@ set(viewer_SOURCE_FILES
     llfloaterabout.cpp
     llfloateractivespeakers.cpp
     llfloateranimpreview.cpp
+    llfloaterassetbrowser.cpp
     llfloaterauction.cpp
     llfloateravatarinfo.cpp
     llfloateravatarpicker.cpp
@@ -166,6 +168,7 @@ set(viewer_SOURCE_FILES
     llfloatermute.cpp
     llfloaternamedesc.cpp
     llfloaternewim.cpp
+    llfloaterobjectiminfo.cpp
     llfloateropenobject.cpp
     llfloaterparcel.cpp
     llfloaterpermissionsmgr.cpp
@@ -420,6 +423,7 @@ set(viewer_SOURCE_FILES
     llwearablelist.cpp
     llweb.cpp
     llwebbrowserctrl.cpp
+    llwindlightremotectrl.cpp
     llwind.cpp
     llwlanimator.cpp
     llwldaycycle.cpp
@@ -431,6 +435,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
@@ -454,6 +464,7 @@ set(viewer_HEADER_FILES
     CMakeLists.txt
     ViewerInstall.cmake
 
+        jcfloater_animation_list.h
     llagent.h
     llagentdata.h
     llagentlanguage.h
@@ -516,6 +527,7 @@ set(viewer_HEADER_FILES
     llfloaterabout.h
     llfloateractivespeakers.h
     llfloateranimpreview.h
+    llfloaterassetbrowser.h
     llfloaterauction.h
     llfloateravatarinfo.h
     llfloateravatarpicker.h
@@ -561,6 +573,7 @@ set(viewer_HEADER_FILES
     llfloatermute.h
     llfloaternamedesc.h
     llfloaternewim.h
+    llfloaterobjectiminfo.h
     llfloateropenobject.h
     llfloaterparcel.h
     llfloaterpermissionsmgr.h
@@ -820,6 +833,7 @@ set(viewer_HEADER_FILES
     llwebbrowserctrl.h
     llwind.h
     llwindebug.h
+    llwindlightremotectrl.h
     llwlanimator.h
     llwldaycycle.h
     llwlparammanager.h
@@ -831,9 +845,16 @@ set(viewer_HEADER_FILES
     macmain.h
     noise.h
     pipeline.h
+    primbackup.h
     randgauss.h
     VertexCache.h
     VorbisFramework.h
+    rlvevent.h
+    rlvhandler.h
+    rlvhelper.h
+    rlvmultistringsearch.h
+    rlvextensions.h
+    rlvfloaterbehaviour.h
     )
 
 source_group("CMake Rules" FILES ViewerInstall.cmake)
@@ -1023,7 +1044,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
@@ -1078,6 +1101,7 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/floater_name_description.xml
     skins/default/xui/en-us/floater_new_im.xml
     skins/default/xui/en-us/floater_new_outfit_dialog.xml
+    skins/default/xui/en-us/floater_object_im_info.xml
     skins/default/xui/en-us/floater_openobject.xml
     skins/default/xui/en-us/floater_pay_object.xml
     skins/default/xui/en-us/floater_pay.xml
@@ -1194,6 +1218,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
@@ -1385,6 +1412,7 @@ if (WINDOWS)
 endif (WINDOWS)
 
 target_link_libraries(${VIEWER_BINARY_NAME}
+    ${NDOF_LIBRARY}
     ${LLAUDIO_LIBRARIES}
     ${LLCHARACTER_LIBRARIES}
     ${LLIMAGE_LIBRARIES}
@@ -1414,7 +1442,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${SDL_LIBRARY}
     ${SMARTHEAP_LIBRARY}
     ${UI_LIBRARIES}
-    ${NDOF_LIBRARY}
     ${WINDOWS_LIBRARIES}
     ${XMLRPCEPI_LIBRARIES}
     ${ELFIO_LIBRARIES}
diff --git a/linden/indra/newview/app_settings/grass.xml b/linden/indra/newview/app_settings/grass.xml
index 4fc3b79..bdfa603 100644
--- a/linden/indra/newview/app_settings/grass.xml
+++ b/linden/indra/newview/app_settings/grass.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <grass_defs>
+
   <grass
-    name="Grass 0"
+    name="Grass - Medium"
         species_id="0"
         texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"
         blade_size_x="1.35"
         blade_size_y="1.35"
      />
   <grass
-    name="Grass 1"
+    name="Grass - Short 2"
         species_id="1"
         texture_id="79504bf5-c3ec-0763-6563-d843de66d0a1"
         blade_size_x="1.0"
         blade_size_y="0.66"
      />
   <grass
-    name="Grass 2"
+    name="Grass - Tall Green"
         species_id="2"
         texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb"
         blade_size_x="1.8"
         blade_size_y="1.8"
      />
   <grass
-    name="Grass 3"
+    name="Grass - Short 1"
         species_id="3"
         texture_id="99bd60a2-3250-efc9-2e39-2fbcadefbecc"
         blade_size_x="1.0"
         blade_size_y="1.0"
      />
   <grass
-    name="Grass 4"
+    name="Grass - Tall Brown"
         species_id="4"
         texture_id="7a2b3a4a-53c2-53ac-5716-aac7d743c020"
         blade_size_x="2.25"
         blade_size_y="2.25"
      />
   <grass
-    name="undergrowth_1"
+    name="Leafy Ground Cover"
         species_id="5"
         texture_id="8f458549-173b-23ff-d4ff-bfaa5ea2371b"
         blade_size_x="2.0"
         blade_size_y="2.0"
      />
 
-
 </grass_defs>
\ No newline at end of file
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 2d64f03..194e95e 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1,7 +1,106 @@
 <?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>0</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>AFKTimeout</key>
     <map>
       <key>Comment</key>
       <string>Time before automatically setting AFK (away from keyboard) mode (seconds)</string>
@@ -664,6 +763,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>
@@ -1105,6 +1215,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>
@@ -2245,6 +2366,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>
@@ -2371,6 +2503,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>
@@ -3084,7 +3227,24 @@
         <integer>0</integer>
       </array>
     </map>
-    <key>FloaterOpenObjectRect</key>
+
+  <key>FloaterObjectIMInfo</key>
+  <map>
+    <key>Comment</key>
+    <string>Rectangle for floater object im info windows</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Rect</string>
+    <key>Value</key>
+    <array>
+      <integer>0</integer>
+      <integer>300</integer>
+      <integer>300</integer>
+      <integer>0</integer>
+    </array>
+  </map>
+  <key>FloaterOpenObjectRect</key>
     <map>
       <key>Comment</key>
       <string>Rectangle for Open Object window</string>
@@ -3116,6 +3276,22 @@
         <integer>0</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>
@@ -3911,6 +4087,17 @@
         <real>1.0</real>
       </array>
     </map>
+    <key>IMInChatConsole</key>
+    <map>
+      <key>Comment</key>
+      <string>Show IMs in main chat</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>IMInChatHistory</key>
     <map>
       <key>Comment</key>
@@ -3988,6 +4175,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>
@@ -4236,16 +4434,38 @@
       <string>default</string>
     </map>
     <key>LanguageIsPublic</key>
-        <map>
+    <map>
         <key>Comment</key>
-            <string>Let other residents see our language information</string>
+        <string>Let other residents see our language information</string>
         <key>Persist</key>
-            <integer>1</integer>
+        <integer>1</integer>
         <key>Type</key>
-            <string>Boolean</string>
+        <string>Boolean</string>
         <key>Value</key>
-            <integer>1</integer>
+        <integer>1</integer>
         </map>
+    <key>LastGrass</key>
+    <map>
+    <key>Comment</key>
+        <string>The last grass selected in the create dialog</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>String</string>
+        <key>Value</key>
+        <integer>Random</integer>
+    </map>
+    <key>LastTree</key>
+    <map>
+        <key>Comment</key>
+        <string>The last tree selected in the create dialog</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>String</string>
+        <key>Value</key>
+        <integer>Random</integer>
+    </map>
     <key>LastFeatureVersion</key>
     <map>
       <key>Comment</key>
@@ -4500,6 +4720,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>
@@ -4577,6 +4808,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>
@@ -4775,6 +5017,28 @@
       <key>Value</key>
       <integer>410</integer>
     </map>
+    <key>MiniMapCenter</key>
+    <map>
+      <key>Comment</key>
+      <string>Sets the focal point of the minimap. (0=None, 1=Camera)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>MiniMapPrimMaxRadius</key>
+    <map>
+      <key>Comment</key>
+      <string>Radius of the largest prim to show on the MiniMap. Increasing beyond 256 may cause client lag.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>256.0</real>
+    </map>
     <key>MiniMapRotate</key>
     <map>
       <key>Comment</key>
@@ -4992,7 +5256,7 @@
               <key>Type</key>
               <string>F32</string>
               <key>Value</key>
-              <integer>20</integer>
+              <integer>96</integer>
     </map>
     <key>NewCacheLocation</key>
     <map>
@@ -5725,7 +5989,7 @@
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>S32</string>
+      <string>F32</string>
       <key>Value</key>
       <integer>0</integer>
     </map>
@@ -6188,6 +6452,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>RenderHighlightSelections</key>
+    <map>
+      <key>Comment</key>
+      <string>Show selection outlines on objects</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>RenderHiddenSelections</key>
     <map>
       <key>Comment</key>
@@ -7271,6 +7546,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>
@@ -7337,6 +7623,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>
@@ -7841,7 +8138,7 @@
       <key>Type</key>
       <string>F32</string>
       <key>Value</key>
-      <real>500.0</real>
+      <real>1000.0</real>
     </map>
     <key>ToolHelpRect</key>
     <map>
@@ -10053,6 +10350,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>
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/trees.xml b/linden/indra/newview/app_settings/trees.xml
index 213ee85..36ffa62 100644
--- a/linden/indra/newview/app_settings/trees.xml
+++ b/linden/indra/newview/app_settings/trees.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <tree_defs>
-    <tree name="Pine 1" species_id="0" texture_id="0187babf-6c0d-5891-ebed-4ecab1426683" droop="60.0" twist="5.0" branches="5.0" depth="1" scale_step="0.7" trunk_depth="6" branch_length="8.0" trunk_length="11.5" leaf_scale="22.0" billboard_scale="39.5" billboard_ratio="1.1" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="20.0" noise_mag="0.5" noise_scale="2.5" taper="0.8" repeat_z="3" />
+    <tree name="Pine Tree - Ponderosa" species_id="0" texture_id="0187babf-6c0d-5891-ebed-4ecab1426683" droop="60.0" twist="5.0" branches="5.0" depth="1" scale_step="0.7" trunk_depth="6" branch_length="8.0" trunk_length="11.5" leaf_scale="22.0" billboard_scale="39.5" billboard_ratio="1.1" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="20.0" noise_mag="0.5" noise_scale="2.5" taper="0.8" repeat_z="3" />
     <tree name="Oak" species_id="1" texture_id="8a515889-eac9-fb55-8eba-d2dc09eb32c8" droop="35.0" twist="3.0" branches="4.0" depth="3" scale_step="0.7" trunk_depth="0" branch_length="3.0" trunk_length="3.8" leaf_scale="7.0" billboard_scale="10.25" billboard_ratio="1.0" trunk_aspect="0.15" branch_aspect="0.07" leaf_rotate="0.0" noise_mag="1.2" noise_scale="4.0" taper="0.3" repeat_z="4" />
-    <tree name="Tropical Bush 1" species_id="2" texture_id="5bc11cd6-2f40-071e-a8da-0903394204f9" droop="10.0" twist="0.0" branches="6.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="7.5" billboard_scale="5.0" billboard_ratio="1.25" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
-    <tree name="Palm 1" species_id="3" texture_id="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="9.0" leaf_scale="10.0" billboard_scale="13.25" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.7" repeat_z="10" />
-    <tree name="Dogwood" species_id="4" texture_id="64367bd1-697e-b3e6-0b65-3f862a577366" droop="30.0" twist="0.0" branches="3.0" depth="2" scale_step="0.7" trunk_depth="1" branch_length="2.75" trunk_length="4.0" leaf_scale="5.5" billboard_scale="10.0" billboard_ratio="1.0" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.5" noise_scale="2.0" taper="0.8" repeat_z="3" />
-    <tree name="Tropical Bush 2" species_id="5" texture_id="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8" droop="10.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="6.0" billboard_scale="4.5" billboard_ratio="0.9" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
-    <tree name="Palm 2" species_id="6" texture_id="2d784476-d0db-9979-0cff-9408745a7cf3" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="10.0" leaf_scale="7.5" billboard_scale="13.5" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.6" repeat_z="12" />
-    <tree name="Cypress 1" species_id="7" texture_id="fb2ae204-3fd1-df33-594f-c9f882830e66" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.5" trunk_depth="0" branch_length="10.0" trunk_length="10.0" leaf_scale="70.0" billboard_scale="22.5" billboard_ratio="1.0" trunk_aspect="0.05" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="6" />
-    <tree name="Cypress 2" species_id="8" texture_id="30047cec-269d-408e-0c30-b2603b887268" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.6" trunk_depth="3.0" branch_length="7.5" trunk_length="10.0" leaf_scale="35.0" billboard_scale="25.0" billboard_ratio="0.8" trunk_aspect="0.05" branch_aspect="0.04" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="5" />
-    <tree name="Pine 2" species_id="9" texture_id="d691a01c-13b7-578d-57c0-5caef0b4e7e1" droop="50.0" twist="7.5" branches="4.0" depth="2" scale_step="0.7" trunk_depth="6.0" branch_length="6.0" trunk_length="10.0" leaf_scale="15.5" billboard_scale="33.0" billboard_ratio="1.35" trunk_aspect="0.1" branch_aspect="0.08" leaf_rotate="5.0" noise_mag="0.5" noise_scale="2.5" taper="0.7" repeat_z="3" />
+    <tree name="Tropical Plant 1" species_id="2" texture_id="5bc11cd6-2f40-071e-a8da-0903394204f9" droop="10.0" twist="0.0" branches="6.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="7.5" billboard_scale="5.0" billboard_ratio="1.25" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
+    <tree name="Palm Tree 1" species_id="3" texture_id="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="9.0" leaf_scale="10.0" billboard_scale="13.25" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.7" repeat_z="10" />
+    <tree name="Dogwood Tree" species_id="4" texture_id="64367bd1-697e-b3e6-0b65-3f862a577366" droop="30.0" twist="0.0" branches="3.0" depth="2" scale_step="0.7" trunk_depth="1" branch_length="2.75" trunk_length="4.0" leaf_scale="5.5" billboard_scale="10.0" billboard_ratio="1.0" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.5" noise_scale="2.0" taper="0.8" repeat_z="3" />
+    <tree name="Tropical Plant 2" species_id="5" texture_id="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8" droop="10.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="6.0" billboard_scale="4.5" billboard_ratio="0.9" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
+    <tree name="Palm Tree 2" species_id="6" texture_id="2d784476-d0db-9979-0cff-9408745a7cf3" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="10.0" leaf_scale="7.5" billboard_scale="13.5" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.6" repeat_z="12" />
+    <tree name="Cypress Tree 1" species_id="7" texture_id="fb2ae204-3fd1-df33-594f-c9f882830e66" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.5" trunk_depth="0" branch_length="10.0" trunk_length="10.0" leaf_scale="70.0" billboard_scale="22.5" billboard_ratio="1.0" trunk_aspect="0.05" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="6" />
+    <tree name="Cypress Tree 2" species_id="8" texture_id="30047cec-269d-408e-0c30-b2603b887268" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.6" trunk_depth="3.0" branch_length="7.5" trunk_length="10.0" leaf_scale="35.0" billboard_scale="25.0" billboard_ratio="0.8" trunk_aspect="0.05" branch_aspect="0.04" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="5" />
+    <tree name="Pine Tree - Evergreen" species_id="9" texture_id="d691a01c-13b7-578d-57c0-5caef0b4e7e1" droop="50.0" twist="7.5" branches="4.0" depth="2" scale_step="0.7" trunk_depth="6.0" branch_length="6.0" trunk_length="10.0" leaf_scale="15.5" billboard_scale="33.0" billboard_ratio="1.35" trunk_aspect="0.1" branch_aspect="0.08" leaf_rotate="5.0" noise_mag="0.5" noise_scale="2.5" taper="0.7" repeat_z="3" />
     <tree name="Plumeria" species_id="10" texture_id="6de37e4e-7029-61f5-54b8-f5e63f983f58" droop="8.0" twist="7.0" branches="3.0" depth="2" scale_step="0.6" trunk_depth="0" branch_length="3.0" trunk_length="0.1" leaf_scale="20" billboard_scale="10.0" billboard_ratio="1.35" trunk_aspect="0.10" branch_aspect="0.075" leaf_rotate="0.0" noise_mag="0" noise_scale="0" taper="0.85" repeat_z="2" />
-    <tree name="Winter Pine 1" species_id="11" texture_id="10d2a01a-0818-84b9-4b96-c2eb63256519" droop="90.0" twist="2.5" branches="6.0" depth="1" scale_step="0.66" trunk_depth="8" branch_length="0.0" trunk_length="4" leaf_scale="6.75" billboard_scale="12.5" billboard_ratio="0.6" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.0" noise_scale="2.5" taper="0.85" repeat_z="2" />
-    <tree name="Winter Aspen" species_id="12" texture_id="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a" droop="85.0" twist="3.0" branches="5" depth="1" scale_step="0.6" trunk_depth="8" branch_length="3.0" trunk_length="4.5" leaf_scale="8" billboard_scale="12" billboard_ratio=".675" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.75" noise_scale="2.5" taper="0.8" repeat_z="2" />
-    <tree name="Winter Pine 2" species_id="13" texture_id="67931331-0c02-4876-1255-28770896c6a2" droop="140.0" twist="5.0" branches="6.0" depth="1" scale_step="0.6" trunk_depth="7" branch_length="0.0" trunk_length="3" leaf_scale="5.0" billboard_scale="7.5" billboard_ratio="0.5" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.750" noise_scale="2.5" taper="0.5" repeat_z="2" />
-    <tree name="Eucalyptus" species_id="14" texture_id="a6162133-724b-54df-a12f-51cd070ad6f3" droop="20.0" twist="5.0" branches="3.6" depth="4" scale_step="0.6" trunk_depth="0" branch_length="12.0" trunk_length="8.0" leaf_scale="33.0" billboard_scale="24" billboard_ratio="1.3" trunk_aspect="0.15" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="0" noise_scale="0" taper="0.675" repeat_z="3" />
+    <tree name="Winter Pine Tree 1" species_id="11" texture_id="10d2a01a-0818-84b9-4b96-c2eb63256519" droop="90.0" twist="2.5" branches="6.0" depth="1" scale_step="0.66" trunk_depth="8" branch_length="0.0" trunk_length="4" leaf_scale="6.75" billboard_scale="12.5" billboard_ratio="0.6" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.0" noise_scale="2.5" taper="0.85" repeat_z="2" />
+    <tree name="Winter Aspen Tree" species_id="12" texture_id="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a" droop="85.0" twist="3.0" branches="5" depth="1" scale_step="0.6" trunk_depth="8" branch_length="3.0" trunk_length="4.5" leaf_scale="8" billboard_scale="12" billboard_ratio=".675" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.75" noise_scale="2.5" taper="0.8" repeat_z="2" />
+    <tree name="Winter Pine Tree 2" species_id="13" texture_id="67931331-0c02-4876-1255-28770896c6a2" droop="140.0" twist="5.0" branches="6.0" depth="1" scale_step="0.6" trunk_depth="7" branch_length="0.0" trunk_length="3" leaf_scale="5.0" billboard_scale="7.5" billboard_ratio="0.5" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.750" noise_scale="2.5" taper="0.5" repeat_z="2" />
+    <tree name="Eucalyptus Tree" species_id="14" texture_id="a6162133-724b-54df-a12f-51cd070ad6f3" droop="20.0" twist="5.0" branches="3.6" depth="4" scale_step="0.6" trunk_depth="0" branch_length="12.0" trunk_length="8.0" leaf_scale="33.0" billboard_scale="24" billboard_ratio="1.3" trunk_aspect="0.15" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="0" noise_scale="0" taper="0.675" repeat_z="3" />
     <tree name="Fern" species_id="15" texture_id="8872f2b8-31db-42d8-580a-b3e4a91262de" droop="12.0" twist="0.0" branches="7.0" depth="1" scale_step="0.5" trunk_depth="0.1" branch_length="0.01" trunk_length="0.0" leaf_scale="4" billboard_scale="3.5" billboard_ratio="0.85" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
     <tree name="Eelgrass" species_id="16" texture_id="96b4de31-f4fa-337d-ec78-451e3609769e" droop="0.0" twist="0.0" branches="5.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="5.0" billboard_scale="3.0" billboard_ratio="1.0" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" />
     <tree name="Sea Sword" species_id="17" texture_id="5894e2e7-ab8d-edfa-e61c-18cf16854ba3" droop="0.0" twist="0.0" branches="6.0" depth="1" scale_step="0.7" trunk_depth="1" branch_length="0.0" trunk_length="0.0" leaf_scale="2.0" billboard_scale="2.0" billboard_ratio="1.0" trunk_aspect="1.0" branch_aspect="1.0" leaf_rotate="0.0" noise_mag="0.5" noise_scale="0.0" taper="0.0" repeat_z="1" />
-    <tree name="Kelp 1" species_id="18" texture_id="2caf1179-7861-6ff3-4b7d-46e17780bdfa" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="0.75" leaf_scale="1.85" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.04" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" />
-    <tree name="Beach Grass 1" species_id="19" texture_id="18fb888b-e8f1-dce7-7da7-321d651ea6b0" droop="0.0" twist="0.0" branches="4.0" depth="1" scale_step="0.7" trunk_depth="1" branch_length="0.0" trunk_length="0.0" leaf_scale="4.0" billboard_scale="2.5" billboard_ratio="1.2" trunk_aspect="1.0" branch_aspect="1.0" leaf_rotate="0.0" noise_mag="0.5" noise_scale="0.0" taper="0.0" repeat_z="1" />
-    <tree name="Kelp 2" species_id="20" texture_id="2a4880b6-b7a3-690a-2049-bfbe38eafb9f" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="1.35" leaf_scale="2.0" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.025" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" />
+    <tree name="Kelp (brown)" species_id="18" texture_id="2caf1179-7861-6ff3-4b7d-46e17780bdfa" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="0.75" leaf_scale="1.85" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.04" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" />
+    <tree name="Beach Grass" species_id="19" texture_id="18fb888b-e8f1-dce7-7da7-321d651ea6b0" droop="0.0" twist="0.0" branches="4.0" depth="1" scale_step="0.7" trunk_depth="1" branch_length="0.0" trunk_length="0.0" leaf_scale="4.0" billboard_scale="2.5" billboard_ratio="1.2" trunk_aspect="1.0" branch_aspect="1.0" leaf_rotate="0.0" noise_mag="0.5" noise_scale="0.0" taper="0.0" repeat_z="1" />
+    <tree name="Kelp (green)" species_id="20" texture_id="2a4880b6-b7a3-690a-2049-bfbe38eafb9f" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="1.35" leaf_scale="2.0" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.025" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" />
 </tree_defs>
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/jcfloater_animation_list.cpp b/linden/indra/newview/jcfloater_animation_list.cpp
new file mode 100644
index 0000000..9f5c9bb
--- /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..d8262f0
--- /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 5f0a875..d73ddb6 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -232,6 +232,7 @@ LLAgent gAgent;
 // Statics
 //
 BOOL LLAgent::sDebugDisplayTarget = FALSE;
+BOOL LLAgent::sPhantom = FALSE;
 
 const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f;
 
@@ -757,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();
@@ -796,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)
                 {
@@ -835,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)
@@ -4213,6 +4253,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();
 
@@ -5007,6 +5054,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]);
@@ -5889,6 +5944,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("tplm")) || 
+                   ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting)) ))
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLViewerRegion *regionp = getRegion();
         if(regionp && teleportCore())
         {
@@ -5953,6 +6017,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("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)
@@ -6027,6 +6102,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()
@@ -6654,10 +6736,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,
@@ -6665,6 +6754,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]
         }
 }
 
@@ -7162,6 +7260,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() )
@@ -7284,15 +7389,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 );
@@ -7384,6 +7491,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;
@@ -7592,10 +7708,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(); )
@@ -7605,11 +7724,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 a4a930f..d6854e4 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -67,6 +67,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
 
@@ -371,6 +375,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 );
@@ -801,6 +810,8 @@ private:
         LLVector3d      mCameraSmoothingLastPositionGlobal;    
         LLVector3d      mCameraSmoothingLastPositionAgent;
         BOOL            mCameraSmoothingStop;
+        
+        static BOOL             sPhantom;
 
         
         //Ventrella
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 4ab5d8d..ab4d8a9 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -248,7 +248,6 @@ BOOL				gDisconnected = FALSE;
 
 // Map scale in pixels per region
 F32                             gMapScale = 128.f;
-F32                             gMiniMapScale = 128.f;
 
 // used to restore texture state after a mode switch
 LLFrameTimer    gRestoreGLTimer;
@@ -392,6 +391,7 @@ static void settings_to_globals()
         LLFolderView::sAutoOpenTime                     = llmax(0.25f, gSavedSettings.getF32("FolderAutoOpenDelay"));
         LLToolBar::sInventoryAutoOpenTime       = gSavedSettings.getF32("InventoryAutoOpenDelay");
         LLSelectMgr::sRectSelectInclusive       = gSavedSettings.getBOOL("RectangleSelectInclusive");
+        LLSelectMgr::sRenderSelectionHighlights = gSavedSettings.getBOOL("RenderHighlightSelections");
         LLSelectMgr::sRenderHiddenSelections = gSavedSettings.getBOOL("RenderHiddenSelections");
         LLSelectMgr::sRenderLightRadius = gSavedSettings.getBOOL("RenderLightRadius");
 
@@ -405,7 +405,6 @@ static void settings_to_globals()
         gAllowTapTapHoldRun = gSavedSettings.getBOOL("AllowTapTapHoldRun");
         gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
         gMapScale = gSavedSettings.getF32("MapScale");
-        gMiniMapScale = gSavedSettings.getF32("MiniMapScale");
         LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
 
         LLCubeMap::sUseCubeMaps = LLFeatureManager::getInstance()->isFeatureAvailable("RenderCubeMap");
@@ -2180,7 +2179,6 @@ void LLAppViewer::cleanupSavedSettings()
         }
 
         gSavedSettings.setF32("MapScale", gMapScale );
-        gSavedSettings.setF32("MiniMapScale", gMiniMapScale );
         gSavedSettings.setBOOL("ShowHoverTips", LLHoverView::sShowHoverTips);
 
         // Some things are cached in LLAgent.
@@ -3128,7 +3126,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();
             }
         }
@@ -3831,4 +3834,21 @@ void LLAppViewer::handleLoginComplete()
                 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 9583982..3be5de7 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -294,7 +294,6 @@ extern BOOL		gDisconnected;
 
 // Map scale in pixels per region
 extern F32 gMapScale;
-extern F32 gMiniMapScale;
 
 extern LLFrameTimer     gRestoreGLTimer;
 extern BOOL                     gRestoreGL;
diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp
index b7fd3b0..1d353fa 100644
--- a/linden/indra/newview/llcallingcard.cpp
+++ b/linden/indra/newview/llcallingcard.cpp
@@ -625,7 +625,7 @@ void LLAvatarTracker::processChangeUserRights(LLMessageSystem* msg, void**)
 void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 {
         S32 count = msg->getNumberOfBlocksFast(_PREHASH_AgentBlock);
-        BOOL chat_notify = gSavedSettings.getBOOL("ChatOnlineNotification");
+        BOOL notify = gSavedSettings.getBOOL("ChatOnlineNotification");
 
         lldebugs << "Received " << count << " online notifications **** " << llendl;
         if(count > 0)
@@ -637,7 +637,6 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
                 {
                         tracking_id = mTrackingData->mAvatarID;
                 }
-                BOOL notify = FALSE;
                 LLStringUtil::format_map_t args;
                 for(S32 i = 0; i < count; ++i)
                 {
@@ -646,14 +645,16 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
                         if(info)
                         {
                                 setBuddyOnline(agent_id,online);
-                                if(chat_notify)
+                                
+                                std::string first, last;
+                                if(gCacheName->getName(agent_id, first, last))
                                 {
-                                        std::string first, last;
-                                        if(gCacheName->getName(agent_id, first, last))
+                                        args["[FIRST]"] = first;
+                                        args["[LAST]"] = last;
+                                        if(notify)
                                         {
-                                                notify = TRUE;
-                                                args["[FIRST]"] = first;
-                                                args["[LAST]"] = last;
+                                                // Popup a notify box with online status of this agent
+                                                LLNotifyBox::showXml(online ? "FriendOnline" : "FriendOffline", args);
                                         }
                                 }
                         }
@@ -671,20 +672,16 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
                         // *TODO: get actual inventory id
                         gInventory.addChangedMask(LLInventoryObserver::CALLING_CARD, LLUUID::null);
                 }
-                if(notify)
-                {
-                        // Popup a notify box with online status of this agent
-                        LLNotifyBox::showXml(online ? "FriendOnline" : "FriendOffline", args);
 
-                        // If there's an open IM session with this agent, send a notification there too.
-                        LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, agent_id);
-                        LLFloaterIMPanel *floater = gIMMgr->findFloaterBySession(session_id);
-                        if (floater)
-                        {
-                                LLUIString notifyMsg = LLNotifyBox::getTemplateMessage((online ? "FriendOnline" : "FriendOffline"),args);
-                                if (!notifyMsg.empty())
-                                        floater->addHistoryLine(notifyMsg,gSavedSettings.getColor4("SystemChatColor"));
-                        }
+                // If there's an open IM session with this agent, send a notification there too
+                // even if ChatOnlineNotification is false.
+                LLUUID session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, agent_id);
+                LLFloaterIMPanel *floater = gIMMgr->findFloaterBySession(session_id);
+                if (floater)
+                {
+                        LLUIString notifyMsg = LLNotifyBox::getTemplateMessage((online ? "FriendOnline" : "FriendOffline"),args);
+                        if (!notifyMsg.empty())
+                                floater->addHistoryLine(notifyMsg,gSavedSettings.getColor4("SystemChatColor"));
                 }
 
                 mModifyMask |= LLFriendObserver::ONLINE;
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 59aa572..1de3690 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -53,6 +53,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
@@ -78,7 +79,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
@@ -98,6 +102,7 @@ private:
 
 LLChatBar::LLChatBar() 
 :       LLPanel(LLStringUtil::null, LLRect(), BORDER_NO),
+        mChannelControl(FALSE),
         mInputEditor(NULL),
         mGestureLabelTimer(),
         mLastSpecialChatChannel(0),
@@ -151,6 +156,8 @@ BOOL LLChatBar::postBuild()
                 mInputEditor->setEnableLineHistory(TRUE);
         }
 
+        toggleChannelControl();
+
         mIsBuilt = TRUE;
 
         return TRUE;
@@ -210,6 +217,7 @@ void LLChatBar::refresh()
 
         childSetValue("History", LLFloaterChat::instanceVisible(LLSD()));
 
+        childSetValue("channel_control",( 1.f * ((S32)(getChild<LLSpinCtrl>("channel_control")->get()))) );
         childSetEnabled("Say", mInputEditor->getText().size() > 0);
         childSetEnabled("Shout", mInputEditor->getText().size() > 0);
 
@@ -370,8 +378,11 @@ LLWString LLChatBar::stripChannelNumber(const LLWString &mesg, S32* channel)
         }
         else
         {
-                // This is normal chat.
-                *channel = 0;
+                if (!mChannelControl)
+                {
+                        // This is normal chat.
+                        *channel = 0;
+                }
                 return mesg;
         }
 }
@@ -387,7 +398,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 = mChannelControl ? (S32)(getChild<LLSpinCtrl>("channel_control")->get()) : 0;
+
                         stripChannelNumber(text, &channel);
                         
                         std::string utf8text = wstring_to_utf8str(text);
@@ -425,6 +437,31 @@ void LLChatBar::sendChat( EChatType type )
         }
 }
 
+void LLChatBar::toggleChannelControl()
+{
+        LLRect input_rect = mInputEditor->getRect();
+        S32 chan_width = getChild<LLSpinCtrl>("channel_control")->getRect().getWidth();
+        BOOL visible = gSavedSettings.getBOOL("ChatChannelSelect");
+        BOOL control = getChild<LLSpinCtrl>("channel_control")->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);
+        mChannelControl = visible;
+}
+
 
 //-----------------------------------------------------------------------
 // Static functions
@@ -482,7 +519,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();
         }
@@ -575,7 +615,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 = mChannelControl ? (S32)(getChild<LLSpinCtrl>("channel_control")->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);
@@ -586,6 +627,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("chatnormal")) )
+                        type = CHAT_TYPE_WHISPER;
+                else if ( (CHAT_TYPE_SHOUT == type) && (gRlvHandler.hasBehaviour("chatshout")) )
+                        type = CHAT_TYPE_NORMAL;
+                else if ( (CHAT_TYPE_WHISPER == type) && (gRlvHandler.hasBehaviour("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))
         {
@@ -621,8 +677,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("chatnormal")) )
+                                type = CHAT_TYPE_WHISPER;
+                        else if ( (CHAT_TYPE_SHOUT == type) && (gRlvHandler.hasBehaviour("chatshout")) )
+                                type = CHAT_TYPE_NORMAL;
+                        else if ( (CHAT_TYPE_WHISPER == type) && (gRlvHandler.hasBehaviour("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("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("sendchannel")) && (!gRlvHandler.hasBehaviour("sendchannel", llformat("%d", 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("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 72c797a..53ac233 100644
--- a/linden/indra/newview/llchatbar.h
+++ b/linden/indra/newview/llchatbar.h
@@ -93,6 +93,8 @@ public:
         static void startChat(const char* line);
         static void stopChat();
 
+        void toggleChannelControl();
+
 protected:
         void sendChat(EChatType type);
         void updateChat();
@@ -109,6 +111,9 @@ protected:
         LLComboBox*             mGestureCombo;
 
         LLChatBarGestureObserver* mObserver;
+
+private:
+        BOOL                            mChannelControl;
 };
 
 extern LLChatBar *gChatBar;
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index caf79eb..954a274 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -998,6 +998,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/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index ee7053d..b807b17 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -131,6 +131,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
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index eef0537..cbb31ab 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -92,6 +92,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();
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 37e9c54..57c5339 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -119,14 +119,22 @@ LLFloaterAbout::LLFloaterAbout()
           __DATE__, __TIME__);
 
         support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
-        support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &viewer_link_style);
+        support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
 
         std::string support;
         support.append("\n\n");
 
         // 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);
@@ -155,7 +163,7 @@ LLFloaterAbout::LLFloaterAbout()
                 support.append("\n");
 
                 support_widget->appendColoredText(support, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
-                support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), FALSE, FALSE, &server_link_style);
+                support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, server_link_style);
 
                 support = "\n\n";
         }
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index a8f3f91..b4d402a 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -98,6 +98,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]
         }
 }
 
@@ -710,6 +715,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();
 
@@ -719,6 +731,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 d636776..7403df2 100644
--- a/linden/indra/newview/llfloaterbeacons.cpp
+++ b/linden/indra/newview/llfloaterbeacons.cpp
@@ -37,6 +37,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)
 {
@@ -72,6 +75,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 8e9d489..1f51a21 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -56,10 +56,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
@@ -188,7 +189,7 @@ void LLFloaterChat::updateConsoleVisibility()
                                                         || (getHost() && getHost()->isMinimized() ));   // are we hosted in a minimized floater?
 }
 
-void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LLColor4& color)
+void add_timestamped_line(LLViewerTextEditor* edit, LLChat chat, const LLColor4& color)
 {
         std::string line = chat.mText;
         bool prepend_newline = true;
@@ -198,16 +199,25 @@ void add_timestamped_line(LLViewerTextEditor* edit, const LLChat &chat, const LL
                 prepend_newline = false;
         }
 
-        // If the msg is not from an agent (not yourself though),
+        // 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 &&
-                (line.length() > chat.mFromName.length() && line.find(chat.mFromName,0) == 0))
+// [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))
         {
                 std::string start_line = line.substr(0, chat.mFromName.length() + 1);
                 line = line.substr(chat.mFromName.length() + 1);
-                const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID);
-                edit->appendStyledText(start_line, false, prepend_newline, &sourceStyle);
+                const LLStyleSP &sourceStyle = LLStyleMap::instance().lookup(chat.mFromID,chat.mURL);
+                edit->appendStyledText(start_line, false, prepend_newline, sourceStyle);
                 prepend_newline = false;
         }
         edit->appendColoredText(line, false, prepend_newline, color);
@@ -223,9 +233,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);
@@ -356,6 +418,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)
@@ -386,7 +472,7 @@ void LLFloaterChat::addChat(const LLChat& chat,
                         size = INSTANT_MSG_SIZE;
                 }
                 // We display anything if it's not an IM. If it's an IM, check pref... 
-                if ( !from_instant_message || gSavedSettings.getBOOL("IMInChatHistory") )
+                if ( !from_instant_message || gSavedSettings.getBOOL("IMInChatConsole") )
                 {
                         gConsole->addLine(chat.mText, size, text_color);
                 }
@@ -513,7 +599,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 923fd9a..203a158 100644
--- a/linden/indra/newview/llfloaterchat.h
+++ b/linden/indra/newview/llfloaterchat.h
@@ -82,6 +82,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.h b/linden/indra/newview/llfloaterchatterbox.h
index 39e1025..04833ab 100644
--- a/linden/indra/newview/llfloaterchatterbox.h
+++ b/linden/indra/newview/llfloaterchatterbox.h
@@ -149,7 +149,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/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index e1d3c4a..2367b48 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -42,6 +42,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) :
@@ -145,7 +149,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);
                 }
         }
 }
@@ -163,7 +173,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);
         }
 }
@@ -223,6 +236,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 9707184..75c5782 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -813,6 +813,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);
 }
@@ -2779,3 +2785,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 5f2b970..6e26b93 100644
--- a/linden/indra/newview/llfloaterland.h
+++ b/linden/indra/newview/llfloaterland.h
@@ -82,6 +82,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 6115404..3be891e 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -42,14 +42,40 @@
 #include "llresizebar.h"
 #include "lluictrlfactory.h"
 
+// radar
+#include "llfirstuse.h"
+#include "llfloateravatarinfo.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)
 {
         LLCallbackMap::map_t factory_map;
         factory_map["mini_mapview"] = LLCallbackMap(createPanelMiniMap, this);
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_mini_map.xml", &factory_map, FALSE);
+
+        mSelectedAvatar.setNull();
 }
 
 
@@ -67,6 +93,30 @@ BOOL LLFloaterMap::postBuild()
         sendChildToBack(getDragHandle());
         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;
 }
 
@@ -122,3 +172,597 @@ 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
+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();
+
+        LLVector3d current_pos = gAgent.getPositionGlobal();
+
+        // find what avatars you can see
+        std::vector<LLUUID> avatar_ids;
+        std::vector<LLVector3d> positions;
+        LLWorld::getInstance()->getAvatars(&avatar_ids, &positions, current_pos, gSavedSettings.getF32("NearMeRange"));
+
+        LLSD element;
+
+        mRadarList->deleteAllItems();
+
+        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())
+                {
+                        std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : "";
+                        element["id"] = avatar_ids[i];
+                        element["columns"][0]["column"] = "avatar_name";
+                        element["columns"][0]["type"] = "text";
+                        element["columns"][0]["value"] = fullname + " " + mute_text;
+                        element["columns"][1]["column"] = "avatar_distance";
+                        element["columns"][1]["type"] = "text";
+
+                        LLVector3d temp = positions[i] - current_pos;
+                        F32 distance = (F32)temp.magVec();
+                        char dist[32];
+                        snprintf(dist, sizeof(dist), "%.1f", distance);
+                        element["columns"][1]["value"] = strcat(dist,"m");
+
+                        mRadarList->addElement(element, ADD_BOTTOM);
+                }
+        }
+
+        mRadarList->sortItems();
+        mRadarList->setScrollPos(scroll_pos);
+        if (mSelectedAvatar.notNull())
+        {
+                mRadarList->selectByID(mSelectedAvatar);
+        }
+
+        // set count
+        std::stringstream avatar_count; 
+        avatar_count.str("");
+        if (avatar_ids.empty())
+        {
+                mRadarList->addCommentText(getString("no_one_near"), ADD_TOP);
+                avatar_count << "0";
+        }
+        else
+        {
+                avatar_count << (int)avatar_ids.size();
+        }
+        childSetText("lblAvatarCount", avatar_count.str());
+
+        toggleButtons();
+
+        //llinfos << "mSelectedAvatar: " << mSelectedAvatar.asString() << llendl;
+}
+
+void LLFloaterMap::toggleButtons()
+{
+        BOOL enable = FALSE;
+        BOOL enable_unmute = FALSE;
+        BOOL enable_track = FALSE;
+        BOOL enable_estate = 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 = getKickable(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("unmute_btn", enable_unmute);
+        childSetEnabled("ar_btn", enable);
+        childSetEnabled("estate_eject_btn", enable_estate);
+}
+
+BOOL LLFloaterMap::getKickable(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();
+                                        
+                                        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 dd1cba8..81e4159 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -33,6 +33,7 @@
 #define LL_LLFLOATERMAP_H
 
 #include "llfloater.h"
+#include "llscrolllistctrl.h"
 
 class LLNetMap;
 
@@ -46,16 +47,62 @@ public:
 
         static void* createPanelMiniMap(void* data);
 
+        static void updateRadar();
+        static LLUUID getSelected();
+
         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;
+        bool                                                    mUpdate;
+        
+        static void onList(LLUICtrl* ctrl, void* user_data);
+        static void onRangeChange(LLFocusableElement* focus, void* user_data);
+        BOOL visibleItemsSelected() const;
+        BOOL getKickable(const LLUUID &agent_id);
+        void toggleButtons();
+        void populateRadar();
+
+        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/llfloaterobjectiminfo.cpp b/linden/indra/newview/llfloaterobjectiminfo.cpp
new file mode 100644
index 0000000..6cbc4e2
--- /dev/null
+++ b/linden/indra/newview/llfloaterobjectiminfo.cpp
@@ -0,0 +1,204 @@
+/**
+ * @file llfloaterobjectiminfo.cpp
+ * @brief A floater with information about an object that sent an IM.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2008, 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://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 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 "llviewerprecompiledheaders.h"
+
+#include "llfloaterobjectiminfo.h"
+
+#include "llagentdata.h"
+#include "llcachename.h"
+#include "llcommandhandler.h"
+#include "llfloater.h"
+#include "llfloateravatarinfo.h"
+#include "llfloatergroupinfo.h"
+#include "llfloatermute.h"
+#include "llmutelist.h"
+#include "llsdutil.h"
+#include "lluictrlfactory.h"
+#include "llurldispatcher.h"
+#include "llviewercontrol.h"
+
+////////////////////////////////////////////////////////////////////////////
+// LLFloaterObjectIMInfo
+class LLFloaterObjectIMInfo : public LLFloater, public LLFloaterSingleton<LLFloaterObjectIMInfo>
+{
+public:
+        LLFloaterObjectIMInfo(const LLSD& sd);
+        virtual ~LLFloaterObjectIMInfo() { };
+
+        BOOL postBuild(void);
+
+        void update(const LLUUID& id, const std::string& name, const std::string& slurl, const LLUUID& owner, bool owner_is_group);
+
+        // UI Handlers
+        static void onClickMap(void* data);
+        static void onClickOwner(void* data);
+        static void onClickMute(void* data);
+
+        static void nameCallback(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data);
+
+private:
+        LLUUID mObjectID;
+        std::string mObjectName;
+        std::string mSlurl;
+        LLUUID mOwnerID;
+        std::string mOwnerName;
+        bool mOwnerIsGroup;
+};
+
+LLFloaterObjectIMInfo::LLFloaterObjectIMInfo(const LLSD& seed)
+: mObjectID(), mObjectName(), mSlurl(), mOwnerID(), mOwnerName(), mOwnerIsGroup(false)
+{
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_object_im_info.xml");
+
+        if (getRect().mLeft == 0
+                && getRect().mBottom == 0)
+        {
+                center();
+        }
+}
+
+BOOL LLFloaterObjectIMInfo::postBuild(void)
+{
+        childSetAction("Mute",onClickMute,this);
+        childSetActionTextbox("OwnerName",onClickOwner, this);
+        childSetActionTextbox("Slurl",onClickMap, this);
+
+        return true;
+}
+
+void LLFloaterObjectIMInfo::update(const LLUUID& object_id, const std::string& name, const std::string& slurl, const LLUUID& owner_id, bool owner_is_group)
+{
+        // When talking to an old region we won't have a slurl.
+        // The object id isn't really the object id either but we don't use it so who cares.
+        bool have_slurl = !slurl.empty();
+        childSetVisible("Unknown_Slurl",!have_slurl);
+        childSetVisible("Slurl",have_slurl);
+
+        childSetText("ObjectName",name);
+        childSetText("Slurl",slurl);
+        childSetText("OwnerName",std::string(""));
+
+        bool my_object = (owner_id == gAgentID);
+        childSetEnabled("Mute",!my_object);
+
+        mObjectID = object_id;
+        mObjectName = name;
+        mSlurl = slurl;
+        mOwnerID = owner_id;
+        mOwnerIsGroup = owner_is_group;
+
+        if (gCacheName) gCacheName->get(owner_id,owner_is_group,nameCallback,this);
+}
+
+//static
+void LLFloaterObjectIMInfo::onClickMap(void* data)
+{
+        LLFloaterObjectIMInfo* self = (LLFloaterObjectIMInfo*)data;
+
+        std::ostringstream link;
+        link << "secondlife://" << self->mSlurl;
+        LLURLDispatcher::dispatch(link.str(),false);
+}
+
+//static
+void LLFloaterObjectIMInfo::onClickOwner(void* data)
+{
+        LLFloaterObjectIMInfo* self = (LLFloaterObjectIMInfo*)data;
+        if (self->mOwnerIsGroup)
+        {
+                LLFloaterGroupInfo::showFromUUID(self->mOwnerID);
+        }
+        else
+        {
+                LLFloaterAvatarInfo::showFromObject(self->mOwnerID);
+        }
+}
+
+//static
+void LLFloaterObjectIMInfo::onClickMute(void* data)
+{
+        LLFloaterObjectIMInfo* self = (LLFloaterObjectIMInfo*)data;
+
+        LLMute::EType mute_type = (self->mOwnerIsGroup) ? LLMute::GROUP : LLMute::AGENT;
+        LLMute mute(self->mOwnerID, self->mOwnerName, mute_type);
+        LLMuteList::getInstance()->add(mute);
+        LLFloaterMute::showInstance();
+        self->close();
+}
+
+//static
+void LLFloaterObjectIMInfo::nameCallback(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
+{
+        LLFloaterObjectIMInfo* self = (LLFloaterObjectIMInfo*)data;
+        self->mOwnerName = first;
+        if (!last.empty())
+        {
+                self->mOwnerName += " " + last;
+        }
+
+        self->childSetText("OwnerName",self->mOwnerName);
+}
+
+////////////////////////////////////////////////////////////////////////////
+// LLObjectIMInfo
+void LLObjectIMInfo::show(const LLUUID &object_id, const std::string &name, const std::string &location, const LLUUID &owner_id, bool owner_is_group)
+{
+        LLFloaterObjectIMInfo* im_info_floater = LLFloaterObjectIMInfo::showInstance();
+        im_info_floater->update(object_id,name,location,owner_id,owner_is_group);
+}
+
+////////////////////////////////////////////////////////////////////////////
+// LLObjectIMInfoHandler
+class LLObjectIMInfoHandler : public LLCommandHandler
+{
+public:
+        LLObjectIMInfoHandler() : LLCommandHandler("objectim", false) { }
+
+        bool handle(const LLSD& tokens, const LLSD& query_map);
+};
+
+// Creating the object registers with the dispatcher.
+LLObjectIMInfoHandler gObjectIMHandler;
+
+// ex. secondlife:///app/objectim/9426adfc-9c17-8765-5f09-fdf19957d003?owner=a112d245-9095-4e9c-ace4-ffa31717f934&groupowned=true&slurl=ahern/123/123/123&name=Object
+bool LLObjectIMInfoHandler::handle(const LLSD &tokens, const LLSD &query_map)
+{
+        LLUUID task_id = tokens[0].asUUID();
+        std::string name = query_map["name"].asString();
+        std::string slurl = query_map["slurl"].asString();
+        LLUUID owner = query_map["owner"].asUUID();
+        bool group_owned = query_map.has("groupowned");
+
+        LLObjectIMInfo::show(task_id,name,slurl,owner,group_owned);
+
+        return true;
+}
diff --git a/linden/indra/newview/llfloaterobjectiminfo.h b/linden/indra/newview/llfloaterobjectiminfo.h
new file mode 100644
index 0000000..0564c3e
--- /dev/null
+++ b/linden/indra/newview/llfloaterobjectiminfo.h
@@ -0,0 +1,45 @@
+/**
+ * @file llfloaterobjectiminfo.h
+ * @brief Shows a dialog with information about an object.
+ *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ *
+ * 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
+ * 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://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATEROBJECTIMINFO_H
+#define LL_LLFLOATEROBJECTIMINFO_H
+
+namespace LLObjectIMInfo
+{
+        // Show an LLFloaterObjectIMInfo for this object.
+        static void show(const LLUUID& object_id,
+                                                const std::string& name,
+                                                const std::string& location,
+                                                const LLUUID& owner_id,
+                                                bool owner_is_group);
+};
+
+#endif // LL_LLFLOATERURLDISPLAY_H
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index a83b0c9..fd4f9c6 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -207,7 +207,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 eddd56a..0af8ec3 100644
--- a/linden/indra/newview/llfloaterproperties.cpp
+++ b/linden/indra/newview/llfloaterproperties.cpp
@@ -354,8 +354,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);
@@ -602,7 +611,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 6e0dba1..40907eb 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -3192,3 +3192,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 41a94ce..7b675de 100644
--- a/linden/indra/newview/llfloaterregioninfo.h
+++ b/linden/indra/newview/llfloaterregioninfo.h
@@ -66,6 +66,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 7e9632d..0d3b101 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -64,7 +64,6 @@
 #include "llviewerregion.h"
 #include "llcombobox.h"
 #include "lltooldraganddrop.h"
-#include "llfloatermap.h"
 #include "lluiconstants.h"
 #include "lluploaddialog.h"
 #include "llcallingcard.h"
@@ -133,6 +132,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 +316,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 +345,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 +623,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 e440c4a..58f37c5 100644
--- a/linden/indra/newview/llfloatersettingsdebug.cpp
+++ b/linden/indra/newview/llfloatersettingsdebug.cpp
@@ -39,6 +39,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"))
@@ -239,6 +244,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/llfloatertelehub.cpp b/linden/indra/newview/llfloatertelehub.cpp
index 943bc36..062306b 100644
--- a/linden/indra/newview/llfloatertelehub.cpp
+++ b/linden/indra/newview/llfloatertelehub.cpp
@@ -68,7 +68,6 @@ void LLFloaterTelehub::show()
         // Find tools floater, glue to bottom
         if (gFloaterTools)
         {
-                gFloaterTools->showMore(FALSE);
                 LLRect tools_rect = gFloaterTools->getRect();
                 S32 our_width = sInstance->getRect().getWidth();
                 S32 our_height = sInstance->getRect().getHeight();
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index e723ba1..d2a8040 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -46,6 +46,7 @@
 #include "llfloateropenobject.h"
 #include "llfocusmgr.h"
 #include "llmenugl.h"
+#include "llnotify.h"
 #include "llpanelcontents.h"
 #include "llpanelface.h"
 #include "llpanelland.h"
@@ -53,6 +54,7 @@
 #include "llpanelobject.h"
 #include "llpanelvolume.h"
 #include "llpanelpermissions.h"
+#include "llresmgr.h"
 #include "llselectmgr.h"
 #include "llslider.h"
 #include "llstatusbar.h"
@@ -77,6 +79,8 @@
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
 #include "llviewerjoystick.h"
+#include "llvograss.h"
+#include "llvotree.h"
 #include "lluictrlfactory.h"
 
 // Globals
@@ -233,6 +237,11 @@ BOOL	LLFloaterTools::postBuild()
         mTextGridMode = getChild<LLTextBox>("text ruler mode");
         mComboGridMode = getChild<LLComboBox>("combobox grid mode");
         childSetCommitCallback("combobox grid mode",commit_grid_mode, this);
+        mBtnLink = getChild<LLButton>("link_btn");
+        childSetAction("link_btn",onClickLink, this);
+        mBtnUnlink = getChild<LLButton>("unlink_btn");
+        childSetAction("unlink_btn",onClickUnlink, this);
+
         //
         // Create Buttons
         //
@@ -276,10 +285,14 @@ BOOL	LLFloaterTools::postBuild()
                 {
                         found->setClickedCallback(setObjectType,toolData[t]);
                         mButtons.push_back( found );
-                }else{
+                }
+                else
+                {
                         llwarns << "Tool button not found! DOA Pending." << llendl;
                 }
         }
+        mComboTreesGrass = getChild<LLComboBox>("trees_grass");
+        childSetCommitCallback("trees_grass", onSelectTreesGrass, (void*)0);
         mCheckCopySelection = getChild<LLCheckBoxCtrl>("checkbox copy selection");
         childSetValue("checkbox copy selection",(BOOL)gSavedSettings.getBOOL("CreateToolCopySelection"));
         mCheckSticky = getChild<LLCheckBoxCtrl>("checkbox sticky");
@@ -309,7 +322,7 @@ BOOL	LLFloaterTools::postBuild()
 
         mSliderDozerSize = getChild<LLSlider>("slider brush size");
         childSetCommitCallback("slider brush size", commit_slider_dozer_size,  (void*)0);
-        childSetValue( "slider brush size", gSavedSettings.getS32("LandBrushSize"));
+        childSetValue( "slider brush size", gSavedSettings.getF32("LandBrushSize"));
         
 
         mSliderDozerForce = getChild<LLSlider>("slider force");
@@ -317,14 +330,10 @@ BOOL	LLFloaterTools::postBuild()
         // the setting stores the actual force multiplier, but the slider is logarithmic, so we convert here
         childSetValue( "slider force", log10(gSavedSettings.getF32("LandBrushForce")));
 
-        childSetAction("button more", click_show_more, this);
-        childSetAction("button less", click_show_more, this);
         mTab = getChild<LLTabContainer>("Object Info Tabs");
         if(mTab)
         {
-                mTab->setVisible( gSavedSettings.getBOOL("ToolboxShowMore") );
                 mTab->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
-                mTab->setVisible( gSavedSettings.getBOOL("ToolboxShowMore") );
                 mTab->setBorderVisible(FALSE);
                 mTab->selectFirstTab();
         }
@@ -381,6 +390,10 @@ LLFloaterTools::LLFloaterTools()
         mBtnDuplicate(NULL),
         mBtnDuplicateInPlace(NULL),
 
+        mBtnLink(NULL),
+        mBtnUnlink(NULL),
+
+        mComboTreesGrass(NULL),
         mCheckSticky(NULL),
         mCheckCopySelection(NULL),
         mCheckCopyCenters(NULL),
@@ -420,19 +433,6 @@ LLFloaterTools::LLFloaterTools()
         factory_map["land info panel"] = LLCallbackMap(createPanelLandInfo, this);//LLPanelLandInfo
 
         LLUICtrlFactory::getInstance()->buildFloater(this,"floater_tools.xml",&factory_map,FALSE);
-
-        mLargeHeight = getRect().getHeight();
-        mSmallHeight = mLargeHeight;
-        if (mTab) mSmallHeight -= mTab->getRect().getHeight();
-        
-        // force a toggle initially. seems to be needed to correctly initialize 
-        // both "more" and "less" cases. it also seems to be important to begin
-        // with the user's preference first so that it's initial position will
-        // be correct (SL-51192) -MG
-        BOOL show_more = gSavedSettings.getBOOL("ToolboxShowMore"); // get user's preference
-        gSavedSettings.setBOOL("ToolboxShowMore", show_more); // sets up forced toggle below
-        showMore( !show_more ); // does the toggle
-        showMore(  show_more ); // reset the real user's preference
 }
 
 LLFloaterTools::~LLFloaterTools()
@@ -476,6 +476,16 @@ void LLFloaterTools::refresh()
         mTab->enableTabButton(idx_face, all_volume);
         mTab->enableTabButton(idx_contents, all_volume);
 
+        // Refresh object and prim count labels
+        LLLocale locale(LLLocale::USER_LOCALE);
+        std::string obj_count_string;
+        LLResMgr::getInstance()->getIntegerString(obj_count_string, LLSelectMgr::getInstance()->getSelection()->getRootObjectCount());
+        childSetTextArg("obj_count",  "[COUNT]", obj_count_string);     
+        std::string prim_count_string;
+        LLResMgr::getInstance()->getIntegerString(prim_count_string, LLSelectMgr::getInstance()->getSelection()->getObjectCount());
+        childSetTextArg("prim_count", "[COUNT]", prim_count_string);
+
+        // Refresh child tabs
         mPanelPermissions->refresh();
         mPanelObject->refresh();
         mPanelVolume->refresh();
@@ -654,11 +664,52 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
         if (mCheckStretchUniform) mCheckStretchUniform->setVisible( edit_visible );
         if (mCheckStretchTexture) mCheckStretchTexture->setVisible( edit_visible );
 
+        if (mBtnLink) mBtnLink->setVisible( edit_visible );
+        if (mBtnUnlink) mBtnUnlink->setVisible( edit_visible );
+
+        // Check to see if we can link things
+        bool can_link = false;
+        if (!gSavedSettings.getBOOL("EditLinkedParts"))
+        {
+                if(LLSelectMgr::getInstance()->selectGetAllRootsValid() && LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() >= 2)
+                {
+                        struct f : public LLSelectedObjectFunctor
+                        {
+                                virtual bool apply(LLViewerObject* object)
+                                {
+                                        return object->permModify();
+                                }
+                        }
+                        func;
+                        const bool firstonly = true;
+                        can_link = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
+                }
+        }
+        mBtnLink->setEnabled(can_link);
+
+        // 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 (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 0 &&
+                        LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 
+                        LLSelectMgr::getInstance()->getSelection()->getObjectCount())
+                {
+                        can_unlink = true;
+                }
+        }
+        mBtnUnlink->setEnabled(can_unlink);
+
+
         // Create buttons
         BOOL create_visible = (tool == LLToolCompCreate::getInstance());
 
         mBtnCreate      ->setToggleState(       tool == LLToolCompCreate::getInstance() );
 
+        updateTreeGrassCombo(create_visible);
+
         if (mCheckCopySelection
                 && mCheckCopySelection->get())
         {
@@ -743,8 +794,8 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
         if (mSliderDozerSize)
         {
                 mSliderDozerSize        ->setVisible( land_visible );
-                childSetVisible("Brush:", land_visible);
-                childSetVisible("Brush Size:", land_visible);
+                childSetVisible("Bulldozer:", land_visible);
+                childSetVisible("Dozer Size:", land_visible);
         }
         if (mCheckShowOwners)
         {
@@ -756,13 +807,10 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                 childSetVisible("Strength:", land_visible);
         }
 
-        //
-        // More panel visibility
-        //
-        BOOL show_more = gSavedSettings.getBOOL("ToolboxShowMore");
-
-        mTab->setVisible(show_more && tool != LLToolBrushLand::getInstance() && tool != LLToolSelectLand::getInstance());
-        mPanelLandInfo->setVisible(show_more && (tool == LLToolBrushLand::getInstance() || tool == LLToolSelectLand::getInstance()));
+        childSetVisible("obj_count", !land_visible);
+        childSetVisible("prim_count", !land_visible);
+        mTab->setVisible(!land_visible);
+        mPanelLandInfo->setVisible(land_visible);
 }
 
 
@@ -817,46 +865,12 @@ void LLFloaterTools::onClose(bool app_quitting)
         // gMenuBarView->arrange();
 }
 
-void LLFloaterTools::showMore(BOOL show_more)
-{
-        BOOL showing_more = gSavedSettings.getBOOL("ToolboxShowMore");
-        if (show_more == showing_more)
-        {
-                return;
-        }
-        
-        gSavedSettings.setBOOL("ToolboxShowMore", show_more);
-
-        // Visibility updated next frame - JC
-        // mTab->setVisible(show_more);
-
-        if (show_more)
-        {
-                reshape( getRect().getWidth(), mLargeHeight, TRUE);
-                translate( 0, mSmallHeight - mLargeHeight );
-        }
-        else
-        {
-                reshape( getRect().getWidth(), mSmallHeight, TRUE);
-                translate( 0, mLargeHeight - mSmallHeight );
-        }
-        childSetVisible("button less",  show_more);
-        childSetVisible("button more", !show_more);
-}
-
 void LLFloaterTools::showPanel(EInfoPanel panel)
 {
         llassert(panel >= 0 && panel < PANEL_COUNT);
         mTab->selectTabByName(PANEL_NAMES[panel]);
 }
 
-void click_show_more(void *userdata)
-{
-        LLFloaterTools *f = (LLFloaterTools *)userdata;
-        BOOL show_more = !gSavedSettings.getBOOL("ToolboxShowMore");
-        f->showMore( show_more );
-}
-
 void click_popup_info(void*)
 {
 //      gBuildView->setPropertiesPanelOpen(TRUE);
@@ -941,8 +955,8 @@ void click_popup_dozer_mode(LLUICtrl *, void *user)
 
 void commit_slider_dozer_size(LLUICtrl *ctrl, void*)
 {
-        S32 size = (S32)ctrl->getValue().asInteger();
-        gSavedSettings.setS32("LandBrushSize", size);
+        F32 size = (F32)ctrl->getValue().asReal();
+        gSavedSettings.setF32("LandBrushSize", size);
 }
 
 void commit_slider_dozer_force(LLUICtrl *ctrl, void*)
@@ -1004,6 +1018,7 @@ void LLFloaterTools::setObjectType( void* data )
         LLPCode pcode = *(LLPCode*) data;
         LLToolPlacer::setObjectType( pcode );
         gSavedSettings.setBOOL("CreateToolCopySelection", FALSE);
+        gFloaterTools->updateTreeGrassCombo(true);
         gFocusMgr.setMouseCapture(NULL);
 }
 
@@ -1026,3 +1041,127 @@ void LLFloaterTools::onFocusReceived()
         LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
         LLFloater::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;
+                if (pcode == LLToolPlacerPanel::sTree) 
+                {
+                        tree_grass_label->setVisible(visible);
+                        LLButton* button = getChild<LLButton>("ToolTree");
+                        tree_grass_label->setText(button->getToolTip());
+
+                        selected = gSavedSettings.getString("LastTree");
+                        it = LLVOTree::sSpeciesNames.begin();
+                        end = LLVOTree::sSpeciesNames.end();
+                } 
+                else if (pcode == LLToolPlacerPanel::sGrass) 
+                {
+                        tree_grass_label->setVisible(visible);
+                        LLButton* button = getChild<LLButton>("ToolGrass");
+                        tree_grass_label->setText(button->getToolTip());
+
+                        selected = gSavedSettings.getString("LastGrass");
+                        it = LLVOGrass::sSpeciesNames.begin();
+                        end = LLVOGrass::sSpeciesNames.end();
+                } 
+                else 
+                {
+                        mComboTreesGrass->removeall();
+                        mComboTreesGrass->setLabel(LLStringExplicit(""));  // LLComboBox::removeall() does not clear the label
+                        mComboTreesGrass->setEnabled(false);
+                        mComboTreesGrass->setVisible(false);
+                        tree_grass_label->setVisible(false);
+                        return;
+                }
+
+                mComboTreesGrass->removeall();
+                mComboTreesGrass->add("Random");
+
+                int select = 0, i = 0;
+
+                while (it != end) 
+                {
+                        const std::string &species = it->first;
+                        mComboTreesGrass->add(species);  ++i;
+                        if (species == selected) select = i;
+                        ++it;
+                }
+                // if saved species not found, default to "Random"
+                mComboTreesGrass->selectNthItem(select);
+                mComboTreesGrass->setEnabled(true);
+        }
+        
+        mComboTreesGrass->setVisible(visible);
+        tree_grass_label->setVisible(visible);
+}
+
+// static
+void LLFloaterTools::onSelectTreesGrass(LLUICtrl*, void*)
+{
+        const std::string &selected = gFloaterTools->mComboTreesGrass->getValue();
+        LLPCode pcode = LLToolPlacer::getObjectType();
+        if (pcode == LLToolPlacerPanel::sTree) 
+        {
+                gSavedSettings.setString("LastTree", selected);
+        } 
+        else if (pcode == LLToolPlacerPanel::sGrass) 
+        {
+                gSavedSettings.setString("LastGrass", selected);
+        }  
+}
+
+// static
+void LLFloaterTools::onClickLink(void* data)
+{
+        if(!LLSelectMgr::getInstance()->selectGetAllRootsValid())
+        {
+                LLNotifyBox::showXml("UnableToLinkWhileDownloading");
+                return;
+        }
+ 
+        S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
+        if (object_count > MAX_CHILDREN_PER_TASK + 1)
+        {
+                LLStringUtil::format_map_t args;
+                args["[COUNT]"] = llformat("%d", object_count);
+                int max = MAX_CHILDREN_PER_TASK+1;
+                args["[MAX]"] = llformat("%d", max);
+                gViewerWindow->alertXml("UnableToLinkObjects", args);
+                return;
+        }
+ 
+        if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() < 2)
+        {
+                gViewerWindow->alertXml("CannotLinkIncompleteSet");
+                return;
+        }
+        if(!LLSelectMgr::getInstance()->selectGetRootsModify())
+        {
+                gViewerWindow->alertXml("CannotLinkModify");
+                return;
+        }
+        LLUUID owner_id;
+        std::string owner_name;
+        if(!LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name))
+        {
+          // we don't actually care if you're the owner, but novices are
+          // the most likely to be stumped by this one, so offer the
+          // easiest and most likely solution.
+          gViewerWindow->alertXml("CannotLinkDifferentOwners");
+          return;
+        }
+        LLSelectMgr::getInstance()->sendLink();
+        return;
+}
+
+// static
+void LLFloaterTools::onClickUnlink(void* data)
+{
+        LLSelectMgr::getInstance()->sendDelink();
+}
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index 9d555d1..1b13b9f 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -95,7 +95,6 @@ public:
         /*virtual*/  void draw();
 
         void dirty();
-        void showMore(BOOL show_more);
         void showPanel(EInfoPanel panel);
 
         void setStatusText(const std::string& text);
@@ -109,6 +108,9 @@ private:
 
         static void onClickGridOptions(void* data);
 
+        static void onClickLink(void* data);
+        static void onClickUnlink(void* data);
+
 public:
 
         LLButton                *mBtnFocus;
@@ -152,7 +154,11 @@ public:
         LLButton        *mBtnDuplicate;
         LLButton        *mBtnDuplicateInPlace;
 
+        LLButton        *mBtnLink;
+        LLButton        *mBtnUnlink;
+
         // Create buttons
+        LLComboBox              *mComboTreesGrass;
         LLCheckBoxCtrl  *mCheckSticky;
         LLCheckBoxCtrl  *mCheckCopySelection;
         LLCheckBoxCtrl  *mCheckCopyCenters;
@@ -190,10 +196,11 @@ public:
 
 private:
         BOOL                                    mDirty;
-        S32                                             mSmallHeight;
-        S32                                             mLargeHeight;
 
         std::map<std::string, std::string> mStatusText;
+
+        void updateTreeGrassCombo(bool visible);
+        static void onSelectTreesGrass(LLUICtrl*, void*);
 };
 
 extern LLFloaterTools *gFloaterTools;
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 37cd4ef..9936f3b 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -60,6 +60,7 @@
 
 #undef max
 
+
 LLFloaterWindLight* LLFloaterWindLight::sWindLight = NULL;
 
 std::set<std::string> LLFloaterWindLight::sDefaultPresets;
@@ -227,6 +228,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)
@@ -317,6 +322,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);
@@ -992,3 +1006,51 @@ 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);
+}
diff --git a/linden/indra/newview/llfloaterwindlight.h b/linden/indra/newview/llfloaterwindlight.h
index 3e5556b..70e76c5 100644
--- a/linden/indra/newview/llfloaterwindlight.h
+++ b/linden/indra/newview/llfloaterwindlight.h
@@ -136,6 +136,9 @@ private:
         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 bc61d8a..a31dde5 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -280,6 +280,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;
@@ -641,7 +648,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]));
@@ -695,6 +705,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]
                         }
                 }
 
@@ -737,6 +755,14 @@ 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]
         }
 }
 
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index 70c4ead..5407f06 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -281,7 +281,28 @@ 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 name search
                 mLabel = mListener->getDisplayName();
+
+                //Build label for combined search - RK
+                mLabelAll = mLabel + " " + mLabelCreator;
+
                 setIcon(mListener->getIcon());
                 time_t creation_date = mListener->getCreationDate();
                 if (mCreationDate != creation_date)
@@ -299,12 +320,26 @@ void LLFolderViewItem::refresh()
         refreshFromListener();
         
         std::string searchable_label(mLabel);
+        std::string searchable_label_creator(mLabelCreator);
+        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_all.append(mLabelSuffix);
+
+        //all labels need to be uppercase.
         LLStringUtil::toUpper(searchable_label);
+        LLStringUtil::toUpper(searchable_label_creator);
+        LLStringUtil::toUpper(searchable_label_all);
 
-        if (mSearchableLabel.compare(searchable_label))
+        if (mSearchableLabel.compare(searchable_label) || 
+                mSearchableLabelCreator.compare(searchable_label_creator))
         {
                 mSearchableLabel.assign(searchable_label);
+                mSearchableLabelCreator.assign(searchable_label_creator);
+                mSearchableLabelAll.assign(searchable_label_all);
+
                 dirtyFilter();
                 // some part of label has changed, so overall width has potentially changed
                 if (mParentFolder)
@@ -588,7 +623,13 @@ void LLFolderViewItem::rename(const std::string& new_name)
 
 const std::string& LLFolderViewItem::getSearchableLabel() const
 {
-        return mSearchableLabel;
+        U32 search_type = gSavedSettings.getU32("InventorySearchType");
+        if(search_type == 4)
+                return mSearchableLabelAll;
+        else if(search_type == 1)
+                return mSearchableLabelCreator;
+        else
+                return mSearchableLabel;
 }
 
 const std::string& LLFolderViewItem::getName( void ) const
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index 3c350d4..25b4362 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -338,6 +338,11 @@ protected:
 
         std::string                                     mLabel;
         std::string                                     mSearchableLabel;
+        std::string                                     mLabelAll;
+        std::string                                     mSearchableLabelAll;
+        std::string                                     mLabelCreator;
+        std::string                                     mSearchableLabelCreator;
+
         std::string                                     mType;
         S32                                                     mLabelWidth;
         U32                                                     mCreationDate;
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index 2b51948..296cdaa 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -166,6 +166,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;
@@ -230,6 +237,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/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index 37897eb..2f8e838 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -220,8 +220,8 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
         static const LLStyleSP headerstyle(new LLStyle(true,LLColor4::black,"SansSerifBig"));
         static const LLStyleSP datestyle(new LLStyle(true,LLColor4::black,"serif"));
 
-        text->appendStyledText(subject,false,false,&headerstyle);
-        text->appendStyledText(time_buf,false,false,&datestyle);
+        text->appendStyledText(subject,false,false,headerstyle);
+        text->appendStyledText(time_buf,false,false,datestyle);
         // Sadly, our LLTextEditor can't handle both styled and unstyled text
         // at the same time.  Hence this space must be styled. JC
         text->appendColoredText(std::string(" "),false,false,LLColor4::grey4);
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 8d033b2..e40ae10 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -244,14 +244,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
                         {
@@ -307,6 +318,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
@@ -468,7 +486,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);
 
@@ -497,7 +518,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 32323dc..ac48c6b 100644
--- a/linden/indra/newview/llhudtext.cpp
+++ b/linden/indra/newview/llhudtext.cpp
@@ -565,6 +565,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));
 }
 
@@ -1147,3 +1171,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 6e29d9d..c68a975 100644
--- a/linden/indra/newview/llhudtext.h
+++ b/linden/indra/newview/llhudtext.h
@@ -130,6 +130,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);
 
@@ -175,6 +180,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 f30ae8c..014c050 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1543,8 +1543,8 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4
                 else
                 {
                         // Convert the name to a hotlink and add to message.
-                        const LLStyleSP &source_style = LLStyleMap::instance().lookup(source);
-                        mHistoryEditor->appendStyledText(name,false,prepend_newline,&source_style);
+                        const LLStyleSP &source_style = LLStyleMap::instance().lookupAgent(source);
+                        mHistoryEditor->appendStyledText(name,false,prepend_newline,source_style);
                 }
                 prepend_newline = false;
         }
@@ -2009,6 +2009,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/llimview.cpp b/linden/indra/newview/llimview.cpp
index 1072b21..20de43e 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -1550,6 +1550,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 0bf3ab2..b598c83 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -85,6 +85,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)
@@ -115,6 +118,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;
 
@@ -464,6 +473,40 @@ 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.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.SearchByAll")->setValue(FALSE);
+                }
+                else if(search_type == "all")
+                {
+                        gSavedSettings.setU32("InventorySearchType", 4);
+
+                        mPtr->getControl("Inventory.SearchByName")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByCreator")->setValue(FALSE);
+                        mPtr->getControl("Inventory.SearchByAll")->setValue(TRUE);
+                }
+        return true;
+        }
+};
+
 class LLSetSortBy : public inventory_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -711,6 +754,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 697b30b..19a5ade 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -111,6 +111,8 @@ void remove_inventory_category_from_avatar(LLInventoryCategory* category);
 void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata);
 void move_task_inventory_callback(S32 option, void* user_data);
 void confirm_replace_attachment_rez(S32 option, void* user_data);
+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] =
 {
@@ -1921,6 +1923,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.
@@ -2934,6 +2942,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("viewnote")) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         // See if we can bring an existing preview to the front
         if(!LLPreview::show(inv_item->getUUID(), take_focus))
         {
@@ -3259,7 +3274,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())
                 {
@@ -3278,6 +3300,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);
@@ -3304,10 +3335,19 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model
 
 void LLObjectBridge::openItem()
 {
-        /* Disabled -- this preview isn't useful. JC */
-        // CP: actually, this code is required - made changes to match LLAnimationBridge::openItem() idiom
-        // The properties preview is useful, converting to show object properties. - DaveP
-        LLShowProps::showProperties(mUUID);
+        LLVOAvatar* avatar = gAgent.getAvatarObject();
+        if (!avatar)
+        {
+                return;
+        }
+        if (avatar->isWearingAttachment(mUUID))
+        {
+                performAction(NULL, NULL, "detach");
+        }
+        else
+        {
+                performAction(NULL, NULL, "attach");
+        }
 }
 
 LLFontGL::StyleFlags LLObjectBridge::getLabelStyle() const
@@ -3358,11 +3398,24 @@ void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attach
         rez_action->mAttachPt = attach_pt;
         if (attachment && attachment->getObject())
         {
-                gViewerWindow->alertXml("ReplaceAttachment", confirm_replace_attachment_rez, (void*)rez_action);
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-06 (RLVa-1.0.0c)
+                if ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.isDetachable(attach_pt)) )
+                        gViewerWindow->alertXml("ReplaceAttachment", confirm_replace_attachment_rez, (void*)rez_action);
+                else
+                        delete rez_action;
+// [/RLVa]
+//              gViewerWindow->alertXml("ReplaceAttachment", confirm_replace_attachment_rez, (void*)rez_action);
         }
         else
         {
-                confirm_replace_attachment_rez(0/*YES*/, (void*)rez_action);
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-06 (RLVa-1.0.0c)
+                // Don't allow wear to default attach point if there are any locked attachments
+                if ( (!rlv_handler_t::isEnabled()) || (0 != attach_pt) || (!gRlvHandler.hasLockedAttachment()) || (RlvSettings::getEnableWear()) )
+                        confirm_replace_attachment_rez(0/*YES*/, (void*)rez_action);
+                else
+                        delete rez_action;
+// [/RLVa]
+//              confirm_replace_attachment_rez(0/*YES*/, (void*)rez_action);
         }
 }
 
@@ -3431,6 +3484,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() )
@@ -3442,6 +3500,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->getObject())) )
+                                                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();
@@ -3457,15 +3525,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");
@@ -3662,6 +3742,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
@@ -3945,6 +4050,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->getObject()))) )
+                                        obj_item_array.remove(idxObj);
+                        }
+                        obj_count = obj_item_array.count();
+                }
+// [/RLVa:KB]
+
                 if( !wearable_count && !obj_count && !gest_count)
                 {
                         gViewerWindow->alertXml("CouldNotPutOnOutfit");
@@ -4017,57 +4136,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;
@@ -4132,6 +4201,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);
                                 }
@@ -4151,6 +4227,109 @@ 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);
+                        }
+                        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;
@@ -4220,7 +4399,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(),
@@ -4237,6 +4420,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() );
@@ -4358,9 +4553,13 @@ void LLWearableBridge::openItem()
         }
         else if(isAgentInventory())
         {
-                if( !gAgent.isWearingItem( mUUID ) )
+                if (gAgent.isWearingItem(mUUID))
                 {
-                        wearOnAvatar();
+                        performAction(NULL, NULL, "take_off");
+                }
+                else
+                {
+                        performAction(NULL, NULL, "wear");
                 }
         }
         else
@@ -4625,8 +4824,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 1029a3c..324e36a 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -1499,6 +1499,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.
@@ -2876,6 +2878,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();
@@ -2918,6 +2928,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/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 0f1eb2b..a8d5045 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -521,6 +521,15 @@ 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.SearchByAll", !search_by_name);
+
         mSavedFolderState = new LLSaveFolderState();
         mSavedFolderState->setApply(FALSE);
 
@@ -765,7 +774,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();
@@ -843,6 +862,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)
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index bdc24e0..1762165 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -225,6 +225,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 10cb0c3..5a67937 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -69,6 +69,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] = 
 {
@@ -173,6 +175,7 @@ LLManipScale::LLManipScale( LLToolComposite* composite )
         mScaledBoxHandleSize( 1.f ),
         mLastMouseX( -1 ),
         mLastMouseY( -1 ),
+        mMaxPrimSize(0.f),
         mSendUpdateOnMouseUp( FALSE ),
         mLastUpdateFlags( 0 ),
         mScaleSnapUnit1(1.f),
@@ -201,6 +204,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() )
         {
@@ -952,8 +956,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();
@@ -965,7 +969,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] );
@@ -1262,7 +1266,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
 
@@ -1962,7 +1966,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())
         {
@@ -1977,7 +1981,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)
@@ -2052,3 +2056,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 98d8c63..c60cb69 100644
--- a/linden/indra/newview/llmanipscale.h
+++ b/linden/indra/newview/llmanipscale.h
@@ -88,6 +88,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 );
@@ -165,6 +167,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 fd02be6..fa66b05 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 5a54068..b8bf0cb 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -45,8 +45,10 @@
 #include "llcolorscheme.h"
 #include "llviewercontrol.h"
 #include "llfloateravatarinfo.h"
+#include "llfloatermap.h"
 #include "llfloaterworldmap.h"
 #include "llframetimer.h"
+#include "llmutelist.h"
 #include "lltracker.h"
 #include "llmenugl.h"
 #include "llsurface.h"
@@ -76,6 +78,8 @@ 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) :
         LLPanel(name),
@@ -96,6 +100,11 @@ LLNetMap::LLNetMap(const std::string& name) :
         
         // Register event listeners for popup menu
         (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");
         (new LLShowAgentProfile())->registerListener(this, "MiniMap.ShowProfile");
@@ -114,6 +123,11 @@ LLNetMap::LLNetMap(const std::string& name) :
         mPopupMenuHandle = menu->getHandle();
 }
 
+BOOL LLNetMap::postBuild()
+{
+        return TRUE;
+}
+
 LLNetMap::~LLNetMap()
 {
 }
@@ -163,8 +177,11 @@ void LLNetMap::draw()
                 createObjectImage();
         }
 
-        mCurPanX = lerp(mCurPanX, mTargetPanX, LLCriticalDamp::getInterpolant(0.1f));
-        mCurPanY = lerp(mCurPanY, mTargetPanY, LLCriticalDamp::getInterpolant(0.1f));
+        if (gSavedSettings.getS32( "MiniMapCenter" ) != MAP_CENTER_NONE)
+        {
+                mCurPanX = lerp(mCurPanX, mTargetPanX, LLCriticalDamp::getInterpolant(0.1f));
+                mCurPanY = lerp(mCurPanY, mTargetPanY, LLCriticalDamp::getInterpolant(0.1f));
+        }
 
         F32 rotation = 0;
 
@@ -264,26 +281,24 @@ void LLNetMap::draw()
                         }
                         gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT);
                 }
-                
-
-                LLVector3d old_center = mObjectImageCenterGlobal;
-                LLVector3d new_center = gAgent.getCameraPositionGlobal();
-
-                new_center.mdV[0] = (5.f/mObjectMapTPM)*floor(0.2f*mObjectMapTPM*new_center.mdV[0]);
-                new_center.mdV[1] = (5.f/mObjectMapTPM)*floor(0.2f*mObjectMapTPM*new_center.mdV[1]);
-                new_center.mdV[2] = 0.f;
 
+                // Redraw object layer periodically
                 if (mUpdateNow || (map_timer.getElapsedTimeF32() > 0.5f))
                 {
                         mUpdateNow = FALSE;
-                        mObjectImageCenterGlobal = new_center;
 
-                        // Center moved enough.
+                        // Locate the centre of the object layer, accounting for panning
+                        LLVector3 new_center = globalPosToView(gAgent.getCameraPositionGlobal(), rotate_map);   
+                        new_center.mV[0] -= mCurPanX;
+                        new_center.mV[1] -= mCurPanY;
+                        new_center.mV[2] = 0.f;
+                        mObjectImageCenterGlobal = viewPosToGlobal(llround(new_center.mV[0]), llround(new_center.mV[1]), rotate_map);
+
                         // Create the base texture.
                         U8 *default_texture = mObjectRawImagep->getData();
                         memset( default_texture, 0, mObjectImagep->getWidth() * mObjectImagep->getHeight() * mObjectImagep->getComponents() );
 
-                        // Draw buildings
+                        // Draw objects
                         gObjectList.renderObjectsForMap(*this);
 
                         mObjectImagep->setSubImage(mObjectRawImagep, 0, 0, mObjectImagep->getWidth(), mObjectImagep->getHeight());
@@ -327,6 +342,10 @@ void LLNetMap::draw()
                 // 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 glyph_color;
+
                 std::vector<LLUUID> avatar_ids;
                 std::vector<LLVector3d> positions;
                 LLWorld::getInstance()->getAvatars(&avatar_ids, &positions);
@@ -335,10 +354,37 @@ 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);
+                        
+                        if (LLFloaterMap::getSelected() == avatar_ids[i])
+                        {
+                                glyph_color = selected_color;
+                        }
+                        // Show them muted even if they're friends
+                        else if (LLMuteList::getInstance()->isMuted(avatar_ids[i]))
+                        {
+                                glyph_color = muted_color;
+                        }
+                        else if (is_agent_friend(avatar_ids[i]))
+                        {
+                                glyph_color = friend_color;
+                        }
+                        else
+                        {
+                                glyph_color = avatar_color;
+                        }
+
+// [RLVa:KB]
+                        if ( rlv_handler_t::isEnabled() && !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], 
-                                is_agent_friend(avatar_ids[i]) ? friend_color : avatar_color, 
+                                glyph_color, 
                                 pos_map.mV[VZ],
                                 mDotRadius);
 
@@ -435,6 +481,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)
@@ -540,11 +588,39 @@ 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);
-                        msg.append("\n");
+// [RLVa:KB]
+                        if ( rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
+                        {
+                                // User is not allowed to see who it is, due to RLV settings.
+                                msg.append(rlv_handler_t::cstrHidden);
+                        }
+                        else
+                        {
+                                msg.append(fullname);
+                                msg.append("\n");
+                        }
+// [/RLVa:KB]
+                }
+                
+// [RLVa:KB]
+                if (rlv_handler_t::isEnabled() && !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() );
                 }
-                msg.append( region->getName() );
+// [/RLVa:KB]
 
+
+                msg.append("\n");
+                gSavedSettings.getBOOL( "MiniMapTeleport" ) ?
+                                                msg.append(getString("tooltip_tp")) : msg.append(getString("tooltip_map"));
+                msg.append("\n");
+                msg.append(getString("tooltip_pan"));
+                
 #ifndef LL_RELEASE_FOR_DOWNLOAD
                 std::string buffer;
                 msg.append("\n");
@@ -554,13 +630,6 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
                 buffer = region->getHost().getString();
                 msg.append(buffer);
 #endif
-                // *TODO: 
-                //      - put this under the control of XUI so it can be translated.
-
-                if ( gSavedSettings.getBOOL( "MiniMapTeleport" ))
-                        msg.append("\n(Double-click to teleport)");
-                else
-                        msg.append("\n(Double-click to open Map)");
 
                 S32 SLOP = 4;
                 localPointToScreen( 
@@ -616,11 +685,7 @@ void LLNetMap::renderScaledPointGlobal( const LLVector3d& pos, const LLColor4U &
         LLVector3 local_pos;
         local_pos.setVec( pos - mObjectImageCenterGlobal );
 
-        // DEV-17370 - megaprims of size > 4096 cause lag.  (go figger.)
-        const F32 MAX_RADIUS = 256.0f;
-        F32 radius_clamped = llmin(radius_meters, MAX_RADIUS);
-        
-        S32 diameter_pixels = llround(2 * radius_clamped * mObjectMapTPM);
+        S32 diameter_pixels = llround(2 * radius_meters * mObjectMapTPM);
         renderPoint( local_pos, color, diameter_pixels );
 }
 
@@ -740,6 +805,98 @@ void LLNetMap::createObjectImage()
         mUpdateNow = TRUE;
 }
 
+BOOL LLNetMap::handleMouseDown( S32 x, S32 y, MASK mask )
+{
+        if (!(mask & MASK_SHIFT)) return FALSE;
+
+        // Start panning
+        gFocusMgr.setMouseCapture( this );
+
+        mMouseDownPanX = llround(mCurPanX);
+        mMouseDownPanY = llround(mCurPanY);
+        mMouseDownX = x;
+        mMouseDownY = y;
+        return TRUE;
+}
+
+BOOL LLNetMap::handleMouseUp( S32 x, S32 y, MASK mask )
+{
+        if (hasMouseCapture())
+        {
+                if (mPanning)
+                {
+                        // restore mouse cursor
+                        S32 local_x, local_y;
+                        local_x = mMouseDownX + llfloor(mCurPanX - mMouseDownPanX);
+                        local_y = mMouseDownY + llfloor(mCurPanY - mMouseDownPanY);
+                        LLRect clip_rect = getRect();
+                        clip_rect.stretch(-8);
+                        clip_rect.clipPointToRect(mMouseDownX, mMouseDownY, local_x, local_y);
+                        LLUI::setCursorPositionLocal(this, local_x, local_y);
+
+                        // finish the pan
+                        mPanning = FALSE;
+
+                        mMouseDownX = 0;
+                        mMouseDownY = 0;
+
+                        // auto centre
+                        mTargetPanX = 0;
+                        mTargetPanY = 0;
+                }
+                gViewerWindow->showCursor();
+                gFocusMgr.setMouseCapture( NULL );
+                return TRUE;
+        }
+        return FALSE;
+}
+
+// static
+BOOL LLNetMap::outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y)
+{
+        S32 dx = x - start_x;
+        S32 dy = y - start_y;
+
+        return (dx <= -SLOP || SLOP <= dx || dy <= -SLOP || SLOP <= dy);
+}
+
+BOOL LLNetMap::handleHover( S32 x, S32 y, MASK mask )
+{
+        if (hasMouseCapture())
+        {
+                if (mPanning || outsideSlop(x, y, mMouseDownX, mMouseDownY))
+                {
+                        // just started panning, so hide cursor
+                        if (!mPanning)
+                        {
+                                mPanning = TRUE;
+                                gViewerWindow->hideCursor();
+                        }
+
+                        F32 delta_x = (F32)(gViewerWindow->getCurrentMouseDX());
+                        F32 delta_y = (F32)(gViewerWindow->getCurrentMouseDY());
+
+                        // Set pan to value at start of drag + offset
+                        mCurPanX += delta_x;
+                        mCurPanY += delta_y;
+                        mTargetPanX = mCurPanX;
+                        mTargetPanY = mCurPanY;
+
+                        gViewerWindow->moveCursorToCenter();
+                }
+
+                // Doesn't matter, cursor should be hidden
+        gViewerWindow->setCursor( UI_CURSOR_CROSS );
+                return TRUE;
+        }
+        else
+        {
+        gViewerWindow->setCursor( UI_CURSOR_CROSS );
+                lldebugst(LLERR_USER_INPUT) << "hover handled by LLNetMap" << llendl;
+                return TRUE;
+        }
+}
+
 BOOL LLNetMap::handleDoubleClick( S32 x, S32 y, MASK mask )
 {
         if (gSavedSettings.getBOOL( "MiniMapTeleport" ))
@@ -792,6 +949,54 @@ 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();
+
+        if (gSavedSettings.getS32("MiniMapCenter") == center)
+        {
+                gSavedSettings.setS32("MiniMapCenter", MAP_CENTER_NONE);
+        }
+        else
+        {
+                gSavedSettings.setS32("MiniMapCenter", userdata.asInteger());
+        }
+
+        return true;
+}
+
+bool LLNetMap::LLCheckCenterMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+{
+        LLNetMap *self = mPtr;
+        EMiniMapCenter center = (EMiniMapCenter)userdata["data"].asInteger();
+        BOOL enabled = (gSavedSettings.getS32("MiniMapCenter") == center);
+
+        self->findControl(userdata["control"].asString())->setValue(enabled);
+        return true;
+}
+
+bool LLNetMap::LLShowWorldMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+{
+        LLFloaterWorldMap::show(NULL, FALSE);
+        return true;
+}
+
 bool LLNetMap::LLStopTracking::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 {
         LLTracker::stopTracking(NULL);
diff --git a/linden/indra/newview/llnetmap.h b/linden/indra/newview/llnetmap.h
index 6a112ad..800b825 100644
--- a/linden/indra/newview/llnetmap.h
+++ b/linden/indra/newview/llnetmap.h
@@ -40,17 +40,27 @@
 #include "llimage.h"
 #include "llimagegl.h"
 
-
 class LLTextBox;
 
+typedef enum e_minimap_center
+{
+        MAP_CENTER_NONE = 0,
+        MAP_CENTER_CAMERA = 1
+} EMiniMapCenter;
+
 class LLNetMap : public LLPanel
 {
 public:
         LLNetMap(const std::string& name);
+
+        virtual BOOL postBuild();
         virtual ~LLNetMap();
 
         virtual void    draw();
         virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+        virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
+        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    handleRightMouseDown( S32 x, S32 y, MASK mask );
         virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks);
@@ -62,7 +72,7 @@ private:
 
         void                    setScale( F32 scale );
 
-        // *TODO: Enable panning of the mini-map
+        // Not used at present
         void                    translatePan( F32 delta_x, F32 delta_y );
         void                    setPan( F32 x, F32 y )                  { mTargetPanX = x; mTargetPanY = y; }
 
@@ -91,18 +101,27 @@ private:
         F32                             mTargetPanY;
         F32                             mCurPanX;
         F32                             mCurPanY;
+
+        BOOL                    mPanning;                       // map has been dragged
+        S32                             mMouseDownPanX;         // value at start of drag
+        S32                             mMouseDownPanY;         // value at start of drag
+        S32                             mMouseDownX;
+        S32                             mMouseDownY;
+
         BOOL                    mUpdateNow;
         LLVector3d              mObjectImageCenterGlobal;
         LLPointer<LLImageRaw> mObjectRawImagep;
         LLPointer<LLImageGL>    mObjectImagep;
 
 private:
-        LLUUID                  mClosestAgentToCursor;
-        LLUUID                  mClosestAgentAtLastRightClick;
+        LLUUID                          mClosestAgentToCursor;
+        LLUUID                          mClosestAgentAtLastRightClick;
 
         static BOOL             sRotateMap;
         static LLNetMap*        sInstance;
         static BOOL isAgentUnderCursor(void*) { return sInstance && sInstance->mClosestAgentToCursor.notNull(); }
+        static BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y);
+
         static void showAgentProfile(void*);
         BOOL isAgentUnderCursor() { return mClosestAgentToCursor.notNull(); }
 
@@ -112,6 +131,36 @@ private:
                 /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
         };
 
+        class LLCenterMap : public LLMemberListener<LLNetMap>
+        {
+        public:
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        };
+
+        class LLCheckCenterMap : public LLMemberListener<LLNetMap>
+        {
+        public:
+                /*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:
+                /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+        };
+
         class LLStopTracking : public LLMemberListener<LLNetMap>
         {
         public:
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index 9e837a6..5590ab1 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -54,6 +54,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;
 
@@ -328,6 +332,13 @@ LLNotifyBox::LLNotifyBox(LLPointer<LLNotifyBoxTemplate> xml_template, const LLSt
                 // 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 91a7375..c1a2354 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -41,6 +41,7 @@
 #include "llagent.h"
 #include "llbutton.h"
 #include "llchatbar.h"
+#include "llfloaterchat.h"
 #include "llfocusmgr.h"
 #include "llimview.h"
 #include "llmediaremotectrl.h"
@@ -62,6 +63,7 @@
 #include "llvoavatar.h"
 #include "llvoiceremotectrl.h"
 #include "llwebbrowserctrl.h"
+#include "llwindlightremotectrl.h"
 #include "llselectmgr.h"
 
 //
@@ -72,6 +74,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
 //
@@ -92,6 +141,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();
@@ -102,6 +158,7 @@ LLOverlayBar::LLOverlayBar()
         :       LLPanel(),
                 mMediaRemote(NULL),
                 mVoiceRemote(NULL),
+                mWindlightRemote(NULL),
                 mMusicState(STOPPED),
                 mOriginalIMLabel("")
 {
@@ -113,6 +170,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);
@@ -256,7 +314,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");
 
@@ -269,6 +330,7 @@ void LLOverlayBar::refresh()
         }
 
 
+        moveChildToBackOfTabGroup(mWindlightRemote);
         moveChildToBackOfTabGroup(mMediaRemote);
         moveChildToBackOfTabGroup(mVoiceRemote);
 
@@ -277,6 +339,7 @@ void LLOverlayBar::refresh()
         {
                 childSetVisible("media_remote_container", FALSE);
                 childSetVisible("voice_remote_container", FALSE);
+                childSetVisible("windlight_remote_container", FALSE);
                 childSetVisible("state_buttons", FALSE);
         }
         else
@@ -284,6 +347,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);
         }
 
@@ -336,6 +400,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);
 }
@@ -406,6 +477,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 52a469a..140fabf 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -40,6 +40,7 @@ extern S32 STATUS_BAR_HEIGHT;
 class LLButton;
 class LLLineEditor;
 class LLMediaRemoteCtrl;
+
 class LLMessageSystem;
 class LLTextBox;
 class LLTextEditor;
@@ -49,6 +50,7 @@ class LLFrameTimer;
 class LLStatGraph;
 class LLSlider;
 class LLVoiceRemoteCtrl;
+class LLWindlightRemoteCtrl;
 
 class LLOverlayBar
 :       public LLPanel
@@ -88,13 +90,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 d48237f..e101ea2 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -51,6 +51,7 @@
 
 #include "llfloaterfriends.h"
 #include "llfloatergroupinfo.h"
+#include "llfloatergroups.h"
 #include "llfloaterworldmap.h"
 #include "llfloatermute.h"
 #include "llfloateravatarinfo.h"
@@ -86,6 +87,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);
 
@@ -428,6 +430,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());
@@ -789,6 +792,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);
 
@@ -924,6 +930,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;
 
         gViewerWindow->alertXml("AddClassified",callbackNew,self);
@@ -1020,7 +1032,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());
@@ -1098,6 +1113,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");
@@ -1415,6 +1436,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
                         }
                         childSetVisible("Instant Message...",FALSE);
                         childSetEnabled("Instant Message...",FALSE);
+                        childSetVisible("Invite to Group...",FALSE);
+                        childSetEnabled("Invite to Group...",FALSE);
                         childSetVisible("Mute",FALSE);
                         childSetEnabled("Mute",FALSE);
                         childSetVisible("Offer Teleport...",FALSE);
@@ -1427,6 +1450,14 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
                         childSetEnabled("Add Friend...",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
                 {
@@ -1438,6 +1469,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);
 
@@ -1464,20 +1497,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);
 }
 
 
@@ -1520,9 +1553,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("ScriptBgReadOnlyColor").getValue();
+                                }
                                 group_list->addElement(row);
                         }
                         group_list->sortByColumnIndex(0, TRUE);
@@ -1545,6 +1587,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
 //-----------------------------------------------------------------------------
@@ -1762,6 +1820,7 @@ void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
                         continue;
                 }
                 self->childSetEnabled("Instant Message...",TRUE);
+                self->childSetEnabled("Invite to Group...",TRUE);
                 self->childSetEnabled("Pay...",TRUE);
                 self->childSetEnabled("Mute",TRUE);
 
@@ -1982,8 +2041,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("ScriptBgReadOnlyColor").getValue();
+                                }
                                 if (group_list)
                                 {
                                         group_list->addElement(row);
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h
index 4570145..b1bb317 100644
--- a/linden/indra/newview/llpanelavatar.h
+++ b/linden/indra/newview/llpanelavatar.h
@@ -311,6 +311,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 4d28be5..3760815 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -760,7 +760,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);
@@ -964,6 +967,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 d91790e..e13ec46 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -66,6 +66,10 @@
 #include "lltoolcomp.h"
 #include "llpanelinventory.h"
 
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+#include "llvoavatar.h"
+// [/RLVa:KB]
+
 //
 // Imported globals
 //
@@ -117,6 +121,24 @@ void LLPanelContents::getState(LLViewerObject *objectp )
                                                && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) )));  // solves SL-23488
         BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME );
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0g
+        if ( (rlv_handler_t::isEnabled()) && (editable) )
+        {
+                // Don't allow creation of new scripts if it's undetachable
+                editable = gRlvHandler.isDetachable(objectp);
+
+                // Don't allow creation of new scripts if we're @unsit=n or @sittp=n restricted and we're sitting on the selection
+                if ( (editable) && ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP))) )
+                {
+                        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                        // Only check the first (non-)root object because nothing else would result in enabling the button (see below)
+                        LLViewerObject* pObj = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(TRUE);
+
+                        editable = (pObj) && (pAvatar) && ((!pAvatar->mIsSitting) || (pAvatar->getRoot() != pObj->getRootEdit()));
+                }
+        }
+// [/RLVa:KB]
+
         // Edit script button - ok if object is editable and there's an
         // unambiguous destination for the object.
         if(     editable &&
@@ -160,6 +182,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 d510775..e3da12a 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -318,6 +318,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;
@@ -475,7 +478,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)
@@ -490,7 +498,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"));
@@ -690,6 +703,8 @@ void LLPanelDisplay::cancel()
         gSavedSettings.setU32("WLSkyDetail", mSkyLOD);
         gSavedSettings.setS32("RenderMaxPartCount", mParticleCount);
         gSavedSettings.setS32("RenderGlowResolutionPow", mPostProcess);
+
+        gSavedSettings.setBOOL("EnableWindlightRemote", mWLControl);
 }
 
 void LLPanelDisplay::apply()
@@ -701,6 +716,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 f98e94e..80ef5cb 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -170,6 +170,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 f370116..490e40d 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -60,7 +60,6 @@ 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("rotate_mini_map_checkbox", gSavedSettings.getBOOL("MiniMapRotate"));
         childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
         childSetValue("use_system_color_picker_checkbox", gSavedSettings.getBOOL("UseDefaultColorPicker"));
         childSetValue("show_search_panel", gSavedSettings.getBOOL("ShowSearchBar"));
@@ -96,7 +95,6 @@ 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("MiniMapRotate", childGetValue("rotate_mini_map_checkbox"));
         gSavedSettings.setBOOL("NotifyMoneyChange", childGetValue("notify_money_change_checkbox"));
         gSavedSettings.setBOOL("UseDefaultColorPicker", childGetValue("use_system_color_picker_checkbox"));
         gSavedSettings.setBOOL("ShowSearchBar", childGetValue("show_search_panel"));
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index c53395d..7ab850f 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -81,6 +81,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
 ///----------------------------------------------------------------------------
@@ -364,8 +368,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;
@@ -382,6 +394,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;
@@ -408,12 +426,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()))
         {
@@ -558,6 +611,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
@@ -675,6 +735,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())
@@ -1180,12 +1248,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;
@@ -1300,6 +1376,12 @@ void LLTaskNotecardBridge::openItem()
         {
                 return;
         }
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour("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 b40450c..c0b8e24 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -230,6 +230,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 c26f70f..325fcbc 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -74,6 +74,10 @@
 
 #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
 
 std::string load_password_from_disk(void);
@@ -797,6 +801,18 @@ 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);
 
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 5c70590..9dcf410 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -75,6 +75,10 @@
 
 #include "lldrawpool.h"
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+#include "llvoavatar.h"
+// [/RLVa:KB]
+
 //
 // Constants
 //
@@ -385,6 +389,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)
         {
@@ -618,6 +631,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 c430922..24bbab6 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -84,6 +84,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);
@@ -177,6 +178,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);
@@ -190,9 +196,6 @@ void LLPanelPermissions::refresh()
                 childSetEnabled("Description:",false);
                 childSetText("Object Description",LLStringUtil::null);
                 childSetEnabled("Object Description",false);
- 
-                childSetText("prim info",LLStringUtil::null);
-                childSetEnabled("prim info",false);
 
                 childSetEnabled("Permissions:",false);
                 
@@ -299,6 +302,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())
         {
@@ -309,8 +314,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
@@ -322,9 +327,39 @@ 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)
+        {
+                childSetText("Last Owner Name", last_owner_name);
+                childSetEnabled("Last Owner Name", TRUE);
+                childSetEnabled("button last owner profile", TRUE);
+        }
+        else
+        {
+                childSetText("Last Owner Name", LLStringUtil::null);
+                childSetEnabled("Last Owner Name", FALSE);
+                childSetEnabled("button last owner profile", FALSE);
+        }
 
         // update group text field
         childSetEnabled("Group:",true);
@@ -388,33 +423,6 @@ void LLPanelPermissions::refresh()
                 childSetEnabled("Object Description",false);
         }
 
-
-        // Pre-compute object info string
-        S32 prim_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
-        S32 obj_count = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
-
-        std::string object_info_string;
-        if (1 == obj_count)
-        {
-                object_info_string.assign("1 Object, ");
-        }
-        else
-        {
-                object_info_string = llformat( "%d Objects, ", obj_count);
-        }
-        if (1 == prim_count)
-        {
-                object_info_string.append("1 Primitive");
-        }
-        else
-        {
-                std::string buffer;
-                buffer = llformat( "%d Primitives", prim_count);
-                object_info_string.append(buffer);
-        }
-        childSetText("prim info",object_info_string);
-        childSetEnabled("prim info",true);
-
         S32 total_sale_price = 0;
         S32 individual_sale_price = 0;
         BOOL is_for_sale_mixed = FALSE;
@@ -861,7 +869,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 3b73254..57339ed 100644
--- a/linden/indra/newview/llpanelpermissions.h
+++ b/linden/indra/newview/llpanelpermissions.h
@@ -68,6 +68,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 480f703..57ce6d5 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -400,7 +400,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
         {
@@ -417,7 +420,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]
         }
 }
 
@@ -455,6 +461,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 4453751..f3b7278 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -32,6 +32,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llchatbar.h"
+#include "llfloaterchat.h"
 #include "llprefschat.h"
 #include "lltexteditor.h"
 #include "llviewercontrol.h"
@@ -69,11 +71,11 @@ protected:
         BOOL mPlayTypingAnim;
         BOOL mChatBubbles;
         BOOL mScriptErrorAsChat;
+        BOOL mChatChannel;
         F32     mConsoleOpacity;
         F32     mBubbleOpacity;
 };
 
-
 LLPrefsChatImpl::LLPrefsChatImpl()
         :       LLPanel(std::string("Chat Panel"))
 {
@@ -101,6 +103,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"));
 
@@ -124,6 +127,7 @@ LLPrefsChatImpl::LLPrefsChatImpl()
         mChatFullWidth = gSavedSettings.getBOOL("ChatFullWidth");
         mCloseChatOnReturn = gSavedSettings.getBOOL("CloseChatOnReturn");
         mPlayTypingAnim = gSavedSettings.getBOOL("PlayTypingAnim"); 
+        mChatChannel = gSavedSettings.getBOOL("ChatChannelSelect");
         mConsoleOpacity = gSavedSettings.getF32("ConsoleBackgroundOpacity");
         mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
 }
@@ -149,6 +153,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);     
 }
@@ -181,8 +186,21 @@ 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();
+                }
+                mChatChannel = chan_check;
+        }
 }
 
+
 //---------------------------------------------------------------------------
 
 LLPrefsChat::LLPrefsChat()
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 1af6e86..5cb14fc 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -58,7 +58,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);
 
@@ -96,6 +96,7 @@ BOOL LLPrefsIMImpl::postBuild()
         childSetLabelArg("send_im_to_email", "[EMAIL]", getString("log_in_to_change"));
 
         // Don't enable this until we get personal data
+        childDisable("include_im_in_chat_console");
         childDisable("include_im_in_chat_history");
         childDisable("show_timestamps_check");
         childDisable("friends_online_notify_checkbox");
@@ -114,6 +115,7 @@ BOOL LLPrefsIMImpl::postBuild()
 
         childSetText("busy_response", getString("log_in_to_change"));
 
+        childSetValue("include_im_in_chat_console", gSavedSettings.getBOOL("IMInChatConsole"));
         childSetValue("include_im_in_chat_history", gSavedSettings.getBOOL("IMInChatHistory"));
         childSetValue("show_timestamps_check", gSavedSettings.getBOOL("IMShowTimestamps"));
         childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
@@ -163,6 +165,7 @@ void LLPrefsIMImpl::apply()
 
                 gSavedPerAccountSettings.setString("BusyModeResponse", std::string(wstring_to_utf8str(busy_response)));
 
+                gSavedSettings.setBOOL("IMInChatConsole", childGetValue("include_im_in_chat_console").asBoolean());
                 gSavedSettings.setBOOL("IMInChatHistory", childGetValue("include_im_in_chat_history").asBoolean());
                 gSavedSettings.setBOOL("IMShowTimestamps", childGetValue("show_timestamps_check").asBoolean());
                 gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
@@ -234,6 +237,7 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e
                 mOriginalHideOnlineStatus = true;
         }
 
+        childEnable("include_im_in_chat_console");
         childEnable("include_im_in_chat_history");
         childEnable("show_timestamps_check");
         childEnable("friends_online_notify_checkbox");
@@ -255,6 +259,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/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index af52a4b..1e9def3 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -1925,6 +1925,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;
@@ -1950,6 +1956,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;
@@ -2371,6 +2383,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/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 7afe073..af97e2e 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -106,6 +106,7 @@ BOOL gHideSelectedObjects = FALSE;
 BOOL gAllowSelectAvatar = FALSE;
 
 BOOL LLSelectMgr::sRectSelectInclusive = TRUE;
+BOOL LLSelectMgr::sRenderSelectionHighlights = TRUE;
 BOOL LLSelectMgr::sRenderHiddenSelections = TRUE;
 BOOL LLSelectMgr::sRenderLightRadius = FALSE;
 F32     LLSelectMgr::sHighlightThickness = 0.f;
@@ -3450,12 +3451,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;
@@ -4551,6 +4560,11 @@ extern LLGLdouble	gGLModelView[16];
 
 void LLSelectMgr::updateSilhouettes()
 {
+        if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights)
+        {
+                return;
+        }
+
         S32 num_sils_genned = 0;
 
         LLVector3d      cameraPos = gAgent.getCameraPositionGlobal();
@@ -4823,7 +4837,7 @@ void LLSelectMgr::updateSilhouettes()
 
 void LLSelectMgr::renderSilhouettes(BOOL for_hud)
 {
-        if (!mRenderSilhouettes)
+        if (!mRenderSilhouettes || !LLSelectMgr::sRenderSelectionHighlights)
         {
                 return;
         }
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index a332053..3f32373 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -337,6 +337,7 @@ class LLSelectMgr : public LLEditMenuHandler, public LLSingleton<LLSelectMgr>
 {
 public:
         static BOOL                                     sRectSelectInclusive;   // do we need to surround an object to pick it?
+        static BOOL                                     sRenderSelectionHighlights;     // do we show selection silhouettes?
         static BOOL                                     sRenderHiddenSelections;        // do we show selection silhouettes that are occluded?
         static BOOL                                     sRenderLightRadius;     // do we show the radius of selected lights?
         static F32                                      sHighlightThickness;
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 127fca2..cdca5d5 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -563,7 +563,7 @@ void LLSpatialGroup::rebuildGeom()
 
 void LLSpatialPartition::rebuildGeom(LLSpatialGroup* group)
 {
-        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 aca3cac..ea08298 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -384,6 +384,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())
                 {
                         gViewerWindow->alertXml("DisplaySetToSafe");
@@ -924,6 +929,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
@@ -1003,6 +1025,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");
@@ -2462,6 +2485,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();
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index b0ef61f..012db6f 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -568,6 +568,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);
 
 
@@ -814,6 +823,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 6a3415f..e3bd3cd 100644
--- a/linden/indra/newview/llstylemap.cpp
+++ b/linden/indra/newview/llstylemap.cpp
@@ -47,13 +47,13 @@ LLStyleMap::~LLStyleMap()
 
 LLStyleMap &LLStyleMap::instance()
 {
-        static LLStyleMap mStyleMap;
-        return mStyleMap;
+        static LLStyleMap style_map;
+        return style_map;
 }
 
 // This is similar to the [] accessor except that if the entry doesn't already exist,
 // then this will create the entry.
-const LLStyleSP &LLStyleMap::lookup(const LLUUID &source)
+const LLStyleSP &LLStyleMap::lookupAgent(const LLUUID &source)
 {
         // Find this style in the map or add it if not.  This map holds links to residents' profiles.
         if (find(source) == end())
@@ -77,6 +77,37 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID &source)
         return (*this)[source];
 }
 
+// This is similar to lookupAgent for any generic URL encoded style.
+const LLStyleSP &LLStyleMap::lookup(const LLUUID& id, const std::string& link)
+{
+        // Find this style in the map or add it if not.
+        iterator iter = find(id);
+        if (iter == end())
+        {
+                LLStyleSP style(new LLStyle);
+                style->setVisible(true);
+                style->setFontName(LLStringUtil::null);
+                if (id != LLUUID::null && !link.empty())
+                {
+                        style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
+                        style->setLinkHREF(link);
+                }
+                else
+                        style->setColor(LLColor4::white);
+                (*this)[id] = style;
+        }
+        else
+        {
+                LLStyleSP style = (*iter).second;
+                if ( style->getLinkHREF() != link )
+                {
+                        style->setLinkHREF(link);
+                }
+        }
+
+        return (*this)[id];
+}
+
 void LLStyleMap::update()
 {
         for (style_map_t::iterator iter = begin(); iter != end(); ++iter)
diff --git a/linden/indra/newview/llstylemap.h b/linden/indra/newview/llstylemap.h
index a38d253..f1eada9 100644
--- a/linden/indra/newview/llstylemap.h
+++ b/linden/indra/newview/llstylemap.h
@@ -47,7 +47,8 @@ public:
         LLStyleMap();
         ~LLStyleMap();
         // Just like the [] accessor but it will add the entry in if it doesn't exist.
-        const LLStyleSP &lookup(const LLUUID &source); 
+        const LLStyleSP &lookupAgent(const LLUUID &source);
+        const LLStyleSP &lookup(const LLUUID &source, const std::string& link);
         static LLStyleMap &instance();
 
         // Forces refresh of the entries, call when something changes (e.g. link color).
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index ec5cf78..94a5372 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -1527,19 +1527,13 @@ LLTextureCache::handle_t LLTextureCache::writeToCache(const LLUUID& id, U32 prio
         purgeTextureFilesTimeSliced();  // purge textures from cache in a non-hiccup-way
 
 
-        if (datasize >= TEXTURE_CACHE_ENTRY_SIZE)
-        {
-                LLMutexLock lock(&mWorkersMutex);
-                llassert_always(imagesize > 0);
-                LLTextureCacheWorker* worker = new LLTextureCacheRemoteWorker(this, priority, id,
-                                                                                                                                data, datasize, 0,
-                                                                                                                                imagesize, responder);
-                handle_t handle = worker->write();
-                mWriters[handle] = worker;
-                return handle;
-        }
-        delete responder;
-        return LLWorkerThread::nullHandle();
+        LLMutexLock lock(&mWorkersMutex);
+        LLTextureCacheWorker* worker = new LLTextureCacheRemoteWorker(this, priority, id,
+                                                                                                                                          data, datasize, 0,
+                                                                                                                                          imagesize, responder);
+        handle_t handle = worker->write();
+        mWriters[handle] = worker;
+        return handle;
 }
 
 bool LLTextureCache::writeComplete(handle_t handle, bool abort)
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index be0b8eb..71135d7 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -349,6 +349,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 99dbe31..9dfd86b 100644
--- a/linden/indra/newview/lltool.cpp
+++ b/linden/indra/newview/lltool.cpp
@@ -64,7 +64,6 @@ LLTool::~LLTool()
         }
 }
 
-
 BOOL LLTool::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         if (gDebugClicks)
@@ -124,6 +123,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 cf97fb4..73463ba 100644
--- a/linden/indra/newview/lltool.h
+++ b/linden/indra/newview/lltool.h
@@ -56,6 +56,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 8202191..6d04294 100644
--- a/linden/indra/newview/lltoolbar.cpp
+++ b/linden/indra/newview/lltoolbar.cpp
@@ -307,6 +307,20 @@ void LLToolBar::refresh()
         }
         gSavedSettings.setBOOL("BuildBtnState", build_mode);
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g)
+        // Called per-frame so this really can't be slow
+        if (rlv_handler_t::isEnabled())
+        {
+                // If we're rez-restricted, we can still edit => allow build floater
+                // If we're edit-restricted, we can still rez => allow build floater
+                childSetEnabled("build_btn", !(gRlvHandler.hasBehaviour(RLV_BHVR_REZ) && gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) );
+
+                childSetEnabled("map_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP) );
+                childSetEnabled("radar_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWMINIMAP) );
+                childSetEnabled("inventory_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWINV) );
+        }
+// [/RLVa:KB]
+
         updateCommunicateList();
 }
 
@@ -479,6 +493,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/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 46b36d9..d23e29d 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -96,7 +96,24 @@ LLToolBrushLand::LLToolBrushLand()
         mGotHover(FALSE),
         mBrushSelected(FALSE)
 {
-        mBrushIndex = gSavedSettings.getS32("LandBrushSize");
+        mBrushSize = gSavedSettings.getF32("LandBrushSize");
+}
+
+
+U8 LLToolBrushLand::getBrushIndex()
+{
+        // find the best index for desired size
+        // (compatibility with old sims, brush_index is now depricated - DEV-8252)
+        U8 index = 0;
+        for (U8 i = 0; i < LAND_BRUSH_SIZE_COUNT; i++)
+        {
+                if (mBrushSize > LAND_BRUSH_SIZE[i])
+                {
+                        index = i;
+                }
+        }
+
+        return index;
 }
 
 void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
@@ -157,7 +174,6 @@ void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
                 F32 seconds = (1.0f / gFPSClamped) * gSavedSettings.getF32("LandBrushForce");
                 F32 x_pos = (F32)pos_region.mV[VX];
                 F32 y_pos = (F32)pos_region.mV[VY];
-                U8 brush_size = (U8)mBrushIndex;
                 LLMessageSystem* msg = gMessageSystem;
                 msg->newMessageFast(_PREHASH_ModifyLand);
                 msg->nextBlockFast(_PREHASH_AgentData);
@@ -165,7 +181,7 @@ void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
                 msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
                 msg->nextBlockFast(_PREHASH_ModifyBlock);
                 msg->addU8Fast(_PREHASH_Action, (U8)action);
-                msg->addU8Fast(_PREHASH_BrushSize, brush_size);
+                msg->addU8Fast(_PREHASH_BrushSize, getBrushIndex());
                 msg->addF32Fast(_PREHASH_Seconds, seconds);
                 msg->addF32Fast(_PREHASH_Height, mStartingZ);
                 msg->nextBlockFast(_PREHASH_ParcelData);
@@ -174,6 +190,8 @@ void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
                 msg->addF32Fast(_PREHASH_South, y_pos );
                 msg->addF32Fast(_PREHASH_East, x_pos );
                 msg->addF32Fast(_PREHASH_North, y_pos );
+                msg->nextBlock("ModifyBlockExtended");
+                msg->addF32("BrushSize", mBrushSize);
                 msg->sendMessage(regionp->getHost());
         }
 }
@@ -294,7 +312,6 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
                 regionp->forceUpdate();
 
                 // tell the simulator what we've done
-                U8 brush_size = (U8)mBrushIndex;
                 LLMessageSystem* msg = gMessageSystem;
                 msg->newMessageFast(_PREHASH_ModifyLand);
                 msg->nextBlockFast(_PREHASH_AgentData);
@@ -302,7 +319,7 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
                 msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
                 msg->nextBlockFast(_PREHASH_ModifyBlock);
                 msg->addU8Fast(_PREHASH_Action, (U8)action);
-                msg->addU8Fast(_PREHASH_BrushSize, brush_size);
+                msg->addU8Fast(_PREHASH_BrushSize, getBrushIndex());
                 msg->addF32Fast(_PREHASH_Seconds, seconds);
                 msg->addF32Fast(_PREHASH_Height, mStartingZ);
 
@@ -327,6 +344,9 @@ void LLToolBrushLand::modifyLandInSelectionGlobal()
                         msg->addF32Fast(_PREHASH_East,  max_region.mV[VX] );
                         msg->addF32Fast(_PREHASH_North, max_region.mV[VY] );
                 }
+                
+                msg->nextBlock("ModifyBlockExtended");
+                msg->addF32("BrushSize", mBrushSize);
 
                 msg->sendMessage(regionp->getHost());
         }
@@ -447,7 +467,8 @@ void LLToolBrushLand::render()
                         spot.mdV[VX] = floor( spot.mdV[VX] + 0.5 );
                         spot.mdV[VY] = floor( spot.mdV[VY] + 0.5 );
 
-                        mBrushIndex = gSavedSettings.getS32("LandBrushSize");
+                        mBrushSize = gSavedSettings.getF32("LandBrushSize");
+                        
                         region_list_t regions;
                         determineAffectedRegions(regions, spot);
 
@@ -499,7 +520,7 @@ void LLToolBrushLand::renderOverlay(LLSurface& land, const LLVector3& pos_region
         
         S32 i = (S32) pos_region.mV[VX];
         S32 j = (S32) pos_region.mV[VY];
-        S32 half_edge = llfloor(LAND_BRUSH_SIZE[mBrushIndex]);
+        S32 half_edge = llfloor(mBrushSize);
         S32 radioAction = gSavedSettings.getS32("RadioLandBrushAction");
         F32 force = gSavedSettings.getF32("LandBrushForce"); // .1 to 100?
         
@@ -556,27 +577,27 @@ void LLToolBrushLand::determineAffectedRegions(region_list_t& regions,
                                                                                            const LLVector3d& spot ) const
 {
         LLVector3d corner(spot);
-        corner.mdV[VX] -= (LAND_BRUSH_SIZE[mBrushIndex] / 2);
-        corner.mdV[VY] -= (LAND_BRUSH_SIZE[mBrushIndex] / 2);
+        corner.mdV[VX] -= (mBrushSize / 2);
+        corner.mdV[VY] -= (mBrushSize / 2);
         LLViewerRegion* region = NULL;
         region = LLWorld::getInstance()->getRegionFromPosGlobal(corner);
         if(region && regions.find(region) == regions.end())
         {
                 regions.insert(region);
         }
-        corner.mdV[VY] += LAND_BRUSH_SIZE[mBrushIndex];
+        corner.mdV[VY] += mBrushSize;
         region = LLWorld::getInstance()->getRegionFromPosGlobal(corner);
         if(region && regions.find(region) == regions.end())
         {
                 regions.insert(region);
         }
-        corner.mdV[VX] += LAND_BRUSH_SIZE[mBrushIndex];
+        corner.mdV[VX] += mBrushSize;
         region = LLWorld::getInstance()->getRegionFromPosGlobal(corner);
         if(region && regions.find(region) == regions.end())
         {
                 regions.insert(region);
         }
-        corner.mdV[VY] -= LAND_BRUSH_SIZE[mBrushIndex];
+        corner.mdV[VY] -= mBrushSize;
         region = LLWorld::getInstance()->getRegionFromPosGlobal(corner);
         if(region && regions.find(region) == regions.end())
         {
diff --git a/linden/indra/newview/lltoolbrush.h b/linden/indra/newview/lltoolbrush.h
index 8df4b67..f25d6b9 100644
--- a/linden/indra/newview/lltoolbrush.h
+++ b/linden/indra/newview/lltoolbrush.h
@@ -95,11 +95,14 @@ protected:
         F32 mStartingZ;
         S32 mMouseX;
         S32 mMouseY;
-        S32 mBrushIndex;
+        F32 mBrushSize;
         BOOL mGotHover;
         BOOL mBrushSelected;
         // Order doesn't matter and we do check for existance of regions, so use a set
         region_list_t mLastAffectedRegions;
+
+private:
+        U8 getBrushIndex();
 };
 
 
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index efd8060..c99ccbf 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -1267,6 +1267,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;
@@ -1933,6 +1942,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;
@@ -1988,6 +2014,15 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
                 return ACCEPT_NO;
         }
 
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-1.0.0c
+        LLViewerJointAttachment* pAttachPt = NULL;
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) && (!RlvSettings::getEnableWear()) &&
+                 ( ((pAttachPt = gRlvHandler.getAttachPoint(item, true)) == NULL) || (!gRlvHandler.isDetachable(pAttachPt->getObject())) ) )
+        {
+                return ACCEPT_NO_LOCKED;
+        }
+// [/RLVa:KB]
+
         if( drop )
         {
                 if(mSource == SOURCE_LIBRARY)
@@ -2003,7 +2038,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;
@@ -2013,6 +2051,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);
@@ -2076,6 +2121,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)
         {
@@ -2281,6 +2334,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
@@ -2645,6 +2712,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;
@@ -2666,6 +2741,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 d5e4f81..41f2b0d 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -99,6 +99,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 a6695f9..6c0a557 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -185,7 +185,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)
                 {
@@ -420,6 +425,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 27d1c4c..b32169d 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -165,6 +165,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)
                         // nothing
                         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;
@@ -344,7 +353,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())
                 {
@@ -374,15 +398,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]
                 }
         }
 
@@ -635,7 +676,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())
@@ -646,9 +687,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 dda21dd..840de23 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -124,6 +124,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)
@@ -156,6 +164,20 @@ BOOL LLToolPlacer::raycastForNewObjPos( S32 x, S32 y, LLViewerObject** hit_obj,
 }
 
 
+static S32 getTreeGrassSpecies(std::map<std::string, S32> &table, const char *control, S32 max)
+{
+        const std::string &species = gSavedSettings.getString(control);
+        std::map<std::string, S32>::iterator it;
+        it = table.find(species);
+        if (it != table.end()) {
+                return it->second;
+        } else {
+                // if saved species not found, default to "Random"
+                return (rand() % max);
+        }
+}
+
+
 BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 {
         LLVector3 ray_start_region;
@@ -200,13 +222,13 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
         case LL_PCODE_LEGACY_GRASS:
                 //  Randomize size of grass patch 
                 scale.setVec(10.f + ll_frand(20.f), 10.f + ll_frand(20.f),  1.f + ll_frand(2.f));
-                state = rand() % LLVOGrass::sMaxGrassSpecies;
+                state = getTreeGrassSpecies(LLVOGrass::sSpeciesNames, "LastGrass", LLVOGrass::sMaxGrassSpecies);
                 break;
 
 
         case LL_PCODE_LEGACY_TREE:
         case LL_PCODE_TREE_NEW:
-                state = rand() % LLVOTree::sMaxTreeSpecies;
+                state = getTreeGrassSpecies(LLVOTree::sSpeciesNames, "LastTree", LLVOTree::sMaxTreeSpecies);
                 break;
 
         case LL_PCODE_SPHERE:
@@ -241,7 +263,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;
         }
@@ -499,6 +524,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 b4e9562..389ae59 100644
--- a/linden/indra/newview/lltoolselect.cpp
+++ b/linden/indra/newview/lltoolselect.cpp
@@ -50,6 +50,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;
 
@@ -82,6 +86,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 bd2f659..cf98c7a 100644
--- a/linden/indra/newview/lltracker.cpp
+++ b/linden/indra/newview/lltracker.cpp
@@ -180,8 +180,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]
                 }
         }
 
@@ -222,8 +226,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
@@ -251,8 +259,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/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 89ae973..eb8b1d5 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -423,6 +423,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();
@@ -566,6 +580,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 96591a2..4b352a4 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -675,7 +675,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);
@@ -802,7 +805,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/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 847336d..8a92963 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -209,6 +209,10 @@
 #include "llwaterparammanager.h"
 
 #include "lltexlayer.h"
+#include "primbackup.h"
+
+#include "jcfloater_animation_list.h"
+#include "llfloaterassetbrowser.h"
 
 void init_client_menu(LLMenuGL* menu);
 void init_server_menu(LLMenuGL* menu);
@@ -219,6 +223,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*);
@@ -825,6 +836,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);
@@ -919,6 +943,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", &rlvDbgToggleEnabled, NULL, &rlvDbgGetEnabled, NULL));
+        #endif // RLV_ADVANCED_TOGGLE_RLVA
+// [/RLVa:KB]
+
         if(gSavedSettings.getBOOL("QAMode"))
         {
                 LLMenuGL* sub = NULL;
@@ -1366,6 +1397,53 @@ void init_debug_baked_texture_menu(LLMenuGL* menu)
         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)
+{
+        // Experimental feature toggles
+        {
+                /*
+                #ifdef RLV_EXPERIMENTAL
+                        LLMenuGL* sub_menu = new LLMenuGL("Experimental");
+
+                        menu->appendMenu(sub_menu);
+                #endif // RLV_EXPERIMENTAL
+                */
+        }
+
+        // Unit tests
+        {
+                #ifdef RLV_DEBUG_TESTS
+                        init_debug_rlva_tests_menu(menu);
+                #endif // RLV_DEBUG_TESTS
+        }
+
+        #ifdef RLV_EXTENSION_ENABLE_WEAR
+                if (gSavedSettings.controlExists(RLV_SETTING_ENABLEWEAR))
+                {
+                        menu->append(new LLMenuItemCheckGL("Enable Wear", menu_toggle_control, NULL, 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
+
+        #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)
 {
         {
@@ -1518,6 +1596,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);
@@ -1566,6 +1654,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.
@@ -1634,6 +1730,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();
         }
 };
@@ -1652,6 +1756,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;
         }
@@ -1713,7 +1823,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() );
 
@@ -1813,6 +1929,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();
@@ -1962,6 +2095,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;
         }
@@ -1989,7 +2138,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;
@@ -2036,6 +2188,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);
@@ -2056,6 +2211,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");
@@ -2104,34 +2265,190 @@ class LLObjectMute : public view_listener_t
         }
 };
 
+class LLObjectEnableCopyUUID : public view_listener_t
+{
+        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();
+
+        char buffer[UUID_STR_LENGTH];
+        id.toString(buffer);
+
+        
+                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)
+        {
+                LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+                bool new_value = (object != NULL);
+                if (new_value)
+                {
+                        LLVOAvatar* avatar = find_avatar_from_object(object); 
+                        new_value = (avatar == NULL);
+                }
+                if(new_value)
+                {
+                        
+                        struct ff : public LLSelectedNodeFunctor
+                        {
+                                ff(const LLSD& data) : LLSelectedNodeFunctor()
+                                ,userdata(data)
+                                {
+
+                                }
+                                const LLSD& userdata;
+                                virtual bool apply(LLSelectNode* node)
+                                {
+                                        if(gAgent.getID()!=node->mPermissions->getCreator())
+                                        {
+                                                llwarns<<"Incorrect permission to export"<<llendl;
+                                                return false;
+                                        }
+                                        return true;
+                                }
+                        };
+ 
+#ifdef LL_GRID_PERMISSIONS
+ 
+                        ff * the_ff=new ff(userdata);
+                        if(LLSelectMgr::getInstance()->getSelection()->applyToNodes(the_ff,false))
+                        {
+                                        gMenuHolder->findControl(userdata["control"].asString())->setValue(true);
+                        }
+                        else
+                        {
+                                        gMenuHolder->findControl(userdata["control"].asString())->setValue(false);
+                        }
+                        return true;    
+                }
+ 
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+#else
+                }
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(true);
+                return true;
+#endif
+
+        }
+};
+
+class LLObjectExport : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                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;
+        }
+};
+
+
+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]
+
         // 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);
-
-        LLViewerParcelMgr::getInstance()->deselectLand();
-
-        if (gAgent.getAvatarObject() && !gSavedSettings.getBOOL("AutoPilotLocksCamera"))
+        if (gSavedSettings.getBOOL("DoubleClickTeleport"))
         {
-                gAgent.setFocusGlobal(gAgent.getFocusTargetGlobal(), gAgent.getAvatarObject()->getID());
+                LLVector3d hips_offset(0.0f, 0.0f, 1.2f);
+                gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+                gAgent.teleportViaLocation(pos + hips_offset);
         }
-        else 
+        else
         {
-                // Snap camera back to behind avatar
-                gAgent.setFocusOnAvatar(TRUE, ANIMATE);
-        }
+                // 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();
 
-        // Could be first use
-        LLFirstUse::useGoTo();
+                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();
+        }
         return true;
 }
 
@@ -2188,6 +2505,12 @@ class LLAvatarFreeze : public view_listener_t
                 {
                         LLUUID* avatar_id = new LLUUID( 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]
 
                         if (!fullname.empty())
                         {
@@ -2213,7 +2536,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;
         }
@@ -2325,6 +2652,12 @@ class LLAvatarEject : public view_listener_t
                         MenuCallbackData *data = new MenuCallbackData;
                         (*data).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();
@@ -2406,6 +2739,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())
@@ -2655,6 +2995,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;
         }
@@ -2664,7 +3011,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;
         }
@@ -2839,6 +3189,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;
         }
@@ -2897,6 +3252,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);
@@ -2907,6 +3271,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());
@@ -2944,6 +3317,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();
 
@@ -3254,6 +3634,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();
@@ -3267,6 +3655,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;
         }
@@ -3652,6 +4047,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);
@@ -3667,6 +4067,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();
 
@@ -3736,6 +4139,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;
         }
@@ -3757,6 +4168,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;
@@ -3878,6 +4296,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++)
         {
@@ -4188,9 +4613,33 @@ class LLToolsEnableUnlink : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                bool new_value = LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
+                bool new_value = false;
+                if (LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
                         LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
-                        !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment();
+                        !LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment())
+                {
+                        if (LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() > 0 &&
+                                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;
         }
@@ -4200,6 +4649,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;
         }
@@ -4219,6 +4681,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;
@@ -4229,7 +4698,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;
         }
 };
@@ -4337,6 +4810,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;
         }
@@ -4346,6 +4828,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())
@@ -4377,6 +4868,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;
         }
@@ -4395,6 +4892,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();
@@ -4542,6 +5046,25 @@ void print_agent_nvpairs(void*)
         llinfos << "Camera at " << gAgent.getCameraPositionGlobal() << llendl;
 }
 
+class LLViewToggleAdvanced : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                toggle_debug_menus(NULL);
+                return true;
+        }
+};
+
+class LLViewCheckAdvanced : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                BOOL new_value = gSavedSettings.getBOOL("UseDebugMenus");
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+
 void show_debug_menus()
 {
         // this can get called at login screen where there is no menu so only toggle it if one exists
@@ -4725,6 +5248,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)
                 {
@@ -4832,6 +5361,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)
                 {
@@ -4845,6 +5381,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()))
                 {
@@ -4932,6 +5475,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;
         }
@@ -5120,6 +5669,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());
@@ -5182,6 +5737,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();
@@ -5297,6 +5856,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)
                         {
@@ -5356,6 +5922,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
@@ -5374,7 +5947,6 @@ class LLLandEdit : public view_listener_t
 
                 LLViewerParcelMgr::getInstance()->selectParcelAt( LLToolPie::getInstance()->getPick().mPosGlobal );
 
-                gFloaterTools->showMore(TRUE);
                 gFloaterView->bringToFront( gFloaterTools );
 
                 // Switch to land edit toolset
@@ -5441,6 +6013,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->getObject()))) || // 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;
@@ -5548,6 +6132,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,
@@ -5566,6 +6168,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() );
@@ -5648,6 +6257,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,
@@ -5731,7 +6351,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;
@@ -5751,6 +6374,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;
                 }
 
@@ -5773,6 +6410,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->getObject()))) ||       // 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();
@@ -5840,7 +6496,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
@@ -5848,6 +6510,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");
@@ -5983,6 +6651,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")
                 {
@@ -6043,7 +6721,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"));
@@ -6064,12 +6745,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 );
 }
@@ -6212,6 +6911,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);
 }
 
@@ -6258,7 +6973,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;
@@ -6461,6 +7181,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;
         }
@@ -6513,7 +7236,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
@@ -6598,6 +7325,17 @@ class LLToolsSelectBySurrounding : public view_listener_t
         }
 };
 
+class LLToolsShowSelectionHighlights : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLSelectMgr::sRenderSelectionHighlights = !LLSelectMgr::sRenderSelectionHighlights;
+                
+                gSavedSettings.setBOOL("RenderHighlightSelections", LLSelectMgr::sRenderSelectionHighlights);
+                return true;
+        }
+};
+
 class LLToolsShowHiddenSelection : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -7013,6 +7751,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;
         }
@@ -7060,6 +7805,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;
         }
@@ -7118,6 +7870,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;
         }
@@ -7215,6 +7976,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;
                 
@@ -7292,6 +8060,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()) {
@@ -7322,6 +8097,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;
         }
@@ -7509,6 +8291,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 //
@@ -9449,6 +10338,49 @@ class LLAvatarReportAbuse : public view_listener_t
 
 
 
+///////////////
+// RLVa Main //
+///////////////
+
+
+class RLVaMainToggle : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                rlvDbgToggleEnabled(NULL);
+                return true;
+        }
+};
+
+class RLVaMainCheck : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = rlvDbgGetEnabled(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);
@@ -9490,6 +10422,7 @@ void initialize_menus()
         addMenu(new LLViewMouselook(), "View.Mouselook");
         addMenu(new LLViewBuildMode(), "View.BuildMode");
         addMenu(new LLViewJoystickFlycam(), "View.JoystickFlycam");
+        addMenu(new LLViewCommunicate(), "View.Communicate");
         addMenu(new LLViewResetView(), "View.ResetView");
         addMenu(new LLViewLookAtLastChatter(), "View.LookAtLastChatter");
         addMenu(new LLViewShowHoverTips(), "View.ShowHoverTips");
@@ -9500,6 +10433,8 @@ void initialize_menus()
         addMenu(new LLViewZoomIn(), "View.ZoomIn");
         addMenu(new LLViewZoomDefault(), "View.ZoomDefault");
         addMenu(new LLViewFullscreen(), "View.Fullscreen");
+        addMenu(new LLViewToggleAdvanced(), "View.ToggleAdvanced");
+
 
         addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
         addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
@@ -9510,6 +10445,7 @@ void initialize_menus()
         addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
         addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
         addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
+        addMenu(new LLViewCheckAdvanced(), "View.CheckAdvanced");
 
         // World menu
         addMenu(new LLWorldChat(), "World.Chat");
@@ -9540,6 +10476,7 @@ void initialize_menus()
         addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects");
         addMenu(new LLToolsSelectOnlyCopyableObjects(), "Tools.SelectOnlyCopyableObjects");
         addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding");
+        addMenu(new LLToolsShowSelectionHighlights(), "Tools.ShowSelectionHighlights");
         addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection");
         addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius");
         addMenu(new LLToolsEditLinkedParts(), "Tools.EditLinkedParts");
@@ -9609,6 +10546,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");
@@ -9619,6 +10560,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");
@@ -9668,6 +10612,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(), "Emerald.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");
@@ -9813,4 +10763,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/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 9aa44fc..d5d9324 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -80,7 +80,6 @@
 #include "llfloaterland.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterlandholdings.h"
-#include "llfloatermap.h"
 #include "llurldispatcher.h"
 #include "llfloatermute.h"
 #include "llfloaterpostcard.h"
@@ -95,7 +94,6 @@
 #include "llinventoryview.h"
 #include "llmenugl.h"
 #include "llmutelist.h"
-#include "llnetmap.h"
 #include "llnotify.h"
 #include "llpanelgrouplandmoney.h"
 #include "llselectmgr.h"
@@ -142,6 +140,11 @@
 #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]
+
 //
 // Constants
 //
@@ -1009,8 +1012,17 @@ void inventory_offer_callback(S32 button, void* user_data)
                         std::string first_name, last_name;
                         if (gCacheName->getName(info->mFromID, first_name, last_name))
                         {
-                                from_string = std::string("An object named '") + info->mFromName + "' owned by " + first_name + " " + last_name;
-                                chatHistory_string = info->mFromName + " owned by " + first_name + " " + last_name;
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
+                                std::string full_name = first_name + " " + last_name;
+                                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
+                                {
+                                        full_name = gRlvHandler.getAnonym(full_name);
+                                }
+                                from_string = std::string("An object named '") + info->mFromName + "' owned by " + full_name;
+                                chatHistory_string = info->mFromName + " owned by " + full_name;
+// [/RLVa:KB]
+                                //from_string = std::string("An object named '") + info->mFromName + "' owned by " + first_name + " " + last_name;
+                                //chatHistory_string = info->mFromName + " owned by " + first_name + " " + last_name;
                         }
                         else
                         {
@@ -1029,6 +1041,21 @@ void inventory_offer_callback(S32 button, void* user_data)
         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.
@@ -1191,6 +1218,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]
         }
         
         LLStringUtil::format_map_t args;
@@ -1231,6 +1265,13 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
                 std::string first_name, last_name;
                 if (gCacheName->getName(info->mFromID, first_name, last_name))
                 {
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
+                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
+                        {
+                                first_name = gRlvHandler.getAnonym(first_name.append(" ").append(last_name));
+                                last_name.clear();
+                        }
+// [/RLVa:KB]
                         args["[FIRST]"] = first_name;
                         args["[LAST]"] = last_name;
                         name_found = TRUE;
@@ -1245,7 +1286,16 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
         else
         {
                 // *TODO:translate -> [FIRST] [LAST]
-                args["[NAME]"] = info->mFromName;
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
+                {
+                        args["[NAME]"] = gRlvHandler.getAnonym(info->mFromName);
+                }
+// [/RLVa:KB]
+                else
+                {
+                        args["[NAME]"] = info->mFromName;
+                }
                 LLNotifyBox::showXml("UserGiveItem", args,
                                                         &inventory_offer_callback, (void*)info);
         }
@@ -1413,7 +1463,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)
@@ -1470,6 +1533,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;
@@ -1485,6 +1563,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)
                         {
@@ -1690,6 +1777,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
                         {
@@ -1734,13 +1828,23 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
         case IM_INVENTORY_ACCEPTED:
         {
-                args["[NAME]"] = name;
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.0b
+                bool fRlvObfuscate = (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) &&
+                         (gRlvHandler.isAgentNearby(from_id)) && (!gAvatarInfoInstances.checkData(from_id));
+                args["[NAME]"] = (!fRlvObfuscate) ? name : gRlvHandler.getAnonym(name);
+// [/RLVa:KB]
+//              args["[NAME]"] = name;
                 LLNotifyBox::showXml("InventoryAccepted", args);
                 break;
         }
         case IM_INVENTORY_DECLINED:
         {
-                args["[NAME]"] = name;
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.0b
+                bool fRlvObfuscate = (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) &&
+                         (gRlvHandler.isAgentNearby(from_id)) && (!gAvatarInfoInstances.checkData(from_id));
+                args["[NAME]"] = (!fRlvObfuscate) ? name : gRlvHandler.getAnonym(name);
+// [/RLVa:KB]
+//              args["[NAME]"] = name;
                 LLNotifyBox::showXml("InventoryDeclined", args);
                 break;
         }
@@ -1774,6 +1878,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)
@@ -1804,15 +1924,51 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
         break;
 
         case IM_FROM_TASK:
-                if (is_busy && !is_owned_by_me)
                 {
-                        return;
+                        if (is_busy && !is_owned_by_me)
+                        {
+                                return;
+                        }
+                        chat.mText = 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();
+                        query_string["name"] = name;
+                        if (from_group)
+                        {
+                                query_string["groupowned"] = "true";
+                        }
+
+                        if (session_id.notNull())
+                        {
+                                chat.mFromID = session_id;
+                        }
+                        else
+                        {
+                                // This message originated on a region without the updated code for task id and slurl information.
+                                // We just need a unique ID for this object that isn't the owner ID.
+                                // If it is the owner ID it will overwrite the style that contains the link to that owner's profile.
+                                // This isn't ideal - it will make 1 style for all objects owned by the the same person/group.
+                                // This works because the only thing we can really do in this case is show the owner name and link to their profile.
+                                chat.mFromID = from_id ^ gAgent.getSessionID();
+                        }
+
+                        std::ostringstream link;
+                        link << "secondlife:///app/objectim/" << session_id
+                                        << LLURI::mapToQueryString(query_string);
+
+                        chat.mURL = link.str();
+
+                        // 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;
+                        LLFloaterChat::addChat(chat, FALSE, FALSE);
                 }
-                chat.mText = 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;
-                LLFloaterChat::addChat(chat, FALSE, FALSE);
                 break;
         case IM_FROM_TASK_AS_ALERT:
                 if (is_busy && !is_owned_by_me)
@@ -1820,6 +1976,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;
@@ -1852,12 +2019,48 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         }
                         else
                         {
-                                // *TODO:translate -> [FIRST] [LAST] (maybe)
-                                LLLureInfo* info = new LLLureInfo(from_id, session_id, FALSE);
-                                args["[NAME]"] = name;
-                                args["[MESSAGE]"] = message;
-                                LLNotifyBox::showXml("OfferTeleport", args,
-                                                                         lure_callback, (void*)info);
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-07 (RLVa-1.0.0d)
+                                if (rlv_handler_t::isEnabled())
+                                {
+                                        // Disallow if: 1) @tplure=n restricted (sender isn't an exception), or 2) @unsit=n restricted and currently sitting
+                                        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                                        if ( ( (gRlvHandler.hasBehaviour(RLV_BHVR_TPLURE)) && (!gRlvHandler.isException(RLV_BHVR_TPLURE, from_id)) ) || 
+                                                 ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (pAvatar) && (pAvatar->mIsSitting) ) )
+                                        {
+                                                rlvSendBusyMessage(from_id, rlv_handler_t::cstrMsgTpLure);
+                                                return;
+                                        }
+
+                                        // Censor teleport message if: 1) @revcim=n restricted (sender isn't an exception), or 2) @showloc=n restricted
+                                        if ( ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) && (!gRlvHandler.isException(RLV_BHVR_RECVIM, from_id)) ) ||
+                                                 (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+                                        {
+                                                message = rlv_handler_t::cstrHidden;
+                                        }
+                                }
+// [/RLVa:KB]
+
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-0.2.0b
+                                if ( (rlv_handler_t::isEnabled()) &&
+                                         ((gRlvHandler.hasBehaviour(RLV_BHVR_ACCEPTTP)) || (gRlvHandler.isException(RLV_BHVR_ACCEPTTP, from_id))) )
+                                {
+                                        gRlvHandler.setCanCancelTp(false);
+                                        // (see IM_GODLIKE_LURE_USER below)
+                                        LLLureInfo* info = new LLLureInfo(from_id, session_id, TRUE);
+                                        lure_callback(0, (void*)info);
+                                }
+                                else
+                                {
+// [/RLVa:KB]
+                                        // *TODO:translate -> [FIRST] [LAST] (maybe)
+                                        LLLureInfo* info = new LLLureInfo(from_id, session_id, FALSE);
+                                        args["[NAME]"] = name;
+                                        args["[MESSAGE]"] = message;
+                                        LLNotifyBox::showXml("OfferTeleport", args,
+                                                                                 lure_callback, (void*)info);
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-0.2.0b
+                                }
+// [/RLVa:KB]
                         }
                 }
                 break;
@@ -2202,8 +2405,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);
@@ -2236,6 +2444,50 @@ 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-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
+                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())) || (!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
@@ -2300,8 +2552,76 @@ 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-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
+                                if ( (rlv_handler_t::isEnabled()) && (mesg.length() > 3) && (RLV_CMD_PREFIX == mesg[0]) )
+                                {
+                                        mesg.erase(0, 1);
+                                        LLStringUtil::toLower(mesg);
+
+                                        std::string strExecuted, strFailed, strRetained, *pstr;
+
+                                        typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+                                        boost::char_separator<char> sep(",", "", boost::drop_empty_tokens);
+                                        tokenizer tokens(mesg, sep);
+                                        for (tokenizer::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;
@@ -2370,7 +2690,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);
         }
@@ -2405,7 +2728,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);
         }
@@ -2720,6 +3046,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());
@@ -2742,7 +3072,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());
@@ -2822,6 +3155,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;
@@ -2833,6 +3167,15 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
                         "ServerVersionChanged", display_release_notes, NULL);
         }
 
+        if (version_channel.find("OpenSim") != std::string::npos)
+        {
+                gSavedSettings.setBOOL("LoggedIntoOpenSim", TRUE);
+        }
+        else
+        {
+                gSavedSettings.setBOOL("LoggedIntoOpenSim", FALSE);
+        }
+
         gLastVersionChannel = version_channel;
 }
 
@@ -4322,7 +4665,13 @@ void notify_cautioned_script_question(LLScriptQuestionCBData* cbdata, S32 orig_q
                         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);
 
@@ -4527,8 +4876,31 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 
                 LLScriptQuestionCBData *cbdata = new LLScriptQuestionCBData(taskid, itemid, sender, questions, object_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("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"))
                 {
                         if (caution)
                         {
@@ -4820,6 +5192,21 @@ void handle_lure_callback(S32 option, const std::string& text, void* userdata)
 
         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);
@@ -4827,7 +5214,10 @@ void handle_lure_callback(S32 option, const std::string& text, void* userdata)
                 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(LLDynamicArray<LLUUID>::iterator itr = invitees->begin(); itr != invitees->end(); ++itr)
                 {
                         msg->nextBlockFast(_PREHASH_TargetData);
@@ -4857,8 +5247,28 @@ void handle_lure(LLDynamicArray<LLUUID>& ids)
 {
         LLDynamicArray<LLUUID>* userdata = new LLDynamicArray<LLUUID>(ids);
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-1.0.0a
+        // Only allow offering teleports if everyone is a @tplure exception or able to map this avie under @showloc=n
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+        {
+                for (LLDynamicArray<LLUUID>::iterator it = ids.begin(); it != ids.end(); ++it)
+                {
+                        const LLRelationship* pBuddyInfo = LLAvatarTracker::instance().getBuddyInfo(*it);
+                        if ( (!gRlvHandler.isException(RLV_BHVR_TPLURE, *it)) &&
+                                 ((!pBuddyInfo) || (!pBuddyInfo->isOnline()) || (!pBuddyInfo->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION))) )
+                        {
+                                delete userdata;
+                                return;
+                        }
+                }
+        }
+// [/RLVa:KB]
+
         LLStringUtil::format_map_t edit_args;
-        edit_args["[REGION]"] = gAgent.getRegion()->getName();
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-1.0.0a
+        edit_args["[REGION]"] = (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? gAgent.getRegion()->getName() : rlv_handler_t::cstrHidden;
+// [/RLVa:KB]
+        //edit_args["[REGION]"] = gAgent.getRegion()->getName();
         if (gAgent.isGodlike())
         {
                 gViewerWindow->alertXmlEditText("OfferTeleportFromGod", edit_args,
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index ca7055a..102b135 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -1006,6 +1006,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())
                                         {
@@ -1423,6 +1429,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);
                                 }
@@ -4795,7 +4807,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/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 78398bb..cf37058 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -74,6 +74,8 @@
 
 #include "llappviewer.h"
 
+#include "primbackup.h"
+
 extern F32 gMinObjectDistance;
 extern BOOL gAnimateTextures;
 
@@ -163,7 +165,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();
@@ -175,8 +177,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,
@@ -222,6 +223,11 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
 
         updateActive(objectp);
 
+        if(!just_created)
+                primbackup::getInstance()->prim_update(objectp);
+        
+
+
         if (just_created) 
         {
                 gPipeline.addObject(objectp);
@@ -251,6 +257,9 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
                 objectp->mCreateSelected = false;
                 gViewerWindow->getWindow()->decBusyCount();
                 gViewerWindow->getWindow()->setCursor( UI_CURSOR_ARROW );
+
+                primbackup::getInstance()->newprim(objectp);
+
         }
 }
 
@@ -827,17 +836,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)
 {
@@ -914,7 +916,7 @@ void LLViewerObjectList::killAllObjects()
         if (!mMapObjects.empty())
         {
                 llwarns << "Some objects still on map object list!" << llendl;
-                mMapObjects.clear();
+                mActiveObjects.clear();
         }
 }
 
@@ -1030,6 +1032,7 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
         LLColor4 group_own_below_water_color = 
                                                 gColors.getColor( "NetMapGroupOwnBelowWater" );
 
+        F32 max_radius = gSavedSettings.getF32("MiniMapPrimMaxRadius");
 
         for (S32 i = 0; i < mMapObjects.count(); i++)
         {
@@ -1045,6 +1048,9 @@ void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
 
                 F32 approx_radius = (scale.mV[VX] + scale.mV[VY]) * 0.5f * 0.5f * 1.3f;  // 1.3 is a fudge
 
+                // DEV-17370 - megaprims of size > 4096 cause lag.  (go figger.)
+                approx_radius = llmin(approx_radius, max_radius);
+
                 LLColor4U color = above_water_color;
                 if( objectp->permYouOwner() )
                 {
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 3e2cc19..76b752c 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -95,6 +95,13 @@ public:
                 }
                 else
                 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour("viewnote")) )
+                        {
+                                return;
+                        }
+// [/RLVa:KB]
+
                         // See if we can bring an existing preview to the front
                         if(!LLPreview::show(item->getUUID(), true))
                         {
@@ -893,51 +900,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)
                 {
@@ -956,8 +921,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;
@@ -999,6 +971,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;
@@ -1021,7 +1011,6 @@ BOOL LLViewerTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
                                 }
                         }
                 }
-
         
                 setCursorAtLocalPos( x, y, FALSE );
                 deselect();
@@ -1059,6 +1048,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 4cd5850..062808a 100644
--- a/linden/indra/newview/llviewertexteditor.h
+++ b/linden/indra/newview/llviewertexteditor.h
@@ -58,6 +58,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 72a8a80..95c6ae2 100644
--- a/linden/indra/newview/llviewerthrottle.cpp
+++ b/linden/indra/newview/llviewerthrottle.cpp
@@ -49,7 +49,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 9b2c566..2240d44 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -547,19 +547,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)
         {
@@ -567,7 +590,10 @@ 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();
@@ -576,9 +602,9 @@ BOOL LLViewerWindow::handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask
         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();
@@ -587,7 +613,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();
@@ -598,10 +624,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
@@ -610,215 +635,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;
-        }
-
-        if (gDisconnected)
-        {
-                return FALSE;
+                llinfos << buttonname << " Mouse " << buttonstatestr << " not handled by view" << llendl;
         }
-
-        if(LLToolMgr::getInstance()->getCurrentTool()->handleMouseDown( x, y, mask ) )
+        if (down)
         {
-                // 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);
 }
 
 
@@ -829,91 +734,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.
@@ -931,107 +755,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;
 }
 
@@ -1404,6 +1148,7 @@ LLViewerWindow::LLViewerWindow(
         mWindowRect(0, height, width, 0),
         mVirtualWindowRect(0, height, width, 0),
         mLeftMouseDown(FALSE),
+        mMiddleMouseDown(FALSE),
         mRightMouseDown(FALSE),
         mToolTip(NULL),
         mToolTipBlocked(FALSE),
@@ -2357,14 +2102,6 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
         }
 
         // Explicit hack for debug menu.
-        if ((MASK_ALT & mask) &&
-                (MASK_CONTROL & mask) &&
-                ('D' == key || 'd' == key))
-        {
-                toggle_debug_menus(NULL);
-        }
-
-                // Explicit hack for debug menu.
         if ((mask == (MASK_SHIFT | MASK_CONTROL)) &&
                 ('G' == key || 'g' == key))
         {
@@ -3256,6 +2993,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();
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index ab2dd4e..40368f8 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -47,6 +47,7 @@
 #include "lltimer.h"
 #include "llstat.h"
 #include "llalertdialog.h"
+#include "llmousehandler.h"
 
 class LLView;
 class LLViewerObject;
@@ -57,7 +58,6 @@ class LLVelocityBar;
 class LLTextBox;
 class LLImageRaw;
 class LLHUDIcon;
-class LLMouseHandler;
 
 #define PICK_HALF_WIDTH 5
 #define PICK_DIAMETER (2 * PICK_HALF_WIDTH + 1)
@@ -81,7 +81,7 @@ public:
 
         static bool isFlora(LLViewerObject* object);
 
-        typedef enum e_pick_type
+        typedef enum
         {
                 PICK_OBJECT,
                 PICK_FLORA,
@@ -150,6 +150,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);
@@ -212,6 +213,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; }
@@ -279,7 +281,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,
@@ -397,6 +399,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 bc7a2f4..cd8d1c0 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -79,8 +79,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 3d2523e..24272d8 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -125,6 +125,10 @@
 #include "llvoicevisualizer.h" 
 #include "llvoiceclient.h"
 
+// [RLVa:KB]
+#include "llstartup.h"
+// [/RLVa:KB]
+
 LLXmlTree LLVOAvatar::sXMLTree;
 LLXmlTree LLVOAvatar::sSkeletonXMLTree;
 LLVOAvatarSkeletonInfo* LLVOAvatar::sSkeletonInfo = NULL;
@@ -2093,9 +2097,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);
@@ -2150,9 +2160,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(), 
@@ -2171,6 +2187,7 @@ 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);
@@ -2230,8 +2247,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(), 
@@ -3089,10 +3111,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
@@ -3113,7 +3141,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;
@@ -3218,10 +3257,11 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 || is_appearance != mNameAppearance)
                         {
                                 std::string line;
+
                                 if (title && title->getString() && title->getString()[0] != '\0')
                                 {
                                         line += title->getString();
-                                        LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR);
+                                        //LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR); IMP-136 -- MC
                                         line += "\n";
                                         line += firstname->getString();
                                 }
@@ -3232,6 +3272,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)
@@ -3272,7 +3321,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 mNameMute = is_muted;
                                 mNameAppearance = is_appearance;
                                 mTitle = title ? title->getString() : "";
-                                LLStringFn::replace_nonprintable(mTitle,LL_UNKNOWN_CHAR);
+                                //LLStringFn::replace_nonprintable(mTitle,LL_UNKNOWN_CHAR); IMP-136 -- MC
                                 mNameString = utf8str_to_wstring(line);
                                 new_name = TRUE;
                         }
@@ -6328,6 +6377,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();
@@ -6383,6 +6466,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)
@@ -6441,6 +6532,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();
@@ -6502,6 +6601,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/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index 4e7816c..79addbb 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -71,6 +71,8 @@ F32 w_mod[GRASS_MAX_BLADES];					//  Factor to modulate wind movement by to rand
 LLVOGrass::SpeciesMap LLVOGrass::sSpeciesTable;
 S32 LLVOGrass::sMaxGrassSpecies = 0;
 
+LLVOGrass::SpeciesNames LLVOGrass::sSpeciesNames;
+
 
 LLVOGrass::LLVOGrass(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
 :       LLAlphaObject(id, pcode, regionp)
@@ -201,11 +203,16 @@ void LLVOGrass::initClass()
 
                 if (species >= sMaxGrassSpecies) sMaxGrassSpecies = species + 1;
 
+                std::string name;
+                static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
+                success &= grass_def->getFastAttributeString(name_string, name);
+                sSpeciesNames[name] = species;
+
                 if (!success)
                 {
-                        std::string name;
+                        /*std::string name;
                         static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
-                        grass_def->getFastAttributeString(name_string, name);
+                        grass_def->getFastAttributeString(name_string, name);*/
                         llwarns << "Incomplete definition of grass " << name << llendl;
                 }
         }
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index 95197a5..de700bd 100644
--- a/linden/indra/newview/llvograss.h
+++ b/linden/indra/newview/llvograss.h
@@ -116,6 +116,9 @@ public:
         F32                                       mBladeWindAngle;
         F32                                       mBWAOverlap;
 
+        typedef std::map<std::string, S32> SpeciesNames;
+        static SpeciesNames sSpeciesNames;
+
 protected:
         ~LLVOGrass();
 
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 23c92ea..e1c3542 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -77,6 +77,9 @@ F32 LLVOTree::sTreeFactor = 1.f;
 LLVOTree::SpeciesMap LLVOTree::sSpeciesTable;
 S32 LLVOTree::sMaxTreeSpecies = 0;
 
+LLVOTree::SpeciesNames LLVOTree::sSpeciesNames;
+
+
 // Tree variables and functions
 
 LLVOTree::LLVOTree(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp):
@@ -230,11 +233,16 @@ void LLVOTree::initClass()
 
                         if (species >= sMaxTreeSpecies) sMaxTreeSpecies = species + 1;
 
+                        std::string name;
+                        static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
+                        success &= tree_def->getFastAttributeString(name_string, name);
+                        sSpeciesNames[name] = species;
+
                         if (!success)
                         {
-                                std::string name;
-                                static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
-                                tree_def->getFastAttributeString(name_string, name);
+                                //std::string name;
+                                //static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name");
+                                //tree_def->getFastAttributeString(name_string, name);
                                 llwarns << "Incomplete definition of tree " << name << llendl;
                         }
                 }
diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h
index f34371e..055cfa3 100644
--- a/linden/indra/newview/llvotree.h
+++ b/linden/indra/newview/llvotree.h
@@ -120,6 +120,9 @@ public:
 
         static F32 sTreeFactor;                 // Tree level of detail factor
 
+        typedef std::map<std::string, S32> SpeciesNames;
+        static SpeciesNames sSpeciesNames;
+
         friend class LLDrawPoolTree;
 protected:
         LLVector3               mTrunkBend;             // Accumulated wind (used for blowing trees)
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index ad44356..adf82cd 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -1942,7 +1942,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()))
         {
@@ -2084,10 +2088,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/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
new file mode 100644
index 0000000..591b413
--- /dev/null
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -0,0 +1,267 @@
+/**
+* @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 "llfloaterwindlight.h"
+#include "lloverlaybar.h"
+#include "lluictrlfactory.h"
+#include "llwlparammanager.h"
+#include "llviewercontrol.h"
+
+
+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");
+                }
+        }
+
+        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("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("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 c1723f7..ba3d070 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -62,6 +62,7 @@
 #include "curl/curl.h"
 
 LLWLParamManager * LLWLParamManager::sInstance = NULL;
+std::vector<LLWLPresetsObserver*> LLWLParamManager::sObservers;
 
 LLWLParamManager::LLWLParamManager() :
 
@@ -238,6 +239,8 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
                 getParamSet(name, mCurParams);
                 propagateParameters();
         }
+
+        notifyObservers();
 }       
 
 void LLWLParamManager::savePreset(const std::string & name)
@@ -264,6 +267,7 @@ void LLWLParamManager::savePreset(const std::string & name)
         presetsXML.close();
 
         propagateParameters();
+        notifyObservers();
 }
 
 void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
@@ -538,6 +542,8 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
                 gDirUtilp->deleteFilesInDir(path_name, escaped_name + ".xml");
         }
 
+        notifyObservers();
+
         return true;
 }
 
@@ -566,3 +572,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 1d9291c..355d3e3 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -40,6 +40,13 @@
 #include "llviewercamera.h"
 
 class LLGLSLShader;
+
+class LLWLPresetsObserver
+{
+public:
+        virtual ~LLWLPresetsObserver() { };
+        virtual void changed() = 0;
+};
  
 // color control
 struct WLColorControl {
@@ -195,6 +202,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
@@ -249,12 +261,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/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 2ded35a..947bdfd 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -49,6 +49,7 @@
 #include "llfloatermap.h"
 #include "llfloaterworldmap.h"
 #include "llfocusmgr.h"
+//#include "llmutelist.h" info not being sent
 #include "lltextbox.h"
 #include "lltextureview.h"
 #include "lltracker.h"
@@ -608,7 +609,11 @@ void LLWorldMapView::draw()
                         gGL.end();
                 }
 
-                // If this is mature, and you are not, draw a line across it
+                // As part of the AO project, we no longer want to draw access indicators;
+                // it's too complicated to get all the rules straight and will only 
+                // cause confusion.
+                /**********************
+                 // If this is mature, and you are not, draw a line across it
                 if (info->mAccess != SIM_ACCESS_DOWN
                         && info->mAccess > SIM_ACCESS_PG
                         && gAgent.isTeen())
@@ -624,6 +629,7 @@ void LLWorldMapView::draw()
                                 gGL.vertex2f(right, top);
                         gGL.end();
                 }
+                 **********************/
 
                 // Draw the region name in the lower left corner
                 LLFontGL* font = LLFontGL::sSansSerifSmall;
@@ -642,10 +648,44 @@ 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;
@@ -869,7 +909,9 @@ void LLWorldMapView::drawAgents()
         F32 agents_scale = (gMapScale * 0.9f) / 256.f;
         
         LLColor4 avatar_color = gColors.getColor( "MapAvatar" );
-        LLColor4 friend_color = gColors.getColor( "MapFriend" );
+        /*LLColor4 friend_color = gColors.getColor( "MapFriend" );
+        LLColor4 muted_color = gColors.getColor( "MapMuted" );
+        LLColor4 glyph_color;*/
 
         for (handle_list_t::iterator iter = mVisibleRegions.begin(); iter != mVisibleRegions.end(); ++iter)
         {
@@ -892,7 +934,18 @@ void LLWorldMapView::drawAgents()
                                 S32 agent_count = info.mExtra;
                                 sim_agent_count += info.mExtra;
                                 // Here's how we'd choose the color if info.mID were available but it's not being sent:
-                                //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? friend_color : avatar_color;
+                                /*if (agent_count == 1 && LLMuteList::getInstance()->isMuted(info.mID))
+                                {
+                                        glyph_color = muted_color;
+                                }
+                                else if (agent_count == 1 && is_agent_friend(info.mID))
+                                {
+                                        glyph_color = friend_color;
+                                }
+                                else
+                                {
+                                        glyph_color = avatar_color;
+                                }*/
                                 drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, avatar_color);
                         }
                         LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim
@@ -908,7 +961,7 @@ void LLWorldMapView::drawAgents()
                                 region_center[VY] += REGION_WIDTH_METERS / 2;
                                 // Reduce the stack size as you zoom out - always display at lease one agent where there is one or more
                                 S32 agent_count = (S32)(((num_agents-1) * agents_scale + (num_agents-1) * 0.1f)+.1f) + 1;
-                                drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, glyph_color_avatar);
+                                drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, avatar_color);
                         }
                 }
         }
@@ -1058,7 +1111,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,
@@ -1118,7 +1174,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)
@@ -1137,11 +1196,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";
                                 }
                         }
                 }
@@ -1184,6 +1243,9 @@ static void drawDot(F32 x_pixels, F32 y_pixels,
         }
         else
         {
+                // Draw V indicator for above or below
+                // *TODO: Replace this vector drawing with icons
+                
                 F32 left =              x_pixels - dot_radius;
                 F32 right =             x_pixels + dot_radius;
                 F32 center = (left + right) * 0.5f;
@@ -1192,13 +1254,14 @@ static void drawDot(F32 x_pixels, F32 y_pixels,
 
                 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4fv( color.mV );
-                LLUI::setLineWidth(1.5f);
-                F32 h_bar = relative_z > HEIGHT_THRESHOLD ? top : bottom; // horizontal bar Y
+                LLUI::setLineWidth(3.0f);
+                F32 point = relative_z > HEIGHT_THRESHOLD ? top : bottom; // Y pos of the point of the V
+                F32 back = relative_z > HEIGHT_THRESHOLD ? bottom : top; // Y pos of the ends of the V
                 gGL.begin( LLRender::LINES );
-                        gGL.vertex2f(center, top);
-                        gGL.vertex2f(left, h_bar);
-                        gGL.vertex2f(right, h_bar);
-                        gGL.vertex2f(right, bottom);
+                        gGL.vertex2f(left, back);
+                        gGL.vertex2f(center, point);
+                        gGL.vertex2f(center, point);
+                        gGL.vertex2f(right, back);
                 gGL.end();
                 LLUI::setLineWidth(1.0f);
         }
diff --git a/linden/indra/newview/llworldmapview.h b/linden/indra/newview/llworldmapview.h
index 6dbaa8d..b6ab855 100644
--- a/linden/indra/newview/llworldmapview.h
+++ b/linden/indra/newview/llworldmapview.h
@@ -105,7 +105,7 @@ public:
                                                                         F32 y_pixels, 
                                                                         const LLColor4& color,
                                                                         F32 relative_z = 0.f,
-                                                                        F32 dot_radius = 3.f);
+                                                                        F32 dot_radius = 5.f);
 
         static void             drawTrackingCircle( const LLRect& rect, S32 x, S32 y, 
                                                                                 const LLColor4& color, 
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 87b810c..67af961 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -1795,8 +1795,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;
                 }
diff --git a/linden/indra/newview/primbackup.cpp b/linden/indra/newview/primbackup.cpp
new file mode 100644
index 0000000..78fd482
--- /dev/null
+++ b/linden/indra/newview/primbackup.cpp
@@ -0,0 +1,1105 @@
+
+#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);
+}
+
+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)
+                                                {
+                                                        if(gAgent.getID()!=node->mPermissions->getOwner())
+                                                        {
+                                                                #ifdef LL_GRID_PERMISSIONS
+                                                                        return false;
+                                                                #else
+                                                                        return true;
+                                                                #endif
+                                                        }
+                                                        else if(581632==node->mPermissions->getMaskOwner() || 2147483647==node->mPermissions->getMaskOwner())
+                                                        {
+                                                                return true;
+                                                        }
+                                                        return false;
+                                                }
+                                } 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;
+                        }
+
+                        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..fddc35f
--- /dev/null
+++ b/linden/indra/newview/primbackup.h
@@ -0,0 +1,132 @@
+
+#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();
+
+        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/rlvevent.h b/linden/indra/newview/rlvevent.h
new file mode 100644
index 0000000..c3d9c45
--- /dev/null
+++ b/linden/indra/newview/rlvevent.h
@@ -0,0 +1,224 @@
+#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 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) || ((RLV_TYPE_ADD != rlvCmd.getParamType()) && (RLV_TYPE_REMOVE != rlvCmd.getParamType())) )
+                        return;
+
+                std::string strCmd = rlvCmd.asString();
+                std::string strNotify = llformat("/%s=%c", strCmd.c_str(), (RLV_TYPE_ADD == rlvCmd.getParamType()) ? 'n' : 'y');
+
+                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..6f79636
--- /dev/null
+++ b/linden/indra/newview/rlvextensions.cpp
@@ -0,0 +1,454 @@
+#include "llviewerprecompiledheaders.h"
+#include "llagent.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;
+
+// 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_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-06-03 (RLVa-0.2.0h) | Added: RLVa-0.2.0h
+std::string RlvExtGetSet::onGetPseudoDebug(const std::string& strSetting)
+{
+        // Skip sanity checking because it's all done in RlvExtGetSet::onGetDebug() already
+        if ("AvatarSex" == strSetting)
+        {
+                if (gAgent.getAvatarObject())
+                        return llformat("%d", (gAgent.getAvatarObject()->getSex() == SEX_MALE)); // [See LLFloaterCustomize::LLFloaterCustomize()]
+        }
+        return std::string();
+}
+
+// Checked: 2009-06-03 (RLVa-0.2.0h) | Modified: RLVa-0.2.0h
+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 );
+                        }
+                }
+        }
+}
+
+std::string RlvExtGetSet::onGetEnv(std::string strSetting)
+{
+        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 * 1000;
+        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() - 2, 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->b;
+                                else if ('g' == ch)     nValue = pColour->b;
+                                else if ('b' == ch)     nValue = pColour->b;
+                                else if (('i' == ch) && (pColour->hasSliderName)) nValue = pColour->i;
+
+                                if (pColour->isBlueHorizonOrDensity)    nValue /= 2.0f;
+                                else if (pColour->isSunOrAmbientColor)  nValue /= 3.0f;
+                        }
+                }
+        }
+
+        return llformat("%f", nValue);
+}
+
+void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
+{
+        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() - 2, 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..5c10c58
--- /dev/null
+++ b/linden/indra/newview/rlvextensions.h
@@ -0,0 +1,43 @@
+#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);
+
+        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 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..2915002
--- /dev/null
+++ b/linden/indra/newview/rlvhandler.cpp
@@ -0,0 +1,2549 @@
+#include "llviewerprecompiledheaders.h"
+#include "llagent.h"
+#include "lldrawpoolalpha.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::iterator itTok = tokens.begin();
+
+        // Extract and sanity check the first token (required) which is the channel
+        if ( (itTok == tokens.end()) || (!LLStringUtil::convertToS32(*itTok, nChannel)) || (!rlvIsValidChannel(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-05-31 (RLVa-0.2.0e) | Modified: RLVa-0.2.0e
+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)
+        {
+                // Sanity check - make sure it's not already marked undetachable by this object (NOTE: m_Attachments is a *multimap*, not a map)
+                for (rlv_detach_map_t::const_iterator itAttach = m_Attachments.lower_bound(idxAttachPt), 
+                                endAttach = m_Attachments.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
+                {
+                        if (itObj->second.m_UUID == itAttach->second)
+                                return false;
+                }
+
+                m_Attachments.insert(std::pair<S32, LLUUID>(idxAttachPt, itObj->second.m_UUID));
+                return true;
+        }
+        else
+        {
+                // NOTE: m_Attachments is a *multimap*, not a map
+                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 (-1 != pItem->getName().find(RLV_FOLDER_FLAG_NOSTRIP))
+                                        return false;
+
+                                LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID());
+                                if ( (pFolder) && (-1 != pFolder->getName().find(RLV_FOLDER_FLAG_NOSTRIP)) )
+                                        return false;
+                        }
+                }
+                return true;
+        }
+#endif // RLV_EXTENSION_FLAG_NOSTRIP
+
+// ============================================================================
+// Behaviour related functions
+//
+
+bool RlvHandler::hasBehaviourExcept(const std::string& strBehaviour, 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(strBehaviour)) )
+                        return true;
+        return false;
+}
+
+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)) )
+                        return true;
+        return false;
+}
+
+bool RlvHandler::hasBehaviourExcept(const std::string& strBehaviour, 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(strBehaviour, strOption)) )
+                        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_FORCE:            // Checked:
+                        fRet = processForceCommand(uuid, rlvCmd);
+                        break;
+                case RLV_TYPE_REPLY:            // Checked:
+                        fRet = processReplyCommand(uuid, rlvCmd);
+                        break;
+                case RLV_TYPE_UNKNOWN:          // Checked:
+                        {
+                                if ("clear" == rlvCmd.getBehaviour())
+                                {
+                                        const std::string& strFilter = rlvCmd.getParam(); std::string strCmdRem;
+
+                                        rlv_object_map_t::const_iterator itObj = m_Objects.find(uuid);
+                                        if (itObj != m_Objects.end())   // No sense in @clear'ing 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;
+                                                        if ( (strFilter.empty()) || (-1 != rlvCmdRem.asString().find(strFilter)) )
+                                                        {
+                                                                fContinue = (rlvObj.m_Commands.size() > 1); // rlvObj will become invalid once we remove the last command
+                                                                strCmdRem = rlvCmdRem.getBehaviour() + ":" + rlvCmdRem.getOption() + "=y";
+                                                                processCommand(uuid, strCmdRem, false);
+                                                        }
+                                                }
+                                                fRet = TRUE;
+                                        }
+                                }
+                        }
+                        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()) )
+                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_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.isNull())      // If there's an option it should be a valid UUID
+                                {
+                                        addException(eBehaviour, LLUUID(strOption));
+
+                                        // 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_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
+                        {
+                                addException(eBehaviour, LLUUID(strOption));
+                        }
+                        break;
+                default:
+                        {
+                                // Give our observers a chance to handle any command we don't
+                                RlvEvent rlvEvent(uuid, rlvCmd);
+                                m_Emitter.update(&RlvObserver::onAddCommand, rlvEvent);
+                        }
+                        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()) )
+                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;
+                                if (strOption.empty())                                                                                          // @detach=y
+                                {
+                                        // The object may or may not (if it got detached) still exist so clean up the hard way
+                                        if (m_Objects.find(uuid) != m_Objects.end())
+                                        {
+                                                for (rlv_detach_map_t::const_iterator itAttach = m_Attachments.begin(), endAttach = m_Attachments.end();
+                                                        itAttach != endAttach; ++itAttach)
+                                                {
+                                                        if (itAttach->second == uuid)
+                                                        {
+                                                                setDetachable(itAttach->first, uuid, true); // <- invalidates our iterators on return
+                                                                break;
+                                                        }
+                                                }
+                                        }
+                                }
+                                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.isNull())      // If there's an option it should be a valid UUID
+                                {
+                                        removeException(eBehaviour, LLUUID(strOption));
+
+                                        // 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_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
+                        {
+                                removeException(eBehaviour, LLUUID(strOption));
+                        }
+                        break;
+                default:
+                        {
+                                // Give our observers a chance to handle any command we don't
+                                RlvEvent rlvEvent(uuid, rlvCmd);
+                                m_Emitter.update(&RlvObserver::onRemoveCommand, rlvEvent);
+                        }
+                        break;
+        }
+        return TRUE; // Remove commands don't fail, doesn't matter what we return here
+}
+
+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;
+
+                                        typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+                                        boost::char_separator<char> sep("/", "", boost::keep_empty_tokens);
+                                        tokenizer tokens(strOption, sep); int idx = 0;
+                                        for (tokenizer::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;
+                default:
+                        {
+                                // Give our observers a chance to handle any command we don't
+                                RlvEvent rlvEvent(idObj, rlvCmd);
+                                fHandled = m_Emitter.update(&RlvObserver::onForceCommand, rlvEvent);
+                        }
+                        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_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-07-12 (RLVa-1.0.0h)
+                        {
+                                // 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
+                                        int maxSlashes = 0, 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;
+                default:
+                        {
+                                // Give our observers a chance to handle any command we don't
+                                RlvEvent rlvEvent(uuid, rlvCmd);
+                                return m_Emitter.update(&RlvObserver::onReplyCommand, rlvEvent);
+                        }
+                        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())
+        {
+                // 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))
+                {
+                        // (Copy/paste from processAddCommand)
+                        setDetachable(pObj, 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
+                                LLInventoryModel::cat_array_t*  pFolders;
+                                LLInventoryModel::item_array_t* pItems;
+                                gInventory.getDirectDescendentsOf(pFolder->getUUID(), pFolders, pItems);
+
+                                if (pItems)
+                                {
+                                        int cntObjects = 0;
+                                        for (S32 idxItem = 0, cntItem = pItems->size(); idxItem < cntItem; idxItem++)
+                                        {
+                                                if (LLAssetType::AT_OBJECT == pItems->get(idxItem)->getType())
+                                                        cntObjects++;
+                                        }
+
+                                        // Only rename if there's exactly 1 object/attachment inside of it [see LLFolderBridge::renameItem()]
+                                        if ( (1 == cntObjects) && (NEW_CATEGORY_NAME == pFolder->getName()) )
+                                        {
+                                                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("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("sendchannel");
+        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())) ||
+                                   ((fIsEmote) && (RLV_BHVR_REDIREMOTE == itCmd->getBehaviourType())) ) && 
+                                 ( (!fSendChannel) || (hasBehaviour("sendchannel", itCmd->getOption())) ) )
+                        {
+                                rlvSendChatReply(itCmd->getOption(), 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)
+        typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+        boost::char_separator<char> sep("/", "", boost::drop_empty_tokens);
+        tokenizer tokens(strPath, sep);
+        for (tokenizer::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;
+
+                // Only strip clothing (that's currently worn and not marked "nostrip")
+                if ( (LLAssetType::AT_CLOTHING != LLWearable::typeToAssetType(type)) || 
+                         (!gAgent.getWearable(type)) || (!isStrippable(gAgent.getWearableItem(type))) )
+                {
+                        continue;
+                }
+
+                if ( (typeOption == type) || (strOption.empty()) )
+                {
+                        #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->getObject())) )
+                                                                {
+                                                                        #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 TRUE;
+}
+
+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..df3ff9b
--- /dev/null
+++ b/linden/indra/newview/rlvhandler.h
@@ -0,0 +1,462 @@
+#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"
+
+// ============================================================================
+/*
+ * RlvHandler
+ * ==========
+ *
+ */
+
+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<LLUUID, ERlvBehaviour> rlv_exception_map_t;
+typedef std::map<S32, RlvRedirInfo> rlv_redir_map_t;
+
+class RlvHandler
+{
+public:
+        RlvHandler();
+        ~RlvHandler();
+
+        // --------------------------------
+
+        /*
+         * Rule checking 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;
+
+        // Returns TRUE is at least one object contains the specified behaviour (and optional parameter)
+        // NOTE: - to check @detach=n    -> hasLockedAttachment() / hasLockedHUD() / isDetachable()
+        //       - to check @addoutfit=n -> isWearable()
+        //       - to check @remoutfit=n -> isRemovable()
+        //       - to check exceptions   -> isException()
+        //  (You *can* use hasBehaviour(); the specialized ones just don't have to iterate over all the objects)
+        bool hasBehaviour(ERlvBehaviour eBehaviour) const { return (eBehaviour < RLV_BHVR_COUNT) ? (0 != m_Behaviours[eBehaviour]) : false; }
+        bool hasBehaviour(const std::string& strBehaviour) const;
+        bool hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption) const;
+        bool hasBehaviour(const std::string& strBehaviour, const std::string& strOption) const;
+
+        // Returns TRUE if at least one object (except the specified one) contains the specified behaviour
+        bool hasBehaviourExcept(ERlvBehaviour eBehaviour, const LLUUID& idObj) const;
+        bool hasBehaviourExcept(const std::string& strBehaviour, const LLUUID& uuid) const;
+        bool hasBehaviourExcept(ERlvBehaviour eBehaviour, const std::string& strOption, const LLUUID& idObj) const;
+        bool hasBehaviourExcept(const std::string& strBehaviour, const std::string& strOption, const LLUUID& idObj) const;
+
+        // Returns TRUE if there is at least 1 undetachable attachment
+        bool hasLockedAttachment() const { return (0 != m_Attachments.size()); }
+        // Returns TRUE if there is at least 1 undetachable 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(LLViewerObject* pObj) const;
+        // Returns TRUE if the specified attachment point is set undetachable by anything other than pObj (or one of its children)
+        bool isDetachableExcept(S32 idxAttachPt, LLViewerObject* pObj) const;
+        // Marks the specified attachment point as (un)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 restriction
+        void addException(ERlvBehaviour eBehaviour, const LLUUID& uuid);
+        void removeException(ERlvBehaviour eBehaviour, const LLUUID& uuid);
+        // Returns TRUE is the specified UUID is exempt from a restriction (tplure/sendim/recvim/etc)
+        bool isException(ERlvBehaviour eBehaviour, const LLUUID& uuid) const;
+        bool isException(const std::string& strBehaviour, const LLUUID& uuid) 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
+        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 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;
+        rlv_redir_map_t      m_Redirections;
+        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-07-09 (RLVa-1.0.0f)
+inline void RlvHandler::addException(ERlvBehaviour eBehaviour, const LLUUID& uuid)
+{
+        if (!uuid.isNull())
+                m_Exceptions.insert(std::pair<LLUUID, ERlvBehaviour>(uuid, eBehaviour));
+}
+
+// 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())) ) );
+}
+
+// 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-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::hasBehaviour(const std::string& strBehaviour) const
+{
+        return hasBehaviourExcept(strBehaviour, LLUUID::null);
+}
+
+// Checked:
+inline bool RlvHandler::hasBehaviour(const std::string& strBehaviour, const std::string& strOption) const
+{
+        return hasBehaviourExcept(strBehaviour, 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-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)));
+}
+
+// Checked:
+inline bool RlvHandler::isException(ERlvBehaviour eBehaviour, const LLUUID& uuid) const
+{
+        for (rlv_exception_map_t::const_iterator itException = m_Exceptions.lower_bound(uuid), 
+                        endException = m_Exceptions.upper_bound(uuid); itException != endException; ++itException)
+        {
+                if (itException->second == eBehaviour)
+                        return true;
+        }
+        return false;
+}
+
+// Checked:
+inline bool RlvHandler::isException(const std::string& strBehaviour, const LLUUID& uuid) const
+{
+        return hasBehaviour(strBehaviour, uuid.asString());
+}
+
+// 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-07-09 (RLVa-1.0.0f)
+inline void RlvHandler::removeException(ERlvBehaviour eBehaviour, const LLUUID &uuid)
+{
+        if (!uuid.isNull())
+        {
+                for (rlv_exception_map_t::iterator itException = m_Exceptions.lower_bound(uuid), 
+                                endException = m_Exceptions.upper_bound(uuid); itException != endException; ++itException)
+                {
+                        if (itException->second == eBehaviour)
+                        {
+                                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..6b2a1a0
--- /dev/null
+++ b/linden/indra/newview/rlvhelper.cpp
@@ -0,0 +1,674 @@
+#include "llviewerprecompiledheaders.h"
+#include "llagent.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
+//
+
+RlvMultiStringSearch RlvCommand::m_BhvrLookup;
+
+// ============================================================================
+
+// Checked:
+RlvCommand::RlvCommand(const std::string& strCommand)
+        : m_eBehaviour(RLV_BHVR_UNKNOWN), m_eParamType(RLV_TYPE_UNKNOWN)
+{
+        if ((m_fValid = parseCommand(strCommand, m_strBehaviour, m_strOption, m_strParam)))
+        {
+                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
+                {
+                        m_eParamType = RLV_TYPE_REPLY; // Assume it's a reply command until we encounter a non-digit
+
+                        if ( (m_strParam.empty()) || (-1 != m_strParam.find_first_not_of("0123456789")) )
+                        {
+                                m_eParamType = RLV_TYPE_UNKNOWN;
+                                m_fValid = ("clear" == m_strBehaviour);
+                        }
+                }
+        }
+
+        if (!m_fValid)
+        {
+                m_strBehaviour = m_strOption = m_strParam = "";
+                return;
+        }
+
+        U16 nBehaviour;
+        if (m_BhvrLookup.getExactMatchParam(m_strBehaviour, nBehaviour))
+        {
+                m_eBehaviour = (ERlvBehaviour)nBehaviour;
+        }
+}
+
+RlvCommand::RlvCommand(const RlvCommand& rlvCmd)
+        : m_fValid(rlvCmd.m_fValid),
+          m_strBehaviour(rlvCmd.m_strBehaviour), m_eBehaviour(rlvCmd.m_eBehaviour),     
+          m_strOption(rlvCmd.m_strOption),
+          m_strParam(rlvCmd.m_strParam), m_eParamType(rlvCmd.m_eParamType)
+{
+}
+
+// ============================================================================
+
+/*
+ * ------------------------------
+ * Command           | RLV | RLVa
+ * ------------------------------
+ * :                 |  F  |  F  (missing behaviour)
+ * :option           |  F  |  F  (missing behaviour)
+ * :=                |  T  |  F  (missing behaviour)
+ * :option=          |  T  |  F  (missing behaviour)
+ * :option=param     |  T  |  F  (missing behaviour)
+ * =                 |  T  |  F  (missing behaviour)
+ * =param            |  T  |  F  (missing behaviour)
+ * cmd               |  F  |  F  (missing param) [T if <behaviour> == "clear"]
+ * cmd:              |  F  |  F  (missing param)
+ * cmd:option        |  F  |  F  (missing param)
+ * cmd:=             |  T  |  F  (missing param) [1]
+ * cmd:option=       |  T  |  F  (missing param) [1]
+ * cmd=              |  T  |  F  (missing param) [1]
+ * cmd:option=param  |  T  |  T
+ * cmd=param         |  T  |  T
+ * cmd:=param        |  T  |  T
+ *
+ * [1] 'clear:=', 'clear:option=' and 'clear=' are "valid" variations of 'clear'
+ */
+
+BOOL RlvCommand::parseCommand(/*[in]*/ const std::string& strCommand,  
+        /*[out]*/ std::string& strBehaviour, /*[out]*/ std::string& strOption, /*[out]*/ std::string& strParam)
+{
+        // 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 match with the enumeration at all times
+                std::string arBehaviours[RLV_BHVR_COUNT] =
+                        {
+                                "version", "detach", "redirchat", "rediremote", "sendim", "recvchat", "recvemote", "recvim", "tploc", "tplure", 
+                                "sittp", "edit", "rez", "addoutfit", "remoutfit", "getoutfit", "getattach", "showinv", "unsit", "sit",
+                                "getstatus", "getstatusall", "getinv", "getinvworn", "findfolder", "findfolders", "attach", "attachall", "detachall",
+                                "getpath", "attachthis", "attachallthis", "detachthis", "detachallthis", "fartouch", "showworldmap", "showminimap",
+                                "showloc", "tpto", "accepttp", "shownames", "fly", "getsitid", "setdebug", "setenv", "detachme", 
+                                "showhovertextall", "showhovertextworld", "showhovertexthud", "showhovertext", "notify"
+                        };
+
+                for (int idxBvhr = 0; idxBvhr < RLV_BHVR_COUNT; idxBvhr++)
+                        m_BhvrLookup.addKeyword(arBehaviours[idxBvhr], idxBvhr);
+
+                fInitialized = true;
+        }
+}
+
+// Checked: 2009-06-07 (RLVa-0.2.1c)
+std::string RlvCommand::asString() const
+{
+        return (!m_strOption.empty()) ? (std::string(m_strBehaviour)).append(":").append(m_strOption) : (std::string(m_strBehaviour));
+}
+
+// =========================================================================
+
+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)
+        BOOL fDuplicate = 
+                (RLV_BHVR_UNKNOWN != rlvCmd.getBehaviourType())
+                        ? hasBehaviour(rlvCmd.getBehaviourType(), rlvCmd.getOption())
+                        : hasBehaviour(rlvCmd.getBehaviour(), rlvCmd.getOption());
+        if (fDuplicate)
+                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()) )
+                {
+                        m_Commands.erase(itCmd);
+                        return TRUE;
+                }
+        }
+        return FALSE;   // Command was never added so nothing to remove now
+}
+
+BOOL RlvObject::hasBehaviour(ERlvBehaviour eBehaviour) const
+{
+        for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
+                if ( (itCmd->getBehaviourType() == eBehaviour) && (itCmd->getOption().empty()) )
+                        return TRUE;
+        return FALSE;
+}
+
+BOOL RlvObject::hasBehaviour(const std::string& strBehaviour) const
+{
+        for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
+                if ( (itCmd->getBehaviour() == strBehaviour) && (itCmd->getOption().empty()) )
+                        return TRUE;
+        return FALSE;
+}
+
+BOOL RlvObject::hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption) const
+{
+        for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
+                if ( (itCmd->getBehaviourType() == eBehaviour) && (itCmd->getOption() == strOption) )
+                        return TRUE;
+        return FALSE;
+}
+
+BOOL RlvObject::hasBehaviour(const std::string& strBehaviour, const std::string& strOption) const
+{
+        for (rlv_command_list_t::const_iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
+                if ( (itCmd->getBehaviour() == strBehaviour) && (itCmd->getOption() == strOption) )
+                        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;
+}
+
+// =========================================================================
+/*
+ * Various helper classes/timers/functors
+ *
+ */
+
+// 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;
+}
+
+// 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 );
+}
+
+// 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);
+}
+
+// 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-07-05 (RLVa-1.0.0c)
+BOOL rlvAttachToEnabler(void* pParam)
+{
+        // Enables/disables an option on the "Attach to (HUD)" submenu depending on whether it is (un)detachable
+        LLViewerJointAttachment* pAttachment = (LLViewerJointAttachment*)pParam;
+        return (!pAttachment) || (gRlvHandler.isDetachable(pAttachment->getObject()));
+}
+
+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-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-06-03 (RLVa-0.2.0h) | Added: RLVa-0.2.0h
+RlvWLSnapshot* RlvWLSnapshot::takeSnapshot()
+{
+        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;
+}
+
+// =========================================================================
+
+BOOL RlvSettings::fShowNameTags = FALSE;
+
+#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
+
+// =========================================================================
+
+#ifdef RLV_ADVANCED_TOGGLE_RLVA
+        // Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-1.0.0h
+        void rlvDbgToggleEnabled(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 rlvDbgGetEnabled(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 (!rlvIsValidChannel(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();
+}
+
+// =========================================================================
diff --git a/linden/indra/newview/rlvhelper.h b/linden/indra/newview/rlvhelper.h
new file mode 100644
index 0000000..a0e040e
--- /dev/null
+++ b/linden/indra/newview/rlvhelper.h
@@ -0,0 +1,579 @@
+#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 "rlvmultistringsearch.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_HIDELOCKED                        // "Hide locked layers", "Hide locked attachments" and "Hide locked inventory"
+#define RLV_EXTENSION_FLOATER_RESTRICTIONS      // Enables the Advanced / RLVa / Restrictions... floater
+
+// 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)
+
+        // 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 = 20;
+const S32 RLV_VERSION_PATCH = 0;
+
+// Implementation version
+const S32 RLVa_VERSION_MAJOR = 1;
+const S32 RLVa_VERSION_MINOR = 0;
+const S32 RLVa_VERSION_PATCH = 1;
+const S32 RLVa_VERSION_BUILD = 7;
+
+// 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()
+//       * only uncomment the ones we actually use in a switch() to keep the size of the lookup table down
+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_CLEAR,                                 // "clear"
+        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_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_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>
+};
+
+enum ERlvCmdRet {
+        RLV_RET_NOERROR,                        // Command executed succesfully
+        RLV_RET_RETAINED,                       // Command was retained
+        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_UNKNOWN                         // Command unkown
+};
+
+// ============================================================================
+/*
+ * RlvCommand
+ * ==========
+ * Encapsulates an "RLV command" (duh :p)
+ *
+ */
+
+class RlvCommand
+{
+public:
+        /*
+         * Constructors
+         */
+        explicit RlvCommand(const std::string& strCommand);
+        RlvCommand(const RlvCommand& rlvCmd);
+
+        /*
+         * Accessors
+         */
+        BOOL isValid() const { return m_fValid; }
+
+        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; }
+
+        std::string        asString() const;
+
+        /*
+         * Operators
+         */
+        bool operator ==(const RlvCommand&) const;
+
+        // Parses an RLV command into its "tokens"
+        static BOOL parseCommand(/*[in]*/ const std::string& strCommand,  
+                /*[out]*/ std::string& strBehaviour, /*[out]*/ std::string& strOption, /*[out]*/ std::string& strParam);
+        static void initLookupTable();
+
+        /*
+         * Member variables
+         */
+protected:
+        BOOL                    m_fValid;
+        std::string             m_strBehaviour;
+        ERlvBehaviour   m_eBehaviour;
+        std::string             m_strOption;
+        std::string             m_strParam;
+        ERlvParamType   m_eParamType;
+
+        static RlvMultiStringSearch m_BhvrLookup;
+        friend class RlvHandler;
+};
+
+// ============================================================================
+/*
+ * RlvObject
+ * =========
+ * Encapsulates an "RLV Object" (= an object that has issued an RLV command)
+ *
+ */
+
+typedef std::list<RlvCommand> rlv_command_list_t;
+
+class RlvObject
+{
+public:
+        RlvObject(const LLUUID& uuid) : m_UUID(uuid), m_nLookupMisses(0) { m_fLookup = (NULL != gObjectList.findObject(uuid)); }
+
+        BOOL addCommand(const RlvCommand& rlvCmd);
+        BOOL removeCommand(const RlvCommand& rlvCmd);
+
+        BOOL hasBehaviour(ERlvBehaviour eBehaviour) const;
+        BOOL hasBehaviour(const std::string& strBehaviour) const;
+        BOOL hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOption) const;
+        BOOL hasBehaviour(const std::string& strBehaviour, const std::string& strOption) const;
+
+        std::string getStatusString(const std::string& strMatch) const;
+
+        const rlv_command_list_t* getCommandList() const { return &m_Commands; }
+protected:
+        LLUUID             m_UUID;                              // The object's UUID
+        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)
+        {
+                typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+                boost::char_separator<char> sep("&&", "", boost::drop_empty_tokens);
+                tokenizer tokens(strCriteria, sep);
+                for (tokenizer::iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
+                        m_Criteria.push_back(*itToken);
+        }
+        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 (-1 == 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 (also used by "Add/Replace Outfit" and "Take Off Items")
+ *
+ */
+
+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;
+
+// ============================================================================
+/*
+ * RlvWLSnapshot
+ * =============
+ *
+ */
+
+struct RlvWLSnapshot
+{
+public:
+        static void           restoreSnapshot(const RlvWLSnapshot* pWLSnapshot);
+        static RlvWLSnapshot* takeSnapshot();
+private:
+        RlvWLSnapshot() {}
+
+        bool             fIsRunning;
+        bool             fUseLindenTime;
+        LLWLParamSet WLParams;
+};
+
+// ============================================================================
+/*
+ * RlvSettings
+ * ===========
+ *
+ */
+
+#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"
+
+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()                             { return rlvGetSettingBOOL(RLV_SETTING_ENABLEWEAR, FALSE); }
+        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); }
+
+        #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
+ *
+ */
+
+struct RlvRedirInfo
+{
+        S16 nRedirChat;
+        S16 nRedirEmote;
+
+        RlvRedirInfo() : nRedirChat(0), nRedirEmote(0) {}
+        bool isActive() { return (nRedirChat + nRedirEmote) != 0; }
+};
+
+struct RlvReattachInfo
+{
+        LLUUID idItem;
+        bool   fInInventory;
+        bool   fAssetSaved;
+
+        RlvReattachInfo() : idItem(), fInInventory(false), fAssetSaved(false) {}
+};
+
+// ============================================================================
+/*
+ * 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();
+S32  rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType::EType type);
+bool rlvIsEmote(const std::string& strUTF8Text);
+bool rlvIsValidChannel(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);
+
+void rlvStringReplace(std::string& strText, std::string strFrom, const std::string& strTo);
+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);
+
+#ifdef RLV_ADVANCED_TOGGLE_RLVA
+        // "Advanced / RLVa / Enable RLV" menu option
+        void rlvDbgToggleEnabled(void*);
+        BOOL rlvDbgGetEnabled(void*);
+#endif // RLV_ADVANCED_TOGGLE_RLVA
+
+// ============================================================================
+// Inlined class member functions
+//
+
+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);
+        }
+}
+
+// ============================================================================
+// 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-08-05 (RLVa-1.0.1e) | Added: RLVa-1.0.0e
+inline bool rlvIsValidChannel(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 1f97a2e..9ad1787 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -69,7 +69,9 @@
 <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-->
@@ -159,6 +161,8 @@
 <!-- MAP -->
 <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 -->
   
   <!-- 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/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 89399ef..9b0e4c7 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -364,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/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 d32832c..dd66a83 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">
@@ -59,10 +59,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_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 3d1c569..f0c97f2 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,23 @@
                                 <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="Sort" 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_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_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 318f46a..7beb7e4 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,7 +1,7 @@
 <?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="560">
+     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="540">
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
new file mode 100644
index 0000000..3485812
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -0,0 +1,98 @@
+<?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="455" min_height="400" min_width="240"
+         name="minimap" rect_control="FloaterMiniMapRect" width="200">
+
+  <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">
+      Meters
+    </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 this avatar" 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="-25" 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="muted">
+    (muted)
+  </string>
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml b/linden/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml
new file mode 100644
index 0000000..615b7d1
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_object_im_info.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="0" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" can_tear_off="true" enabled="true" height="140" left="0"
+     mouse_opaque="true" name="object im info" width="300"
+     rect_control="FloaterObjectIMInfo" short_title="Object Info" title="Object Information" >
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-35" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="10" left="10"
+             mouse_opaque="true" name="LabelItemNameTitle" v_pad="0" width="78">
+    Object:
+  </text>
+  <text bevel_style="none" border_style="line" border_visible="false"
+                             border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top"
+                             font="SansSerif" height="20" is_unicode="false" left="70"
+                             max_length="254" mouse_opaque="false" name="ObjectName"
+                             width="200" />
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-60" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="10" left="10"
+             mouse_opaque="true" name="LabelSlurlTitle" v_pad="0" width="78">
+    Location:
+  </text>
+  <text bevel_style="none" border_style="line" border_visible="false"
+                             border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top"
+                             font="SansSerif" height="20" is_unicode="false" left="70" hover="true"
+                             max_length="254" mouse_opaque="true" name="Slurl" font-style="UNDERLINE"
+                             width="200" hover_cursor="UI_CURSOR_HAND" text_color="TextLinkColor" hover_color="TextLinkHoverColor"/>
+
+  <!-- A new viewer talking to an old sim will not have a slurl available and will show this. -->
+  <text bevel_style="none" border_style="line" border_visible="false"
+                             border_thickness="0" bottom_delta="0" enabled="true" follows="left|top"
+                             font="SansSerif" height="20" is_unicode="false" left_delta="0" hover="false"
+                             max_length="254" mouse_opaque="false" name="Unknown_Slurl" width="200">
+    (Location Info Not Available)
+  </text>
+
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-85" drop_shadow_visible="true" follows="left|top"
+             font="SansSerif" h_pad="0" halign="left" height="10" left="10"
+             mouse_opaque="true" name="LabelOwnerNameTitle" v_pad="0" width="78">
+    Owner:
+  </text>
+  <text bevel_style="none" border_style="line" border_visible="false"
+                             border_thickness="0" bottom_delta="-10" enabled="true" follows="left|top"
+                             font="SansSerif" height="20" is_unicode="false" left="70" hover="true"
+                             max_length="254" mouse_opaque="true" name="OwnerName" font-style="UNDERLINE"
+                             width="200" hover_cursor="UI_CURSOR_HAND" text_color="TextLinkColor" hover_color="TextLinkHoverColor"/>
+
+  <button bottom_delta="-30" font="SansSerif" halign="center" height="20" label="Mute Owner"
+         label_selected="Mute Owner" left="70" mouse_opaque="true" name="Mute"
+         width="160" />
+</floater>
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_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index a9ac7fa..9333153 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,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false"
+<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" follows="left|top" height="526" name="Snapshot"
      rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
         <text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
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 eb9b1c6..a57c568 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">
@@ -83,38 +83,45 @@
              font="SansSerifSmall" height="16" initial_value="false"
              label="Edit linked parts" left="4" mouse_opaque="true"
              name="checkbox edit linked parts" width="114" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+  <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="-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 mode:
-        </text>
+    Ruler:
+  </text>
         <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
-             left_delta="74" max_chars="20" mouse_opaque="true"
+             left_delta="40" max_chars="20" mouse_opaque="true"
              name="combobox grid mode" width="86">
-                <combo_item name="World" value="World">
-                        World
-                </combo_item>
-                <combo_item name="Local" value="Local">
-                        Local
-                </combo_item>
-                <combo_item name="Reference" value="Reference">
-                        Reference
-                </combo_item>
-        </combo_box>
-        <check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
+    <combo_item name="World" value="World">
+      World
+    </combo_item>
+    <combo_item name="Local" value="Local">
+      Local
+    </combo_item>
+    <combo_item name="Reference" value="Reference">
+      Reference
+    </combo_item>
+  </combo_box>
+  <check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Stretch Both Sides" left="143" mouse_opaque="true"
              name="checkbox uniform" width="134" />
-        <check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"
+  <check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"
              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="-19" control_name="SnapEnabled" follows="left|top"
+  <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="-14" follows="left|top" font="SansSerifSmall" halign="center"
-             height="16" label="Options..." label_selected="Options..." left_delta="20"
+        <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 -->
@@ -227,6 +234,13 @@
              image_unselected="object_grass.tga" label="" label_selected=""
              left_delta="23" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
              tool_tip="Grass" width="24" />
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-104" drop_shadow_visible="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-5"
+             mouse_opaque="true" name="tree_grass_label" v_pad="0" width="135" />
+  <combo_box max_chars="20" enabled="false" allow_text_entry="false" name="trees_grass"
+       height="18" width="135" right="-5" bottom="-122"
+       follows="left|top" mouse_opaque="true" />
         <check_box bottom="-117" control_name="CreateToolKeepSelected" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Keep Tool Selected" left="4" mouse_opaque="true"
@@ -276,18 +290,18 @@
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
              border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118"
-             hidden="false" mouse_opaque="true" name="Brush:" v_pad="0" width="100">
-                  Brush:
+             hidden="false" mouse_opaque="true" name="Bulldozer:" v_pad="0" width="100">
+                  Bulldozer:
         </text>
 
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
              border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
              follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
-             hidden="false" mouse_opaque="true" name="Brush Size:" v_pad="0" width="100">
+             hidden="false" mouse_opaque="true" name="Dozer Size:" v_pad="0" width="100">
                   Size
         </text>
         <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
-             increment="1.0" initial_val="0.0" left="178" max_val="2.0" min_val="0.0"
+         increment="0.1" initial_val="2.0" left="178" max_val="11.0" min_val="1.0"
              mouse_opaque="true" name="slider brush size" width="80" /> 
 
 
@@ -299,21 +313,23 @@
         </text>
         <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
              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" />      
-
-
-        <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
-             name="button more" scale_image="TRUE" tool_tip="Advanced Options"
-             width="80" />
-        <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-             height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
-             name="button less" scale_image="TRUE" tool_tip="Advanced Options"
-             width="80" />
+             mouse_opaque="true" name="slider force" width="80" />
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+         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="-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]
+  </text>
 
 <!-- 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"
@@ -351,7 +367,7 @@
                                 Thrax Linden
                         </text>
                         <button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+                             height="20" label="Profile..." label_selected="Profile..." left_delta="94"
                              mouse_opaque="true" name="button creator profile" scale_image="TRUE"
                              width="78" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -367,32 +383,42 @@
                                 Thrax Linden
                         </text>
                         <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+                             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="LastOwner:" 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"
-                             height="16" label="Set..." label_selected="Set..." left_delta="94"
+                        <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"
-                             bottom="-126" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-                             mouse_opaque="true" name="prim info" v_pad="0" width="166">
-                                1 Object, 1 Primitive
-                        </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="10"
                              mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
@@ -407,7 +433,7 @@
                         <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Share with group" left="10"
                              mouse_opaque="true" name="checkbox share with group"
-                             tool_tip="Allow group members to move, modify, copy and delete."
+                             tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions."
                              width="166" />
                         <string name="text deed continued">
                                 Deed...
@@ -415,8 +441,8 @@
                         <string name="text deed">
                                 Deed
                         </string>
-                        <button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
-                             height="16" label="Deed..." label_selected="Deed..." left_delta="172"
+                        <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."
                              width="78" />
@@ -504,37 +530,37 @@
                                 </combo_item>
                         </combo_box>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                             bottom="-135" drop_shadow_visible="true" follows="left|top"
+                             bottom="-115" 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="-135" drop_shadow_visible="true" follows="left|top"
+                             bottom="-115" 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="-135" drop_shadow_visible="true" follows="left|top"
+                             bottom="-115" 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="-147" drop_shadow_visible="true" follows="left|top"
+                             bottom="-127" 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="-147" drop_shadow_visible="true" follows="left|top"
+                             bottom="-127" 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="-147" drop_shadow_visible="true" follows="left|top"
+                             bottom="-127" 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:
@@ -634,15 +660,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"
@@ -751,12 +777,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">
@@ -875,10 +901,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"
@@ -1179,7 +1205,7 @@
                              initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
                              name="rptctrl" width="68" />
                         <button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
-                             height="16" label="Apply" label_selected="Apply" left_delta="78"
+                             height="20" label="Apply" label_selected="Apply" left_delta="78"
                              mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-288" drop_shadow_visible="true" follows="left|top"
@@ -1210,10 +1236,13 @@
                 </panel>
                 <panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
                      label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
-                        <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
-                              label="New Script..." label_selected="New Script..."
+      <button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
+                              label="New Script" label_selected="New Script..."
                              left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
-                             width="130" />
+                             width="100" />
+      <!--<button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
+            label="Permissions..." name="button permissions" font="SansSerif" halign="center"
+            mouse_opaque="true" scale_image="TRUE" />-->
                         <panel bottom_delta="-330" follows="left|top" height="325"  left="10"
                              mouse_opaque="true" name="ContentsInventory" width="252" />
                 </panel>
@@ -1223,22 +1252,10 @@
 
         <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
              name="land info panel" width="272">
+        <!-- Parcel Information -->
                 <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>
@@ -1258,12 +1275,27 @@
                      height="20" label="About Land..." label_selected="About Land..." left="48"
                      mouse_opaque="true" name="button about land" scale_image="TRUE" width="112" />
                 <check_box bottom_delta="-24" control_name="ShowParcelOwners" follows="left|top"
-                     tool_tip="Colour parcels according to their status" font="SansSerifSmall"
-                     height="16" initial_value="false" label="Show Status" left="48" 
+                     tool_tip="Colour parcels according to their ownership" font="SansSerifSmall"
+                     height="16" initial_value="false" label="Show owners" left="48" 
                      mouse_opaque="true" name="checkbox show owners" width="100" />
                         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
                              height="18" label="?" label_selected="?" left_delta="94"
                              mouse_opaque="true" name="button show owners help" width="18" />
+        <!-- Modify Parcel -->
+                <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_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" />
+        <!-- Land Transactions -->
                 <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"
@@ -1294,10 +1326,10 @@
                 Click and drag to change view
         </string>
         <string name="status_grab">
-                Drag to move objects, Ctrl to lift, Ctrl-Shift to spin
+                Drag to move, Ctrl to lift, Ctrl-Shift to rotate
         </string>
         <string name="status_place">
-                Click in the world to create, shift-click to select
+                Click inworld to build
         </string>
         <string name="status_selectland">
                 Click and drag to select land
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
new file mode 100644
index 0000000..0172b41
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
+         mouse_opaque="false" name="popup" opaque="true" width="128">
+        <menu_item_call bottom_delta="-18" height="18" label="Zoom Close" left="0"
+                 mouse_opaque="true" name="Zoom Close" width="128">
+                <on_click function="MiniMap.ZoomLevel" userdata="2" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Zoom Medium" left="0"
+                 mouse_opaque="true" name="Zoom Medium" width="128">
+                <on_click function="MiniMap.ZoomLevel" userdata="1" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Zoom Far" left="0"
+                 mouse_opaque="true" name="Zoom Far" width="128">
+                <on_click function="MiniMap.ZoomLevel" userdata="0" />
+        </menu_item_call>
+        <menu_item_separator />
+  <menu_item_check bottom_delta="-18" enabled="true" height="18" label="Center on Camera"
+          left="0" mouse_opaque="true" name="Center on Camera" width="128">
+    <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"
+                 left="0" mouse_opaque="true" name="Show Map" width="128">
+    <on_click function="MiniMap.ShowWorldMap" userdata="" />
+  </menu_item_call>
+        <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Stop Tracking"
+                 left="0" mouse_opaque="true" name="Stop Tracking" width="128">
+                <on_click function="MiniMap.StopTracking" />
+                <on_enable function="MiniMap.EnableTracking" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Profile..."
+                 left="0" mouse_opaque="true" name="Profile" width="128">
+                <on_click function="MiniMap.ShowProfile" />
+                <on_enable function="MiniMap.EnableProfile" />
+        </menu_item_call>
+</menu>
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 7ef84c4..15cdc9e 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
@@ -44,7 +44,11 @@
                         <on_enable function="Object.EnableReturn" />
                 </menu_item_call>
                 <pie_menu label="More &gt;" name="Rate Menu">
-      <menu_item_separator />
+      <menu_item_call label="Backup" 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,14 +58,22 @@
         <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" />
       </menu_item_call>
+      <menu_item_call name="Link" enabled="false" label="Link">
+        <on_click function="Tools.Link" userdata="" />
+        <on_enable function="Tools.EnableLink" />
+      </menu_item_call>
       <menu_item_separator />
-      <menu_item_separator />
-      <menu_item_separator />
+      <menu_item_call name="Unlink" enabled="false" label="Unlink">
+        <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" />
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 72b828d..81c49e7 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
@@ -8,6 +8,14 @@
 
   <menu name="File" create_jump_keys="true" label="File"
         opaque="true" tear_off="true">
+            <menu_item_call enabled="false" hidden="false" label="Import" mouse_opaque="true" name="Import">
+            <on_click function="Object.Import" />
+            <on_enable function="Object.EnableImport" />
+        </menu_item_call>
+        <menu_item_call enabled="false" hidden="false" label="Upload + Import" mouse_opaque="true" name="Import">
+            <on_click function="Object.ImportUpload" />
+            <on_enable function="Object.EnableImport" />
+    </menu_item_call>
     <menu_item_call name="Upload Image"
                     label="Upload Image (L$[COST])..."
                     shortcut="control|U">
@@ -126,12 +134,6 @@
       <on_enable function="Edit.EnableDeselect" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Duplicate" enabled="false"
-                    label="Duplicate" shortcut="control|D">
-      <on_click function="Edit.Duplicate" userdata="" />
-      <on_enable function="Edit.EnableDuplicate" />
-    </menu_item_call>
-    <menu_item_separator />
 
     <menu name="Attach Object" create_jump_keys="true"
           label="Attach Object" opaque="true" tear_off="true" />
@@ -397,11 +399,17 @@
         <on_click function="View.ZoomOut" userdata="" />
       </menu_item_call>
     </menu>
-    <menu_item_separator />
     <menu_item_call name="Toggle Fullscreen" label="Toggle Fullscreen"
                     shortcut="alt|Enter">
       <on_click function="View.Fullscreen" userdata="" />
     </menu_item_call>
+    <menu_item_separator />
+    <menu_item_check name="Toggle Advanced Menu" 
+                    label="Advanced Menu"
+                    shortcut="control|alt|D">
+      <on_click function="View.ToggleAdvanced" userdata="" />
+      <on_check function="View.CheckAdvanced" />
+    </menu_item_check>
   </menu>
 
 
@@ -516,7 +524,7 @@
 
   <menu name="Tools" create_jump_keys="true" label="Tools"
         opaque="true" tear_off="true" visible="false">
-    <menu name="Select Tool" create_jump_keys="true" label="Select Tool"
+    <menu name="Select Tool" create_jump_keys="true" label="Choose Tool"
           opaque="true" tear_off="true">
       <menu_item_call name="Focus" label="Focus" shortcut="control|1">
         <on_click function="Tools.SelectTool" userdata="focus" />
@@ -535,48 +543,67 @@
       </menu_item_call>
     </menu>
     <menu_item_separator />
-    <menu_item_check name="Select Only My Objects"
-                     label="Select Only My Objects">
-      <on_click function="Tools.SelectOnlyMyObjects"
-                userdata="agents" />
-      <on_check control="SelectOwnedOnly" />
-    </menu_item_check>
-    <menu_item_check name="Select Only Movable Objects"
-                     label="Select Only Movable Objects">
-      <on_click function="Tools.SelectOnlyMovableObjects"
-                userdata="movable" />
-      <on_check control="SelectMovableOnly" />
-    </menu_item_check>
-    <menu_item_check name="Select Only Copyable Objects"
-                     label="Select Only Copyable Objects">
-      <on_click function="Tools.SelectOnlyCopyableObjects"
-                userdata="copyable" />
-      <on_check control="SelectCopyableOnly" />
-    </menu_item_check>
-    <menu_item_check name="Select By Surrounding"
-                     label="Select By Surrounding">
-      <on_click function="Tools.SelectBySurrounding"
-                userdata="" />
-      <on_check control="RectangleSelectInclusive" />
-    </menu_item_check>
-    <menu_item_check name="Show Hidden Selection"
-                     label="Show Hidden Selection">
-      <on_click function="Tools.ShowHiddenSelection"
-                userdata="" />
-      <on_check control="RenderHiddenSelections" />
-    </menu_item_check>
-    <menu_item_check name="Show Light Radius for Selection"
-                     label="Show Light Radius for Selection">
-      <on_click function="Tools.ShowSelectionLightRadius"
-                userdata="" />
-      <on_check control="RenderLightRadius" />
-    </menu_item_check>
-    <menu_item_check name="Show Selection Beam"
-                     label="Show Selection Beam">
-      <on_click function="ToggleControl"
-                userdata="ShowSelectionBeam" />
-      <on_check control="ShowSelectionBeam" />
-    </menu_item_check>
+    <menu_item_call name="Focus on Selection" enabled="false"
+                    label="Focus on Selection" shortcut="H">
+      <on_click function="Tools.LookAtSelection" userdata="focus" />
+      <on_enable function="Tools.SomethingSelectedNoHUD" />
+    </menu_item_call>
+    <menu_item_call name="Zoom to Selection" enabled="false"
+                    label="Zoom to Selection" shortcut="shift|H">
+      <on_click function="Tools.LookAtSelection" userdata="zoom" />
+      <on_enable function="Tools.SomethingSelectedNoHUD" />
+    </menu_item_call>
+    <menu name="Selection Options" label="Selection Options"
+          create_jump_keys="true" opaque="true" tear_off="true">
+      <menu_item_check name="Select Only My Objects"
+                       label="Select Only My Objects">
+        <on_click function="Tools.SelectOnlyMyObjects"
+                  userdata="agents" />
+        <on_check control="SelectOwnedOnly" />
+      </menu_item_check>
+      <menu_item_check name="Select Only Movable Objects"
+                       label="Select Only Movable Objects">
+        <on_click function="Tools.SelectOnlyMovableObjects"
+                  userdata="movable" />
+        <on_check control="SelectMovableOnly" />
+      </menu_item_check>
+      <menu_item_check name="Select Only Copyable Objects"
+                       label="Select Only Copyable Objects">
+        <on_click function="Tools.SelectOnlyCopyableObjects"
+                  userdata="copyable" />
+        <on_check control="SelectCopyableOnly" />
+      </menu_item_check>
+      <menu_item_check name="Select By Surrounding"
+                       label="Select By Surrounding">
+        <on_click function="Tools.SelectBySurrounding"
+                  userdata="" />
+        <on_check control="RectangleSelectInclusive" />
+      </menu_item_check>
+      <menu_item_separator />
+      <menu_item_check name="Show Hidden Selection"
+                       label="Show Hidden Selection">
+        <on_click function="Tools.ShowHiddenSelection"
+                  userdata="" />
+        <on_check control="RenderHiddenSelections" />
+      </menu_item_check>
+      <menu_item_check name="Show Light Radius for Selection"
+                       label="Show Light Radius for Selection">
+        <on_click function="Tools.ShowSelectionLightRadius"
+                  userdata="" />
+        <on_check control="RenderLightRadius" />
+      </menu_item_check>
+      <menu_item_check label="Show Selection Outlines"
+                       name="Show Selection Outlines">
+        <on_click function="Tools.ShowSelectionHighlights" userdata="" />
+        <on_check control="RenderHighlightSelections" />
+      </menu_item_check>
+      <menu_item_check name="Show Selection Beam"
+                       label="Show Selection Beam">
+        <on_click function="ToggleControl"
+                  userdata="ShowSelectionBeam" />
+        <on_check control="ShowSelectionBeam" />
+      </menu_item_check>
+    </menu>
     <menu_item_separator />
     <menu_item_check name="Snap to Grid" enabled="false"
                      label="Snap to Grid" shortcut="G">
@@ -619,15 +646,10 @@
       <on_enable function="Tools.EnableUnlink" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Focus on Selection" enabled="false"
-                    label="Focus on Selection" shortcut="H">
-      <on_click function="Tools.LookAtSelection" userdata="focus" />
-      <on_enable function="Tools.SomethingSelectedNoHUD" />
-    </menu_item_call>
-    <menu_item_call name="Zoom to Selection" enabled="false"
-                    label="Zoom to Selection" shortcut="shift|H">
-      <on_click function="Tools.LookAtSelection" userdata="zoom" />
-      <on_enable function="Tools.SomethingSelectedNoHUD" />
+    <menu_item_call name="Duplicate" enabled="false"
+                    label="Duplicate" shortcut="control|D">
+      <on_click function="Edit.Duplicate" userdata="" />
+      <on_enable function="Edit.EnableDuplicate" />
     </menu_item_call>
     <menu_item_call name="Menu Object Take" enabled="false"
                     label="Take" visible="false">
@@ -639,6 +661,7 @@
       <on_click function="Tools.TakeCopy" userdata="" />
       <on_enable function="Tools.EnableTakeCopy" />
     </menu_item_call>
+    <menu_item_separator />
     <menu_item_call name="Return..." enabled="false"
                     label="Return Object">
       <on_click function="Object.Return" />
@@ -695,9 +718,10 @@
                 userdata="stop" />
       <on_enable function="EditableSelected" />
     </menu_item_call>
+    <menu_item_separator />
     <menu_item_call name="Set permissions on selected task inventory"
                     enabled="false"
-                    label="Set permissions on selected task inventory">
+                    label="Bulk Set Permissions">
       <on_click function="Tools.SetBulkPerms" userdata="" />
       <on_enable function="EditableSelected" />
     </menu_item_call>
@@ -868,6 +892,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"
@@ -1351,6 +1394,42 @@
     </menu>
 
 
+    <!-- RLVa -->
+
+    <menu name="RLVa" drop_shadow="true" opaque="true" tear_off="true">
+
+      <menu_item_check name="Enable Wear" label="Enable Wear">
+        <on_click function="ToggleControl" userdata="RLVaEnableWear" />
+        <on_check control="RLVaEnableWear" />
+      </menu_item_check>
+      
+      <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_call name="Restrictions..." label="Restrictions...">
+        <on_click function="RLVa.Behaviors.Show" userdata="" />
+      </menu_item_call>
+
+    </menu>
+
 
     <!-- UI -->
 
@@ -1870,6 +1949,13 @@
                 userdata="ShowConsoleWindow" />
       <on_check control="ShowConsoleWindow" />
     </menu_item_check>
+
+    <menu_item_check name="Restrained Life Active"
+                     label="Restrained Life Active">
+      <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 99fe75a..01e2546 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -835,6 +835,11 @@ Use the controls on the right to find things
 and display different backgrounds.
                 </message>
         </notify>
+  <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].
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..2ea8890 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="-15"
+                             mouse_opaque="true" name="online_yes" v_pad="0" width="130">
+        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="130">
+        Currently: Offline
+      </text>
+      <button bottom_delta="-19" font="SansSerif" halign="center" height="20"
+                             label="Instant Message..." label_selected="Instant Message..."
+                             right="-15" mouse_opaque="true" name="Instant Message..."
+                             tool_tip="Instant Message (IM)" width="130" />
+      <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="130" />
+      <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="130" />
+      <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="130" />
+      <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="130" />
+      <button bottom_delta="-34" font="SansSerif" halign="center" height="20" label="Pay..."
+                             label_selected="Pay..." left_delta="0" mouse_opaque="true" name="Pay..."
+                             width="130" />
+      <button bottom_delta="-23" font="SansSerif" halign="center" height="20" label="Mute"
+                             label_selected="Mute" left_delta="0" mouse_opaque="true" name="Mute"
+                             width="130" />
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="-29" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="16" right="-15"
+                             mouse_opaque="true" name="label" v_pad="0" width="130">
+        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="-15"
                              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="130" />
+      <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="-15"
+                             mouse_opaque="true" name="label2" v_pad="0" width="130">
+        Account:
+      </text>
+      <view_border bevel_style="in" bottom_delta="-48" follows="left|top" height="50" right="-15"
+                             mouse_opaque="false" name="acct_border" width="130" />
+      <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"
+      <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="-15"
                              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"
+        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="-15"
                              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"
+                             width="130">
+        [FIRST] [LAST]
+      </line_editor>
+      <texture_picker allow_no_texture="true" bottom="289" can_apply_immediately="false"
+                             default_image_name="None" follows="left|top" height="192" label=""
+                             left="20" 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="-155" embedded_items="false"
+                             enabled="true" follows="left|top" font="SansSerifSmall" height="155"
+                             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="20"
+                             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="-15"
+                             mouse_opaque="false" name="drop_target_rect_vis" width="130" />
+      <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="130" />
+      <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="-22"
                              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"
+                             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 2" width="115"
+                             tool_tip="Drop inventory items here to give them to this resident.">
+        to give to resident
+      </text>
+      <name_editor bevel_style="in" border_style="line"
+                             border_thickness="0" bottom="0" enabled="false" follows="left|top"
+                             font="SansSerifSmall" height="0" is_unicode="false" left="1"
+                             max_length="254" mouse_opaque="false" name="name"
+                             width="0" />
+      <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="?"
+      <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"
                              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"
                              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"
                              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="4" 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="4" 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="20" 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="20"
+                             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="20" 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"
+  <button bottom_delta="0" 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="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_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
new file mode 100644
index 0000000..19faa62
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
@@ -0,0 +1,62 @@
+<?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="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"
+                 halign="left" height="10" left="80" mouse_opaque="false" name="n_label"
+                 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="10">
+                N
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom="-80" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+                 halign="left" height="10" left="120" mouse_opaque="false" name="e_label"
+                 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="10">
+                E
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom="-120" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+                 halign="left" height="10" left="80" mouse_opaque="false" name="s_label"
+                 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="10">
+                S
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom="-80" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+                 halign="left" height="10" left="40" mouse_opaque="false" name="w_label"
+                 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="11">
+                W
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom="-60" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+                 halign="left" height="10" left="100" mouse_opaque="false" name="ne_label"
+                 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="20">
+                NE
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom="-100" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+                 halign="left" height="10" left="100" mouse_opaque="false" name="se_label"
+                 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="20">
+                SE
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom="-100" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+                 halign="left" height="10" left="60" mouse_opaque="false" name="sw_label"
+                 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="21">
+                SW
+        </text>
+        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                 bottom="-60" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+                 halign="left" height="1-" left="60" mouse_opaque="false" name="nw_label"
+                 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="21">
+                NW
+        </text>
+  <string name="tooltip_tp">
+    Double-Click teleports
+  </string>
+  <string name="tooltip_pan">
+    Shift-Drag pans
+  </string>
+  <string name="tooltip_map">
+    Double-Click opens Map
+  </string>
+</panel>
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 92978ab..c960d36 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 24753d1..b0384cf 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
@@ -131,30 +131,34 @@
              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="-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 6c8ffdb..e8a2625 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
@@ -73,14 +73,6 @@
              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" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
-             label="Rotate Mini-Map" left="151" mouse_opaque="true"
-             name="rotate_mini_map_checkbox" radio_style="false" width="256" />
-        <check_box bottom="-286" control_name="MiniMapTeleport" enabled="true" follows="left|top"
-                   font="SansSerifSmall" height="16" initial_value="false"
-                   label="Doubleclick Mini-Map Teleports" left="280" mouse_opaque="true"
-                   name="teleport_mini_map_checkbox" 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"
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..d5d43b1 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
@@ -8,6 +8,10 @@
              height="16" initial_value="false"
              label="Run Second Life 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 environment control in toolbar" left="248" 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"
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 f0f79e4..ee00455 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
@@ -2,92 +2,102 @@
 <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
      height="408" label="Communication" left="102" mouse_opaque="true" name="im"
      width="517">
-        <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="-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_box" v_pad="0" width="128">
-                My Online Status:
-        </text>
-        <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
+    My Online Status:
+  </text>
+  <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall"
              height="16" initial_value="false"
              label="Only my Friends and Groups can see when I am online"
              left="148" mouse_opaque="true" name="online_visibility" radio_style="false"
              width="350" />
-        <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="-40" 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_box2" v_pad="0" width="128">
-                IM Options:
-        </text>
-        <string name="log_in_to_change">
-                log in to change
-        </string>
-        <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
+    IM Options:
+  </text>
+  <string name="log_in_to_change">
+    log in to change
+  </string>
+  <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
              height="16" initial_value="false" label="Send IM to Email ([EMAIL])"
              left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
              width="350" />
-        <check_box bottom="-65" enabled="true" follows="left|top"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             bottom="-59" drop_shadow_visible="true" enabled="true" follows="left|top"
+             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="148"
+             mouse_opaque="false" name="show_ims_label" v_pad="0" width="100">
+    Show IMs in:
+  </text>
+  <check_box bottom="-65" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Show IMs with Chat" left="148" mouse_opaque="true"
-             name="include_im_in_chat_history" radio_style="false" width="237" />
-        <check_box bottom="-85" enabled="true" follows="left|top"
+             label="Main Chat" left="248" mouse_opaque="true"
+             name="include_im_in_chat_console" radio_style="false" width="100" />
+  <check_box bottom="-65" enabled="true" follows="left|top"
+             font="SansSerifSmall" height="16" initial_value="false"
+             label="Local Chat" left="348" mouse_opaque="true"
+             name="include_im_in_chat_history" radio_style="false" width="100" />
+  <check_box bottom="-85" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Show timestamps in IM" left="148" mouse_opaque="true"
              name="show_timestamps_check" radio_style="false" width="237" />
-    <check_box bottom="-105" enabled="true"
-         follows="left|top" font="SansSerifSmall" height="16"
-         initial_value="false" label="Show online Friend notifications" left="148"
-         mouse_opaque="true" name="friends_online_notify_checkbox"
-         radio_style="false" width="256" />
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <check_box bottom="-105" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16"
+       initial_value="false" label="Show online Friend notifications" left="148"
+       mouse_opaque="true" name="friends_online_notify_checkbox"
+       radio_style="false" width="256" />
+  <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"
              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"
+    Busy Mode Response:
+  </text>
+  <text_editor type="string" length="1" bottom="-185" 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"
+  <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"
              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"
+    Logging Options:
+  </text>
+  <check_box bottom="-225" 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="-245" 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="-265" 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="-285" 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="-305" 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="-325" 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="-345" 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="-367" 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="-366"
              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..d4ec307 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
@@ -10,8 +10,8 @@
         </text>
         <slider bottom_delta="-25" can_edit_text="true"
              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"
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..ead9ad7
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote.xml
@@ -0,0 +1,22 @@
+<?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="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..2fd9be5
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.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"
+     follows="right|bottom" height="47" 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="47" 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="64" mouse_opaque="true"
+             name="DrawDistance" show_text="true" width="170" />
+  <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="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/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
index 9ec721c..abe61bf 100644
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ b/linden/indra/newview/skins/silver/colors_base.xml
@@ -69,6 +69,8 @@
 <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 -->
@@ -159,6 +161,7 @@
 <!-- MAP -->
 <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 -->
  
 <!-- 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/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 0abdc60..5da0256 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -794,7 +794,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libuuid.so", "libuuid.so.1")
             self.path("libSDL-1.2.so.0")
             self.path("libELFIO.so")
-            self.path("libopenjpeg.so.2")
+            self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
 
             self.path("libopenal.so") # symlink
             self.path("libopenal.so.1")