Merge branch 'weekly' of http://github.com/imprudence/imprudence into weekly

137 files changed, 4972 insertions, 2533 deletions

diff --git a/.gitignore b/.gitignore
index 1295eaf..877e3ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ linden/installed.xml
 ChangeLog.txt
 .DS_Store
 *.zip
+linden/indra/newview/mozilla-universal-darwin.tgz
\ No newline at end of file
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 3497ec9..032a3cf 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -55,6 +55,7 @@ if (WINDOWS)
       /Zc:forScope
       /nologo
       /Oy-
+      /MP
       )
      
   if(MSVC80 OR MSVC90)
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index e8e0d9e..82c417a 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -90,7 +90,6 @@ else (WINDOWS)
         gmodule-2.0
         gthread-2.0
         glib-2.0
-        gio-2.0
         xml2.2
         )
 
diff --git a/linden/indra/cmake/Python.cmake b/linden/indra/cmake/Python.cmake
index 0901c1b..e4257f4 100644
--- a/linden/indra/cmake/Python.cmake
+++ b/linden/indra/cmake/Python.cmake
@@ -9,10 +9,12 @@ if (WINDOWS)
     NAMES python25.exe python23.exe python.exe
     NO_DEFAULT_PATH # added so that cmake does not find cygwin python
     PATHS
+        [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
+        [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 7db62bc..3c6cd43 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -870,6 +870,7 @@ void LLStringUtilBase<T>::addCRLF(std::basic_string<T>& string)
                 }
 
                 string.assign(t, size);
+                delete[] t;
         }
 }
 
diff --git a/linden/indra/llcommon/stdtypes.h b/linden/indra/llcommon/stdtypes.h
index af0b4dd..aed1e46 100644
--- a/linden/indra/llcommon/stdtypes.h
+++ b/linden/indra/llcommon/stdtypes.h
@@ -64,10 +64,17 @@ typedef long long unsigned int		U64;
 #endif
 #endif
 
+#ifdef LL_DARWIN
+        #ifndef BOOL
+                #define BOOL S32
+        #endif
+#else
+        typedef S32                             BOOL;
+#endif
+
 typedef float                           F32;
 typedef double                          F64;
 
-typedef S32                             BOOL;
 typedef U8                              KEY;
 typedef U32                             MASK;
 typedef U32                             TPACKETID;
diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index 2bc62fb..fd8d128 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -73,7 +73,13 @@ typedef enum e_image_codec
         IMG_CODEC_JPEG = 5,
         IMG_CODEC_DXT  = 6,
         IMG_CODEC_PNG  = 7,
+#ifdef LL_DARWIN
+        IMG_CODEC_PSD = 8,
+        IMG_CODEC_TIFF = 9,
+        IMG_CODEC_EOF  = 10
+#else
         IMG_CODEC_EOF  = 8
+#endif
 } EImageCodec;
 
 //============================================================================
diff --git a/linden/indra/llimagej2coj/CMakeLists.txt b/linden/indra/llimagej2coj/CMakeLists.txt
index 97d22cf..30f73ab 100644
--- a/linden/indra/llimagej2coj/CMakeLists.txt
+++ b/linden/indra/llimagej2coj/CMakeLists.txt
@@ -19,10 +19,26 @@ set(llimagej2coj_SOURCE_FILES
 
 set(llimagej2coj_HEADER_FILES
     CMakeLists.txt
-
     llimagej2coj.h
     )
 
+set(COREIMAGE_LIBRARIES)
+
+if (DARWIN)
+  list(APPEND llimagej2coj_SOURCE_FILES
+    llimagej2cquartz.mm
+    )
+  list(APPEND llimagej2coj_HEADER_FILES
+    llimagej2cquartz.h
+    )
+        
+        find_library(QUARTZCORE_LIBRARY QuartzCore)
+        find_library(ACCELERATE_LIBRARY Accelerate)
+
+        list(APPEND COREIMAGE_LIBRARIES ${QUARTZCORE_LIBRARY})
+        list(APPEND COREIMAGE_LIBRARIES ${ACCELERATE_LIBRARY})
+endif (DARWIN)
+
 set_source_files_properties(${llimagej2coj_HEADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 
@@ -32,4 +48,5 @@ add_library (llimagej2coj ${llimagej2coj_SOURCE_FILES})
 target_link_libraries(
     llimagej2coj
     ${OPENJPEG_LIBRARIES}
+        ${COREIMAGE_LIBRARIES}
     )
diff --git a/linden/indra/llimagej2coj/llimagej2cquartz.h b/linden/indra/llimagej2coj/llimagej2cquartz.h
new file mode 100644
index 0000000..ba11bfd
--- /dev/null
+++ b/linden/indra/llimagej2coj/llimagej2cquartz.h
@@ -0,0 +1,9 @@
+#include "llimagej2c.h"
+
+#ifdef __OBJC__
+        #ifdef BOOL
+                #undef BOOL
+        #endif
+#endif // __OBJC__
+
+BOOL decodeJ2CQuartz(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count);
\ No newline at end of file
diff --git a/linden/indra/llimagej2coj/llimagej2cquartz.mm b/linden/indra/llimagej2coj/llimagej2cquartz.mm
new file mode 100644
index 0000000..d5eefd1
--- /dev/null
+++ b/linden/indra/llimagej2coj/llimagej2cquartz.mm
@@ -0,0 +1,147 @@
+#import <Accelerate/Accelerate.h>
+#import <QuartzCore/QuartzCore.h>
+#import <Quartz/Quartz.h>
+
+#include "llimagej2cquartz.h"
+
+#if defined(__BIG_ENDIAN__)
+        CGImageAlphaInfo const kDefaultAlphaLocation = kCGImageAlphaPremultipliedLast;
+#else
+        CGImageAlphaInfo const kDefaultAlphaLocation = kCGImageAlphaPremultipliedFirst;
+#endif
+
+BOOL decodeJ2CQuartz(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count)
+{
+        U8 *srcData = (U8*)base.getData();
+        int srcLen = base.getDataSize();
+
+        llinfos << "[1] compressed image size: '" << srcLen << "'" << llendl;
+
+        int width = base.getWidth();
+        int height = base.getHeight();
+        int components = base.getComponents();
+
+        S32 channels = components - first_channel;
+        if( channels > max_channel_count )
+                channels = max_channel_count;
+
+        llinfos << "[2] components: '" << components << "' - channels: '" << channels << "' - first_channel: '" << first_channel << "' - max_channel_count: '" << max_channel_count << "'" << llendl;
+
+        if(components <= first_channel || components > 4)
+                return FALSE;
+
+        llinfos << "[3] attempting to decode a texture: '" << width << "'X'" << height << "'@'" << components * 8 << "'" << llendl;
+
+        U8 *tgt = (U8*)raw_image.getData();
+        if (!tgt)
+                return FALSE;
+
+        raw_image.resize(width, height, channels);
+
+        size_t rowBytes = width * components;
+        int realLen = width * height * components;
+
+        llinfos << "[4] allocating buffer of size: '" << realLen << "' to hold temp texture data" << llendl;
+        unsigned char* dataplane;
+
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        NSBitmapImageRep *rep = [NSBitmapImageRep alloc];
+
+        switch (components)
+        {
+                case 1:
+                {
+                        rep = [[rep
+                                   initWithBitmapDataPlanes:nil
+                                   pixelsWide:width
+                                   pixelsHigh:height
+                                   bitsPerSample:8
+                                   samplesPerPixel:1
+                                   hasAlpha:NO
+                                   isPlanar:NO
+                                   colorSpaceName:NSDeviceWhiteColorSpace
+                                   bytesPerRow:rowBytes
+                                   bitsPerPixel:8
+                                   ] autorelease];
+
+                        memcpy([rep bitmapData], srcData, srcLen);
+
+                        dataplane = (unsigned char*)malloc(realLen);
+                        memcpy(dataplane, [rep bitmapData], realLen);
+
+                        [rep release];
+                }
+                break;
+
+                case 3:
+                {
+                        NSData *data = [NSData dataWithBytes:srcData length:srcLen];
+                        rep = [rep initWithData:data];
+
+                        dataplane = (unsigned char*)malloc(realLen);
+                        memcpy(dataplane, [rep bitmapData], realLen);
+
+                        [data release];
+                        [rep release];
+                }
+                break;
+
+                case 4:
+                {
+                        NSData *data = [NSData dataWithBytes:srcData length:srcLen];
+                        rep = [rep initWithData:data];
+
+                        int imgLen = [rep pixelsHigh] * [rep bytesPerRow];
+                        if (imgLen != realLen)
+                        {
+                                llwarns << "decoded image buffer size (" << imgLen << ") != expected buffer size (" << realLen << ") !" << llendl;
+                                [rep release];
+                                [data release];
+                                return FALSE;
+                        }
+                        
+                        dataplane = (unsigned char*)malloc(realLen);
+                        memcpy(dataplane, [rep bitmapData], realLen);
+
+                        vImage_Buffer vb;
+                        vb.data = dataplane;
+                        vb.height = [rep pixelsHigh];
+                        vb.width = [rep pixelsWide];
+                        vb.rowBytes = [rep bytesPerRow];
+
+                        llinfos << "Attempting Alpha Unpremultiplication" << llendl;
+                        vImageUnpremultiplyData_RGBA8888(&vb, &vb, 0);
+                        llinfos << "Unpremultiplied Alpha" << llendl;
+
+                        llwarns << "after decoding: " << [rep pixelsWide] << "'X'" << [rep pixelsHigh] << "'@'" << [rep bitsPerPixel] << "'" << llendl;
+
+                        [rep release];
+                        [data release];
+                }
+                break;
+        }
+
+        if (dataplane)
+        {
+                for (int h=height-1; h>=0; h--)
+                {
+                        for (int w=0; w<rowBytes; w+=(first_channel + channels))
+                        {
+                                for (int c=first_channel; c<(first_channel + channels); c++)
+                                        memcpy(tgt++, &dataplane[h*rowBytes + w + c], sizeof(unsigned char));
+                        }
+                }
+
+                free(dataplane);
+
+                llinfos << "[5] size of decoded image is: '" << width*height*channels << "'" << llendl;
+
+                return TRUE;
+        }
+        else
+        {
+                llwarns << "[5] cannot decode image !" << llendl;
+        }
+
+        return FALSE;
+}
diff --git a/linden/indra/llrender/llfontregistry.cpp b/linden/indra/llrender/llfontregistry.cpp
index 2140dbd..9792a91 100644
--- a/linden/indra/llrender/llfontregistry.cpp
+++ b/linden/indra/llrender/llfontregistry.cpp
@@ -107,7 +107,7 @@ bool removeSubString(std::string& str, const std::string& substr)
         size_t pos = str.find(substr);
         if (pos != string::npos)
         {
-                str.replace(pos,substr.length(),(const char *)NULL, 0);
+                str.erase(pos,substr.length());
                 return true;
         }
         return false;
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index e73b287..a3785e4 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -416,7 +416,16 @@ void LLLineEditor::setText(const LLStringExplicit &new_text)
         setCursor(llmin((S32)mText.length(), getCursor()));
 
         // Set current history line to end of history.
-        mCurrentHistoryLine = mLineHistory.end() - 1;
+        // RC Fix, its really not safe to just take 1 of the end itterator, if end==begin
+        // that leaves an invalid state upseting the secure STL checks
+        if(mLineHistory.empty())
+        {
+                mCurrentHistoryLine = mLineHistory.begin();
+        }
+        else
+        {
+                mCurrentHistoryLine = mLineHistory.end() - 1;
+        }
 
         mPrevText = mText;
 }
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index af55593..2c3c5f7 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -247,7 +247,7 @@ std::string LLDir::buildSLOSCacheDir() const
         }
         else
         {
-                res = getOSCacheDir() + mDirDelimiter + "Imprudence";
+                res = getOSCacheDir() + mDirDelimiter + "ImprudenceExperimental";
         }
         return res;
 }
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index 6d5dcf3..b2d9787 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac()
                 if (error == noErr)
                 {
                         FSRefToLLString(&cacheDirRef, mOSCacheDir);
-                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("Imprudence"),NULL);
+                        (void)CFCreateDirectory(&cacheDirRef, CFSTR("ImprudenceExperimental"),NULL);
                 }
                 
                 // mOSUserAppDir
diff --git a/linden/indra/llwindow/llwindowmacosx-objc.h b/linden/indra/llwindow/llwindowmacosx-objc.h
index 14cddaa..14c9c92 100644
--- a/linden/indra/llwindow/llwindowmacosx-objc.h
+++ b/linden/indra/llwindow/llwindowmacosx-objc.h
@@ -31,6 +31,14 @@
  * $/LicenseInfo$
  */
 
+#include "llimagej2c.h"
+#include <Carbon/Carbon.h>
+
+#ifdef __OBJC__
+#ifdef BOOL
+#undef BOOL
+#endif
+#endif // __OBJC__
 
 // This will actually hold an NSCursor*, but that type is only available in objective C.
 typedef void *CursorRef;
@@ -40,3 +48,5 @@ void setupCocoa();
 CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY);
 OSErr releaseImageCursor(CursorRef ref);
 OSErr setImageCursor(CursorRef ref);
+BOOL decodeImageQuartz(std::string filename, LLImageRaw *raw_image);
+BOOL decodeImageQuartz(const UInt8* data, int len, LLImageRaw *raw_image);
diff --git a/linden/indra/llwindow/llwindowmacosx-objc.mm b/linden/indra/llwindow/llwindowmacosx-objc.mm
index bc47164..abe8c5d 100644
--- a/linden/indra/llwindow/llwindowmacosx-objc.mm
+++ b/linden/indra/llwindow/llwindowmacosx-objc.mm
@@ -32,6 +32,8 @@
  */
 
 #include <AppKit/AppKit.h>
+#include <Accelerate/Accelerate.h>
+#include <Quartz/Quartz.h>
 
 /*
  * These functions are broken out into a separate file because the
@@ -42,6 +44,79 @@
 
 #include "llwindowmacosx-objc.h"
 
+BOOL decodeImageQuartz(const UInt8* data, int len, LLImageRaw *raw_image)
+{
+        CFDataRef theData = CFDataCreate(kCFAllocatorDefault, data, len);
+        CGImageSourceRef srcRef = CGImageSourceCreateWithData(theData, NULL);
+        CGImageRef image_ref = CGImageSourceCreateImageAtIndex(srcRef, 0, NULL);
+
+        size_t width = CGImageGetWidth(image_ref);
+        size_t height = CGImageGetHeight(image_ref);
+        size_t comps = CGImageGetBitsPerPixel(image_ref) / 8;
+        size_t bytes_per_row = CGImageGetBytesPerRow(image_ref);
+        CFDataRef result = CGDataProviderCopyData(CGImageGetDataProvider(image_ref));
+        UInt8* bitmap = (UInt8*)CFDataGetBytePtr(result);
+
+        CGImageAlphaInfo format = CGImageGetAlphaInfo(image_ref);
+        if (format != kCGImageAlphaNone)
+        {
+                vImage_Buffer vb;
+                vb.data = bitmap;
+                vb.height = height;
+                vb.width = width;
+                vb.rowBytes = bytes_per_row;
+
+                if (format & kCGImageAlphaPremultipliedFirst)
+                {
+                        // Ele: ARGB -> BGRA on Intel, need to first reorder the bytes, then unpremultiply as RGBA :)
+                        llinfos << "Unpremultiplying BGRA8888" << llendl;
+
+                        for (int i=0; i<height; i++)
+                        {
+                                for (int j=0; j<bytes_per_row; j+=4)
+                                {
+                                        unsigned char tmp[4];
+
+                                        tmp[0] = bitmap[j*height+3];
+                                        tmp[1] = bitmap[j*height+2];
+                                        tmp[2] = bitmap[j*height+1];
+                                        tmp[3] = bitmap[j*height];
+
+                                        memcpy(&bitmap[j*height], &tmp, 4);
+                                }
+                        }
+
+                        vImageUnpremultiplyData_RGBA8888(&vb, &vb, 0);
+                }
+                else if (format & kCGImageAlphaPremultipliedLast)
+                {
+                        llinfos << "Unpremultiplying RGBA8888" << llendl;
+                        vImageUnpremultiplyData_RGBA8888(&vb, &vb, 0);
+                }
+        }
+
+        raw_image->resize(width, height, comps);
+        memcpy(raw_image->getData(), bitmap, height * bytes_per_row);
+        raw_image->verticalFlip();
+
+        CFRelease(theData);
+        CFRelease(srcRef);
+        CGImageRelease(image_ref);
+        CFRelease(result);
+
+        return TRUE;
+}
+
+BOOL decodeImageQuartz(std::string filename, LLImageRaw *raw_image)
+{
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        NSURL *url = [[NSURL alloc] initFileURLWithPath:[NSString stringWithCString:filename.c_str()]];
+        NSData *data = [NSData dataWithContentsOfURL:url];
+        BOOL result = decodeImageQuartz((UInt8*)[data bytes], [data length], raw_image);
+        [pool release];
+        return result;
+}
+
 void setupCocoa()
 {
         static bool inited = false;
diff --git a/linden/indra/llxml/llcontrol.cpp b/linden/indra/llxml/llcontrol.cpp
index 1d1f024..452167e 100644
--- a/linden/indra/llxml/llcontrol.cpp
+++ b/linden/indra/llxml/llcontrol.cpp
@@ -1099,6 +1099,15 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
                 }
 */
                 
+// [RLVa:KB] - Checked: 2010-06-20 (RLVa-1.1.2a) | Added: RLVa-1.1.2a
+                // HACK-RLVa: bad code but it's just a temporary measure to provide a smooth changeover from the old to the new rebranded settings
+                if ( (name.length() >= 14) && (0 == name.find("RestrainedLife")) )
+                {
+                        // Transparently convert the old settings name to the new one while preserving the user override
+                        name = "RestrainedLove" + name.substr(14);
+                }
+// [/RLVa:KB]
+
                 // If the control exists just set the value from the input file.
                 LLControlVariable* existing_control = getControl(name);
                 if(existing_control)
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 9260b75..dfd35bf 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -486,6 +486,7 @@ set(viewer_SOURCE_FILES
     primbackup.cpp
     rlvhandler.cpp
     rlvhelper.cpp
+    rlvcommon.cpp
     rlvmultistringsearch.cpp
     rlvextensions.cpp
     rlvfloaterbehaviour.cpp
@@ -937,9 +938,9 @@ set(viewer_HEADER_FILES
     primbackup.h
     randgauss.h
     rlvdefines.h
-    rlvevent.h
     rlvhandler.h
     rlvhelper.h
+    rlvcommon.h
     rlvmultistringsearch.h
     rlvextensions.h
     rlvfloaterbehaviour.h
@@ -1146,6 +1147,19 @@ set_source_files_properties(${viewer_XUI_FILES}
 
 list(APPEND viewer_SOURCE_FILES ${viewer_XUI_FILES})
 
+
+set(viewer_LIBRARY_INSTALL_FILES
+    ${CMAKE_SOURCE_DIR}/../install.xml
+    )
+
+source_group("Library Install File" FILES ${viewer_LIBRARY_INSTALL_FILES})
+
+set_source_files_properties(${viewer_LIBRARY_INSTALL_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+                            
+list(APPEND viewer_SOURCE_FILES ${viewer_LIBRARY_INSTALL_FILES})
+
+
 set(viewer_APPSETTINGS_FILES
     app_settings/anim.ini
     app_settings/ao_template.ini
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index d33285d..8c280d4 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4,6 +4,8 @@
   
   <!-- Imprudence-specific settings -->
 
+  <!-- begin name highlighting -->
+  
   <key>nick01</key>
   <map>
     <key>Comment</key>
@@ -102,6 +104,9 @@
       <real>1</real>
     </array>
   </map>
+
+  <!-- end name highlighting -->
+
   <key>AllowMUpose</key>
   <map>
     <key>Comment</key>
@@ -289,6 +294,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>FetchInventoryOnLogin</key>
+        <map>
+                <key>Comment</key>
+                <string>Automatically fetch the inventory in the background after login (has issues)</string>
+                <key>Persist</key>
+                <integer>1</integer>
+                <key>Type</key>
+                <string>Boolean</string>
+                <key>Value</key>
+                <integer>0</integer>
+  </map>
   <key>FloaterAnimationListRect</key>
   <map>
     <key>Comment</key>
@@ -1784,10 +1800,10 @@
   
   <!-- End: Spellcheck & Translation -->
 
-  <key>RestrainedLife</key>
+  <key>RestrainedLove</key>
   <map>
     <key>Comment</key>
-    <string>Toggles the RestrainedLife features (BDSM lockable toys support). Needs a restart of the viewer.</string>
+    <string>Toggles the RestrainedLove features (BDSM lockable toys support). Needs a restart of the viewer.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1795,10 +1811,10 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>RestrainedLifeDebug</key>
+  <key>RestrainedLoveDebug</key>
   <map>
     <key>Comment</key>
-    <string>Toggles the RestrainedLife debug mode (displays the commands when in debug mode).</string>
+    <string>Toggles the RestrainedLove debug mode (displays the commands when in debug mode).</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1806,10 +1822,10 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>RestrainedLifeNoSetEnv</key>
+  <key>RestrainedLoveNoSetEnv</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>
+    <string>When TRUE, forbids to set the environment (time of day and Windlight settings) via RestrainedLove. Needs a restart of the viewer.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1817,10 +1833,10 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>RestrainedLifeForbidGiveToRLV</key>
+  <key>RestrainedLoveForbidGiveToRLV</key>
   <map>
     <key>Comment</key>
-    <string>When FALSE, allows to give sub-folders to the #RLV RestrainedLife folder.</string>
+    <string>When FALSE, allows to give sub-folders to the #RLV RestrainedLove folder.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1828,6 +1844,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>RLVaEnableCompositeFolders</key>
+  <map>
+    <key>Comment</key>
+    <string>Enables composite folders for shared inventory</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>RLVaEnableLegacyNaming</key>
   <map>
     <key>Comment</key>
@@ -1842,7 +1869,7 @@
   <key>RLVaEnableWear</key>
   <map>
     <key>Comment</key>
-    <string>When TRUE, enables the "Wear" option on the inventory item context menu for attachments.</string>
+    <string>Enables the "Wear" option on the inventory item context menu for attachments</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1850,10 +1877,21 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>RLVaEnableSharedWear</key>
+  <map>
+    <key>Comment</key>
+    <string>Attachments in the shared #RLV folder can be force-attached without needing to specify an attachment point (as long as no attachment is non-detachable)</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>
+    <string>Hides "remove outfit" restricted worn clothing layers from @getoufit</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1864,7 +1902,7 @@
   <key>RLVaHideLockedAttachments</key>
   <map>
     <key>Comment</key>
-    <string>When TRUE, hides worn but "no detach" restricted attachments from @getattach</string>
+    <string>Hides non-detachable worn attachments from @getattach</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -1872,6 +1910,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>RLVaSharedInvAutoRename</key>
+  <map>
+    <key>Comment</key>
+    <string>Automatically renames shared inventory items when worn</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>RLVaShowNameTags</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
index 2745845..f50b594 100644
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ b/linden/indra/newview/app_settings/viewerversion.xml
@@ -20,6 +20,6 @@ need to be changed manually - MC
   <viewer version_patch="0" />
 
   <!--string-->
-  <viewer version_test="Experimental 2010.10.09" />
+  <viewer version_test="Experimental 2010.10.17" />
   
 </viewer_version>
diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp
index 6564528..991d2fd 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.cpp
+++ b/linden/indra/newview/floaterlocalassetbrowse.cpp
@@ -74,6 +74,9 @@ this feature is still a work in progress.
 #include "llvovolume.h"
 #include "llface.h"
 
+#ifdef LL_DARWIN
+#include "llwindowmacosx-objc.h"
+#endif
 
 /*=======================================*/
 /*     Instantiating manager class       */
@@ -116,6 +119,10 @@ LocalBitmap::LocalBitmap(std::string fullpath)
                 else if (temp_exten == "tga") { this->extension = IMG_EXTEN_TGA; }
                 else if (temp_exten == "jpg" || temp_exten == "jpeg") { this->extension = IMG_EXTEN_JPG; }
                 else if (temp_exten == "png") { this->extension = IMG_EXTEN_PNG; }
+#ifdef LL_DARWIN
+                else if (temp_exten == "psd") { this->extension = IMG_EXTEN_PSD; }
+                else if (temp_exten == "tif" || temp_exten == "tiff") { this->extension = IMG_EXTEN_TIFF; }
+#endif
                 else { return; } // no valid extension.
 
                 /* getting file's last modified */
@@ -227,6 +234,13 @@ void LocalBitmap::updateSelf()
 
 bool LocalBitmap::decodeSelf(LLImageRaw* rawimg)
 {
+#ifdef LL_DARWIN
+        if (decodeImageQuartz(filename, rawimg))
+        {
+                rawimg->biasedScaleToPowerOfTwo( LLViewerImage::MAX_IMAGE_SIZE_DEFAULT );
+                return true;
+        }
+#else
         switch (this->extension)
         {
                 case IMG_EXTEN_BMP:
@@ -275,6 +289,7 @@ bool LocalBitmap::decodeSelf(LLImageRaw* rawimg)
                 default:
                         break;
         }
+#endif
         return false;
 }
 
diff --git a/linden/indra/newview/floaterlocalassetbrowse.h b/linden/indra/newview/floaterlocalassetbrowse.h
index e02a7d3..69afe98 100644
--- a/linden/indra/newview/floaterlocalassetbrowse.h
+++ b/linden/indra/newview/floaterlocalassetbrowse.h
@@ -114,6 +114,10 @@ class LocalBitmap
                         IMG_EXTEN_TGA,
                         IMG_EXTEN_JPG,
                         IMG_EXTEN_PNG
+#ifdef LL_DARWIN
+                        ,IMG_EXTEN_PSD,
+                        IMG_EXTEN_TIFF
+#endif
                 };
 
                 enum bitmap_type
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index fc12f33..eb5cf9b 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -136,6 +136,10 @@
 #include "llviewerjoystick.h"
 #include "llfollowcam.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 using namespace LLVOAvatarDefines;
 
 extern LLMenuBarGL* gMenuBarView;
@@ -4878,7 +4882,15 @@ void LLAgent::onAnimStop(const LLUUID& id)
         }
         else if (id == ANIM_AGENT_AWAY)
         {
+                //clearAFK();
+// [RLVa:KB] - Checked: 2009-10-19 (RLVa-1.1.0g) | Added: RLVa-1.1.0g
+#ifdef RLV_EXTENSION_CMD_ALLOWIDLE
+                if (!gRlvHandler.hasBehaviour(RLV_BHVR_ALLOWIDLE))
+                        clearAFK();
+#else
                 clearAFK();
+#endif // RLV_EXTENSION_CMD_ALLOWIDLE
+// [/RLVa:KB]
         }
         else if (id == ANIM_AGENT_STANDUP)
         {
@@ -5220,7 +5232,7 @@ 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;
+                str = RlvStrings::getString(RLV_STRING_HIDDEN);
                 return;
         }
 // [/RLVa:KB]
@@ -6223,14 +6235,21 @@ void LLAgent::teleportCancel()
 
 void LLAgent::teleportViaLocation(const LLVector3d& pos_global)
 {
-// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-07 (RLVa-1.0.0d)
-        // If we're getting teleported due to @tpto we should disregard any @tploc=n or @unsit=n restrictions from the same object
-        if ( (rlv_handler_t::isEnabled()) &&
-                 ( (gRlvHandler.hasBehaviourExcept(RLV_BHVR_TPLOC, gRlvHandler.getCurrentObject())) ||
-                   ( (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) && 
-                         (gRlvHandler.hasBehaviourExcept(RLV_BHVR_UNSIT, gRlvHandler.getCurrentObject()))) ) )
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2010-03-02 (RLVa-1.1.1a) | Modified: RLVa-1.2.0a
+        if (rlv_handler_t::isEnabled())
         {
-                return;
+                // If we're getting teleported due to @tpto we should disregard any @tploc=n or @unsit=n restrictions from the same object
+                if ( (gRlvHandler.hasBehaviourExcept(RLV_BHVR_TPLOC, gRlvHandler.getCurrentObject())) ||
+                     ( (mAvatarObject.notNull()) && (mAvatarObject->mIsSitting) &&
+                           (gRlvHandler.hasBehaviourExcept(RLV_BHVR_UNSIT, gRlvHandler.getCurrentObject()))) )
+                {
+                        return;
+                }
+
+                if ( (gRlvHandler.getCurrentCommand()) && (RLV_BHVR_TPTO == gRlvHandler.getCurrentCommand()->getBehaviourType()) )
+                {
+                        gRlvHandler.setCanCancelTp(false);
+                }
         }
 // [/RLVa:KB]
 
@@ -6300,7 +6319,7 @@ void LLAgent::setTeleportState(ETeleportState state)
                 // We're outa here. Save "back" slurl.
                 mTeleportSourceSLURL = getSLURL();
         }
-// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.0b
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Version: 1.23.4 | Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.0b
         if ( (rlv_handler_t::isEnabled()) && (TELEPORT_NONE == mTeleportState) )
         {
                 gRlvHandler.setCanCancelTp(true);
@@ -6943,14 +6962,14 @@ 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
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | 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
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | 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]
@@ -6962,7 +6981,7 @@ void LLAgent::processAgentInitialWearablesUpdate( LLMessageSystem* mesgsys, void
                         }
                 }
 
-// [RLVa:KB] - Checked: 2009-08-08 (RLVa-1.0.1g) | Added: RLVa-1.0.1g
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | 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) )
                 {
@@ -7949,93 +7968,37 @@ void LLAgent::userRemoveAllAttachments( void* userdata )
                 return;
         }
 
-// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-        // 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(); )
+// [RLVa:KB] - Checked: 2009-11-24 (RLVa-1.1.0f) | Modified: RLVa-1.1.0e
+        std::list<U32> LocalIDs;
+        for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); iter != avatarp->mAttachmentPoints.end(); )
         {
                 LLVOAvatar::attachment_map_t::iterator curiter = iter++;
                 LLViewerJointAttachment* attachment = curiter->second;
                 LLViewerObject* objectp = attachment->getObject();
                 if (objectp)
                 {
-                        if (rlv_handler_t::isEnabled())
-                        {
-                                if (gRlvHandler.isLockedAttachment(curiter->first, RLV_LOCK_REMOVE))
-                                        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());
+                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(curiter->first, RLV_LOCK_REMOVE)) )
+                                continue;
+                        LocalIDs.push_back(objectp->getLocalID());
                 }
         }
 
         // Only send the message if we actually have something to detach
-        if (rlvAttachments.size() > 0)
+        if (LocalIDs.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)
+                for (std::list<U32>::const_iterator itLocalID = LocalIDs.begin(); itLocalID != LocalIDs.end(); ++itLocalID)
                 {
                         gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-                        gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, *itAttach);
+                        gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, *itLocalID);
                 }
 
-                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]
 }
 
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index f1cad9c..141c72c 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -69,10 +69,6 @@
 #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
 
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index dd3c848..e85abb1 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -178,6 +178,10 @@
 #include "hippoLimits.h"
 #include "hippoUpdate.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 // *FIX: These extern globals should be cleaned up.
 // The globals either represent state/config/resource-storage of either 
 // this app, or another 'component' of the viewer. App globals should be 
@@ -328,7 +332,15 @@ static std::string gHelperURI;
 void idle_afk_check()
 {
         // check idle timers
+        //if (gAllowIdleAFK && (gAwayTriggerTimer.getElapsedTimeF32() > gSavedSettings.getF32("AFKTimeout")))
+// [RLVa:KB] - Checked: 2009-10-19 (RLVa-1.1.0g) | Added: RLVa-1.1.0g
+#ifdef RLV_EXTENSION_CMD_ALLOWIDLE
+        if ( (gAllowIdleAFK || gRlvHandler.hasBehaviour(RLV_BHVR_ALLOWIDLE)) &&
+                 (gAwayTriggerTimer.getElapsedTimeF32() > gSavedSettings.getF32("AFKTimeout")))
+#else
         if (gAllowIdleAFK && (gAwayTriggerTimer.getElapsedTimeF32() > gSavedSettings.getF32("AFKTimeout")))
+#endif // RLV_EXTENSION_CMD_ALLOWIDLE
+// [/RLVa:KB]
         {
                 gAgent.setAFK();
         }
@@ -1787,7 +1799,7 @@ bool LLAppViewer::initConfiguration()
         // - set procedural settings 
         gSavedSettings.setString("ClientSettingsFile", 
         // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));
-        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence.xml"));
+        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence_experimental.xml"));
 
         gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName());
 
@@ -2768,7 +2780,9 @@ void LLAppViewer::forceQuit()
 
         LL_INFOS("forceQuit") << "Destroying the entire world" << LL_ENDL;
         if (mQuitRequested)
-        LLApp::setQuitting(); 
+        {
+                LLApp::setQuitting();
+        }
         else
         {
                 if (mLogoutRequested) //we just finished a logout request
@@ -3728,15 +3742,6 @@ void LLAppViewer::idleShutdown()
                 forceQuit();
         }
 
-
-        static bool saved_snapshot = false;
-        if (!saved_snapshot)
-        {
-                saved_snapshot = true;
-                saveFinalSnapshot();
-                return;
-        }
-
         // Attempt to close all floaters that might be
         // editing things.
         if (gFloaterView)
@@ -4220,7 +4225,7 @@ void LLAppViewer::handleLoginComplete()
         }
         writeDebugInfo();
 
-// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
         // NOTE: this function isn't called in Imprudence so any changes need to go in idle_startup() instead
         gRlvHandler.initLookupTables();
 
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index a22fd8f..0633c8d 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -88,6 +88,9 @@ void toggleChatHistory(void* user_data);
 void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channel);
 // [/RLVa:KB]
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 class LLChatBarGestureObserver : public LLGestureManagerObserver
 {
@@ -119,6 +122,8 @@ LLChatBar::LLChatBar()
         mCompletionHolder.current_index = 0;
         mCompletionHolder.last_match = "";
         mCompletionHolder.last_txt = "";
+        mCompletionHolder.cursorPos = -1;
+        mCompletionHolder.selected = false;
 
         #if !LL_RELEASE_FOR_DOWNLOAD
         childDisplayNotFound();
@@ -224,16 +229,17 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
 
                         if (!avatar_ids.empty() && !txt.empty())
                         {
-                                S32 cursorPos = mInputEditor->getCursor();
+                                if (mCompletionHolder.cursorPos == -1) // Ele: cache cursor position
+                                        mCompletionHolder.cursorPos = mInputEditor->getCursor();
 
                                 if (mCompletionHolder.last_txt != mInputEditor->getText())
                                 {
                                         mCompletionHolder.last_txt = std::string(mInputEditor->getText());
 
-                                        if (cursorPos < (S32)txt.length())
+                                        if (mCompletionHolder.cursorPos < (S32)txt.length())
                                         {
-                                                mCompletionHolder.right = txt.substr(cursorPos);
-                                                mCompletionHolder.left = txt.substr(0, cursorPos);
+                                                mCompletionHolder.right = txt.substr(mCompletionHolder.cursorPos);
+                                                mCompletionHolder.left = txt.substr(0, mCompletionHolder.cursorPos);
                                                 mCompletionHolder.match = std::string(mCompletionHolder.left);
                                         }
                                         else
@@ -262,24 +268,7 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
                                 {
                                         if (avatar_ids[i] == gAgent.getID() || avatar_ids[i].isNull())
                                                 continue;
-/*
-                                        // Grab the pos again from the objects-in-view cache... LLWorld doesn't work above 1024 meters as usual :(
-                                        LLVector3d real_pos = positions[i];
-                                        if (real_pos[2] == 0.0f)
-                                        {
-                                                LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]);
-                                                if (av_obj != NULL && av_obj->isAvatar())
-                                                {
-                                                        LLVOAvatar* avatarp = (LLVOAvatar*)av_obj;
-                                                        if (avatarp != NULL)
-                                                                real_pos = avatarp->getPositionGlobal();
-                                                }
-                                        }
 
-                                        F32 dist = F32(dist_vec(positions[i], gAgent.getPositionGlobal()));
-                                        if (dist > CHAT_SHOUT_RADIUS)
-                                                continue;
-*/
                                         std::string agent_name = " ";
                                         std::string agent_surname = " ";
 
@@ -305,9 +294,11 @@ BOOL LLChatBar::handleKeyHere( KEY key, MASK mask )
                                         std::string current_name = mCompletionHolder.names[mCompletionHolder.current_index];
 
                                         mInputEditor->setText(mCompletionHolder.left.substr(0, mCompletionHolder.left.length() - mCompletionHolder.match.length()) + current_name + mCompletionHolder.right);
-                                        mInputEditor->setSelection(cursorPos, cursorPos + (current_name.length() - mCompletionHolder.match.length()));
+                                        mInputEditor->setCursor(mCompletionHolder.cursorPos + (current_name.length() - mCompletionHolder.match.length()));
+                                        mInputEditor->setSelection(mCompletionHolder.cursorPos, mCompletionHolder.cursorPos + (current_name.length() - mCompletionHolder.match.length()));
 
                                         mCompletionHolder.current_index++;
+                                        mCompletionHolder.selected = TRUE;
 
                                         return TRUE;
                                 }
@@ -660,6 +651,9 @@ void LLChatBar::stopChat()
 void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
 {
         LLChatBar* self = (LLChatBar *)userdata;
+        KEY key = gKeyboard->currentKey();
+
+        self->mCompletionHolder.cursorPos = -1; // Ele: reset cached cursor pos for autocompletion
 
         LLWString raw_text;
         if (self->mInputEditor) raw_text = self->mInputEditor->getWText();
@@ -704,8 +698,6 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata )
         }
         */
 
-        KEY key = gKeyboard->currentKey();
-
         // Ignore "special" keys, like backspace, arrows, etc.
         if (length > 1 && raw_text[0] == '/' && key < KEY_SPECIAL)
         {
@@ -788,7 +780,7 @@ 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
+// [RLVa:KB] - Checked: 2010-03-27 (RLVa-1.1.1a) | Modified: RLVa-1.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)
@@ -799,7 +791,7 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
                 else if ( (CHAT_TYPE_WHISPER == type) && (gRlvHandler.hasBehaviour(RLV_BHVR_CHATWHISPER)) )
                         type = CHAT_TYPE_NORMAL;
 
-                animate &= !gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT);
+                animate &= !gRlvHandler.hasBehaviour( (!rlvIsEmote(utf8_text)) ? RLV_BHVR_REDIRCHAT : RLV_BHVR_REDIREMOTE );
         }
 // [/RLVa:KB]
 
@@ -843,7 +835,7 @@ void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL
 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
+// [RLVa:KB] - Checked: 2010-02-27 (RLVa-1.1.1a) | Modified: RLVa-1.2.0a
         // 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) ) )
         {
@@ -864,8 +856,8 @@ void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channe
                                 return;
                         }
 
-                        // Filter public chat if sendchat restricted (and filter anything that redirchat didn't redirect)
-                        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHAT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_REDIRCHAT)) )
+                        // Filter public chat if sendchat restricted
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHAT))
                                 gRlvHandler.filterChat(utf8_out_text, true);
                 }
                 else
@@ -875,7 +867,7 @@ void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channe
                                 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)
+                        if (CHAT_CHANNEL_DEBUG == channel)
                         {
                                 bool fIsEmote = rlvIsEmote(utf8_out_text);
                                 if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDCHAT)) || 
diff --git a/linden/indra/newview/llchatbar.h b/linden/indra/newview/llchatbar.h
index 5542d8a..3e7ee03 100644
--- a/linden/indra/newview/llchatbar.h
+++ b/linden/indra/newview/llchatbar.h
@@ -54,6 +54,8 @@ struct CompletionHolder {
         std::string last_txt;
         std::string last_match;
         int current_index;
+        S32 cursorPos;
+        BOOL selected;
 };
 
 class LLChatBar
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index 40b1abb..a59fa06 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -532,12 +532,16 @@ Boolean LLFilePicker::navOpenFilterProc(AEDesc *theItem, void *info, void *callB
                                                 {
                                                         if (fileInfo.filetype != 'JPEG' && fileInfo.filetype != 'JPG ' && 
                                                                 fileInfo.filetype != 'BMP ' && fileInfo.filetype != 'TGA ' &&
+                                                                fileInfo.filetype != 'TIFF' && fileInfo.filetype != 'PSD ' &&
                                                                 fileInfo.filetype != 'BMPf' && fileInfo.filetype != 'TPIC' &&
                                                                 fileInfo.filetype != 'PNG ' &&
                                                                 (fileInfo.extension && (CFStringCompare(fileInfo.extension, CFSTR("jpeg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                 CFStringCompare(fileInfo.extension, CFSTR("jpg"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                 CFStringCompare(fileInfo.extension, CFSTR("bmp"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                 CFStringCompare(fileInfo.extension, CFSTR("tga"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
+                                                                CFStringCompare(fileInfo.extension, CFSTR("psd"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
+                                                                CFStringCompare(fileInfo.extension, CFSTR("tiff"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
+                                                                CFStringCompare(fileInfo.extension, CFSTR("tif"), kCFCompareCaseInsensitive) != kCFCompareEqualTo &&
                                                                 CFStringCompare(fileInfo.extension, CFSTR("png"), kCFCompareCaseInsensitive) != kCFCompareEqualTo))
                                                                 )
                                                         {
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index e82aa96..0b777ea 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -328,21 +328,6 @@ void LLFirstUse::showRlvFirstUseNotification(const std::string& strName)
         }
 }
 
-void LLFirstUse::warnRlvGiveToRLV()
-{
-        if ( (gSavedSettings.getWarning(RLV_SETTING_FIRSTUSE_GIVETORLV)) && (RlvSettings::getForbidGiveToRLV()) )
-                LLNotifications::instance().add(RLV_SETTING_FIRSTUSE_GIVETORLV, LLSD(), LLSD(), &LLFirstUse::onRlvGiveToRLVConfirmation);
-}
-
-void LLFirstUse::onRlvGiveToRLVConfirmation(const LLSD& notification, const LLSD& response)
-{
-        gSavedSettings.setWarning(RLV_SETTING_FIRSTUSE_GIVETORLV, FALSE);
-
-        S32 idxOption = LLNotification::getSelectedOption(notification, response);
-        if ( (0 == idxOption) || (1 == idxOption) )
-                gSavedSettings.setBOOL(RLV_SETTING_FORBIDGIVETORLV, (idxOption == 1));
-}
-
 // [/RLVa:KB]
 
 void LLFirstUse::callbackClientTags(const LLSD& notification, const LLSD& response)
diff --git a/linden/indra/newview/llfirstuse.h b/linden/indra/newview/llfirstuse.h
index b0bf05f..42443ff 100644
--- a/linden/indra/newview/llfirstuse.h
+++ b/linden/indra/newview/llfirstuse.h
@@ -127,10 +127,6 @@ public:
         static void useRlvDetach()              { showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_DETACH); }
         static void useRlvEnableWear()  { showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_ENABLEWEAR); }
         static void useRlvFartouch()    { showRlvFirstUseNotification(RLV_SETTING_FIRSTUSE_FARTOUCH); }
-
-        static void warnRlvGiveToRLV();
-protected:
-        static void onRlvGiveToRLVConfirmation(const LLSD& notification, const LLSD& response);
 // [/RLVa:KB]
 };
 
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 900f6e7..9c1d67b 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -61,6 +61,10 @@
 #include "llwindow.h"
 #include "viewerversion.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #if LL_WINDOWS
 #include "lldxhardware.h"
 #endif
@@ -134,7 +138,7 @@ LLFloaterAbout::LLFloaterAbout()
 #endif
 
 #if LL_GNUC
-    support.append(llformat("Built with GCC version %d\n\n", GCC_VERSION));
+        support.append(llformat("Built with GCC version %s\n\n", __VERSION__));
 #endif
 
         // Position
@@ -142,7 +146,7 @@ LLFloaterAbout::LLFloaterAbout()
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-04 (RLVa-1.0.0a)
         if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
         {
-                support.append(rlv_handler_t::cstrHidden);
+                support.append(RlvStrings::getString(RLV_STRING_HIDDEN));
                 support.append("\n\n");
         }
         else if (region)
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 51e7b89..59de717 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -51,6 +51,10 @@
 #include "llworld.h"
 #include "llappviewer.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const F32 SPEAKER_TIMEOUT = 10.f; // seconds of not being on voice channel before removed from list of active speakers
 const F32 RESORT_TIMEOUT = 5.f; // seconds of mouse inactivity before it's ok to sort regardless of mouse-in-view.
 const LLColor4 INACTIVE_COLOR(0.3f, 0.3f, 0.3f, 0.5f);
@@ -103,7 +107,7 @@ void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const std::string& first, c
 // [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);
+                        speaker_ptr->mDisplayName = RlvStrings::getAnonym(speaker_ptr->mDisplayName);
 // [/RLVa:KB]
         }
 }
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index da1d5fc..09d3b2c 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -60,6 +60,7 @@
 #include "lltoolmgr.h"
 #include "llui.h"
 #include "llviewercamera.h"
+#include "llviewercontrol.h"
 #include "llviewerobjectlist.h"
 #include "llviewerwindow.h"
 #include "llviewermenufile.h"   // upload_new_resource()
diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp
index 4eca8af..1788481 100644
--- a/linden/indra/newview/llfloateravatarpicker.cpp
+++ b/linden/indra/newview/llfloateravatarpicker.cpp
@@ -48,6 +48,10 @@
 #include "llviewercontrol.h"
 #include "llworld.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const S32 MIN_WIDTH = 200;
 const S32 MIN_HEIGHT = 340;
 const LLRect FLOATER_RECT(0, 380, 240, 0);
diff --git a/linden/indra/newview/llfloaterbeacons.cpp b/linden/indra/newview/llfloaterbeacons.cpp
index 5a5de77..aa89780 100644
--- a/linden/indra/newview/llfloaterbeacons.cpp
+++ b/linden/indra/newview/llfloaterbeacons.cpp
@@ -38,8 +38,8 @@
 #include "llcheckboxctrl.h"
 #include "pipeline.h"
 
-// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d)
-#include "llagent.h"
+// [RLVa:KB]
+#include "rlvhandler.h"
 // [/RLVa:KB]
 
 LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 59f4d70..3f0b184 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -91,6 +91,10 @@ const F32 CHAT_MSG_SIZE = 8.0f;
 const LLColor4 MUTED_MSG_COLOR(0.5f, 0.5f, 0.5f, 1.f);
 const S32 MAX_CHATTER_COUNT = 16;
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //
 // Global statics
 //
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index a85ce9d..79e9e31 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -610,9 +610,9 @@ void LLPanelGroups::applyChangesToGroups()
                                 }
 
                                 // chat
-                                if (join_group_chat != (!gIMMgr->getIgnoreGroup(group_id)))
+                                if (!join_group_chat != gIMMgr->getIgnoreGroup(group_id))
                                 {
-                                        gIMMgr->updateIgnoreGroup(group_id, join_group_chat);
+                                        gIMMgr->updateIgnoreGroup(group_id, !join_group_chat);
                                 }
                         }
                 }
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 9827a31..8142869 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -62,6 +62,10 @@
 
 #include "hippoGridManager.h"
 
+#ifdef LL_DARWIN
+#include "llwindowmacosx-objc.h"
+#endif
+
 //static
 S32 LLFloaterImagePreview::sUploadAmount = 10;
 
@@ -351,9 +355,22 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
         {
                 codec = IMG_CODEC_PNG;
         }
+#ifdef LL_DARWIN
+        else if( exten == "psd" )
+        {
+                codec = IMG_CODEC_PSD;
+        }
+        else if( exten == "tif" || exten == "tiff" )
+        {
+                codec = IMG_CODEC_TIFF;
+        }
+#endif
 
         LLPointer<LLImageRaw> raw_image = new LLImageRaw;
-
+#ifdef LL_DARWIN
+        if (! decodeImageQuartz(src_filename, raw_image))
+                return false;
+#else
         switch (codec)
         {
         case IMG_CODEC_BMP:
@@ -427,9 +444,10 @@ bool LLFloaterImagePreview::loadImage(const std::string& src_filename)
                 return false;
         }
 
+#endif
+
         raw_image->biasedScaleToPowerOfTwo(1024);
         mRawImagep = raw_image;
-        
         return true;
 }
 
diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index 4822bb0..51c7835 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -43,7 +43,7 @@
 #include "llviewerobject.h"
 #include "lluictrlfactory.h"
 
-// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+// [RLVa:KB]
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
@@ -241,7 +241,7 @@ void LLFloaterInspect::refresh()
                 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);
+                        owner_name = RlvStrings::getAnonym(owner_name);
                 }
 // [/RLVa:KB]
                 gCacheName->getFullName(obj->mPermissions->getCreator(), creator_name);
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 066b739..7dd4f8d 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -78,6 +78,10 @@
 
 #include "hippoGridManager.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 static std::string OWNER_ONLINE         = "0";
 static std::string OWNER_OFFLINE        = "1";
 static std::string OWNER_GROUP          = "2";
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index b56fb5f..c15678d 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -46,6 +46,10 @@
 #include "panelradar.h"
 
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 LLFloaterMap::LLFloaterMap(const LLSD& key)
         :
         LLFloater(std::string("minimap")),
diff --git a/linden/indra/newview/llfloaterobjectiminfo.cpp b/linden/indra/newview/llfloaterobjectiminfo.cpp
index fa7964c..06e6213 100644
--- a/linden/indra/newview/llfloaterobjectiminfo.cpp
+++ b/linden/indra/newview/llfloaterobjectiminfo.cpp
@@ -47,7 +47,7 @@
 #include "llurldispatcher.h"
 #include "llviewercontrol.h"
 
-// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-0.2.0g
+// [RLVa:KB] - Version: 1.23.4
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
@@ -190,7 +190,7 @@ void LLFloaterObjectIMInfo::nameCallback(const LLUUID& id, const std::string& fi
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0g
         if ( (!is_group) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(id)) )
         {
-                self->mOwnerName = gRlvHandler.getAnonym(self->mOwnerName);
+                self->mOwnerName = RlvStrings::getAnonym(self->mOwnerName);
         }
 // [/RLVa:KB]
 
diff --git a/linden/indra/newview/llfloaterproperties.cpp b/linden/indra/newview/llfloaterproperties.cpp
index 7dc6e42..40b293a 100644
--- a/linden/indra/newview/llfloaterproperties.cpp
+++ b/linden/indra/newview/llfloaterproperties.cpp
@@ -61,6 +61,9 @@
 
 #include "hippoGridManager.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLPropertiesObserver
@@ -362,7 +365,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
                         if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
                         {
-                                name = gRlvHandler.getAnonym(name);
+                                name = RlvStrings::getAnonym(name);
                         }
 // [/RLVa:KB]
                 }
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 08d845b..deee0f6 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -81,6 +81,10 @@
 #include "llviewerwindow.h"
 #include "llvlcomposition.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #define ELAR_ENABLED 0 // Enable when server support is implemented
 
 const S32 TERRAIN_TEXTURE_COUNT = 4;
diff --git a/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp
index a7f41ea..15f278d 100644
--- a/linden/indra/newview/llfloaterreporter.cpp
+++ b/linden/indra/newview/llfloaterreporter.cpp
@@ -84,6 +84,10 @@
 
 #include "llassetuploadresponders.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const U32 INCLUDE_SCREENSHOT  = 0x01 << 0;
 
 //-----------------------------------------------------------------------------
@@ -319,7 +323,7 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id)
 // [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);
+                                        childSetText("sim_field", RlvStrings::getString(RLV_STRING_HIDDEN_REGION));
                                 }
 // [/RLVa:KB]
                                 LLVector3d global_pos;
@@ -357,6 +361,7 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id)
                         }
                         else
                         {
+                                LLSelectMgr::waitForObjectResponse(mObjectID);
                                 // we have to query the simulator for information 
                                 // about this object
                                 LLMessageSystem* msg = gMessageSystem;
diff --git a/linden/indra/newview/llfloatersettingsdebug.cpp b/linden/indra/newview/llfloatersettingsdebug.cpp
index fd6c47b..0aa0607 100644
--- a/linden/indra/newview/llfloatersettingsdebug.cpp
+++ b/linden/indra/newview/llfloatersettingsdebug.cpp
@@ -40,7 +40,7 @@
 #include "llcolorswatch.h"
 #include "llviewercontrol.h"
 
-// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0g)
+// [RLVa:KB]
 #include "rlvhandler.h"
 #include "rlvextensions.h"
 // [/RLVa:KB]
@@ -258,7 +258,7 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
                         fEnable &= !((gRlvHandler.hasBehaviour(RLV_BHVR_SETENV)) && 
                                 (("VertexShaderEnable" == controlp->getName()) || ("WindLightUseAtmosShaders" == controlp->getName())));
                         #ifdef RLV_EXTENSION_STARTLOCATION
-                                // Don't allow toggling RestrainedLifeLoginLastLocation
+                                // Don't allow toggling RLVaLoginLastLocation
                                 fEnable &= !(RLV_SETTING_LOGINLASTLOCATION == controlp->getName());
                         #endif // RLV_EXTENSION_STARTLOCATION
 
diff --git a/linden/indra/newview/llfloaterteleporthistory.cpp b/linden/indra/newview/llfloaterteleporthistory.cpp
index 70a2d71..c901029 100644
--- a/linden/indra/newview/llfloaterteleporthistory.cpp
+++ b/linden/indra/newview/llfloaterteleporthistory.cpp
@@ -108,6 +108,7 @@ BOOL LLFloaterTeleportHistory::postBuild()
         childSetAction("teleport", onTeleport, this);
         childSetAction("show_on_map", onShowOnMap, this);
         childSetAction("copy_slurl", onCopySLURL, this);
+        childSetAction("clear_history", onClearHistory,this);
         loadEntrys();
 
         return TRUE;
@@ -121,7 +122,13 @@ void LLFloaterTeleportHistory::saveEntry(LLSD toSave)
         LLSDSerialize::toPrettyXML(tpList, file);
         file.close();
 }
-
+void LLFloaterTeleportHistory::clearHistory()
+{
+        tpList.clear();
+        saveEntry(tpList);
+        mPlacesOutList->clearRows();
+        mPlacesInList->clearRows();
+}
 std::string LLFloaterTeleportHistory::getFileName()
 {
         std::string path=gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "");
@@ -204,23 +211,13 @@ void LLFloaterTeleportHistory::addEntry(std::string regionName, S16 x, S16 y, S1
                 value["columns"][4]["value"] = simString;
                 value["out"]=outList;
 
-// [RLVa:KB] - Alternate: Emerald-370
+// [RLVa:KB] - Alternate: Imprudence-1.4
                 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
                 {
-                        // TODO: This is the original code from Emerald. It
-                        // uses the class RlvStrings, defined in rlvcommon.cpp
-                        // to load localized strings. For Imprudence we use the
-                        // old fashioned way via RlvHandler with English
-                        // strings only!
-                        // value["columns"][0]["value"] = RlvStrings::getString(RLV_STRING_HIDDEN_REGION);
-                        // value["columns"][1]["value"] = RlvStrings::getString(RLV_STRING_HIDDEN);
-                        // value["columns"][3]["value"] = RlvStrings::getString(RLV_STRING_HIDDEN);
-                        // value["columns"][4]["value"] = RlvStrings::getString(RLV_STRING_HIDDEN);
-
-                         value["columns"][0]["value"] = RlvHandler::cstrHiddenRegion;
-                         value["columns"][1]["value"] = RlvHandler::cstrHidden;
-                         value["columns"][3]["value"] = RlvHandler::cstrHidden;
-                         value["columns"][4]["value"] = RlvHandler::cstrHidden;
+                        value["columns"][0]["value"] = RlvStrings::getString(RLV_STRING_HIDDEN_REGION);
+                        value["columns"][1]["value"] = RlvStrings::getString(RLV_STRING_HIDDEN);
+                        value["columns"][3]["value"] = RlvStrings::getString(RLV_STRING_HIDDEN);
+                        value["columns"][4]["value"] = RlvStrings::getString(RLV_STRING_HIDDEN);
                 }
 // [/RLVa:KB]
                 saveEntry(value);
@@ -238,16 +235,10 @@ void LLFloaterTeleportHistory::addEntry(std::string regionName, S16 x, S16 y, S1
 
 void LLFloaterTeleportHistory::setButtonsEnabled(BOOL on)
 {
-// [RLVa:KB] - Alternate: Emerald-370
+// [RLVa:KB] - Alternate: Imprudence-1.4
         if (rlv_handler_t::isEnabled())
         {
-                // TODO: This is the original code from Emerald. It
-                // uses the class RlvStrings, defined in rlvcommon.cpp
-                // to load localized strings. For Imprudence we use the
-                // old fashioned way via RlvHandler with English
-                // strings only!
-                //if ( (pItem) && (pItem->getColumn(4)) && (RlvStrings::getString(RLV_STRING_HIDDEN) == pItem->getColumn(4)->getValue().asString()) )
-                if ( (pItem) && (pItem->getColumn(4)) && (RlvHandler::cstrHidden == pItem->getColumn(4)->getValue().asString()) )
+                if ( (pItem) && (pItem->getColumn(4)) && (RlvStrings::getString(RLV_STRING_HIDDEN) == pItem->getColumn(4)->getValue().asString()) )
                 {
                         on = FALSE;
                 }
@@ -319,6 +310,13 @@ void LLFloaterTeleportHistory::onTeleport(void* data)
 }
 
 // static
+void LLFloaterTeleportHistory::onClearHistory(void* data)
+{
+        LLFloaterTeleportHistory* self = (LLFloaterTeleportHistory*) data;
+        self->clearHistory();
+}
+
+// static
 void LLFloaterTeleportHistory::onShowOnMap(void* data)
 {
         LLFloaterTeleportHistory* self = (LLFloaterTeleportHistory*) data;
diff --git a/linden/indra/newview/llfloaterteleporthistory.h b/linden/indra/newview/llfloaterteleporthistory.h
index e458259..702daf5 100644
--- a/linden/indra/newview/llfloaterteleporthistory.h
+++ b/linden/indra/newview/llfloaterteleporthistory.h
@@ -63,9 +63,12 @@ class LLFloaterTeleportHistory : public LLFloater
                 /// @brief: adds a teleport destination to the list of visited places
                 void addEntry(std::string regionName, S16 x, S16 y, S16 z,bool outList);
 
+                void clearHistory();
+
         protected:
                 static void onInPlacesSelected(LLUICtrl* ctrl, void* data);
                 static void onOutPlacesSelected(LLUICtrl* ctrl, void* data);
+                static void onClearHistory(void* data);
                 static void onTeleport(void* data);
                 static void onShowOnMap(void* data);
                 static void onCopySLURL(void* data);
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index f6f09b1..fc72467 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -528,14 +528,54 @@ 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);
+        // Added in Link Num value -HgB
+    if (gSavedSettings.getBOOL("EditLinkedParts") && LLSelectMgr::getInstance()->getEditSelection()->getObjectCount() == 1) //Selecting a single prim in "Edit Linked" mode, show link number
+    {
+                childSetVisible("obj_count", FALSE);
+                childSetVisible("prim_count", FALSE);
+                childSetVisible("link_num", TRUE);
+
+                std::string value_string = "";
+                LLViewerObject* selected = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+                if (selected && selected->getRootEdit())
+                {
+                        LLViewerObject::child_list_t children = selected->getRootEdit()->getChildren();
+                        if (children.empty())
+                        {
+                                // An unlinked prim is "link 0".
+                                value_string = "0";
+                        }
+                        else 
+                        {
+                                children.push_front(selected->getRootEdit()); // need root in the list too
+                                S32 index = 0;
+                                for (LLViewerObject::child_list_t::iterator iter = children.begin(); iter != children.end(); ++iter)
+                                {
+                                        index++;
+                                        if ((*iter)->isSelected())
+                                        {
+                                                LLResMgr::getInstance()->getIntegerString(value_string, index);
+                                                break;
+                                        }
+                                }
+                        }
+                }
+                childSetTextArg("link_num", "[NUMBER]", value_string);
+        }
+        else
+        {
+                // Refresh object and prim count labels
+                childSetVisible("obj_count", TRUE);
+                childSetVisible("prim_count", TRUE);
+                childSetVisible("link_num", FALSE);
+                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);
+        }
 
         updateToolsPrecision();
 
@@ -887,8 +927,15 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                 childSetVisible("Strength:", land_visible);
         }
 
-        childSetVisible("obj_count", !land_visible);
-        childSetVisible("prim_count", !land_visible);
+        if (gSavedSettings.getBOOL("EditLinkedParts"))
+        {
+                childSetVisible("link_num", !land_visible);
+        }
+        else
+        {
+                childSetVisible("obj_count", !land_visible);
+                childSetVisible("prim_count", !land_visible);
+        }
         mTab->setVisible(!land_visible);
         mPanelLandInfo->setVisible(land_visible);
 }
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 781cf4d..0a01ca7 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -72,6 +72,10 @@
 
 #include "hippoLimits.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //---------------------------------------------------------------------------
 // Constants
 //---------------------------------------------------------------------------
@@ -661,8 +665,8 @@ void LLFloaterWorldMap::trackLocation(const LLVector3d& pos_global)
         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(), 
-// [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] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-04 (RLVa-1.0.0a)
+                (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? sim_name.c_str() : RlvStrings::getString(RLV_STRING_HIDDEN_REGION).c_str(),
 // [/RLVa:KB]
                                                                   llround(region_x), 
                                                                   llround(region_y),
@@ -721,7 +725,7 @@ void LLFloaterWorldMap::updateLocation()
 // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
                                 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
                                 {
-                                        childSetValue("location", rlv_handler_t::cstrHiddenRegion);
+                                        childSetValue("location", RlvStrings::getString(RLV_STRING_HIDDEN_REGION));
                                         mSLURL.clear();
                                 }
 // [/RLVa:KB]
@@ -771,7 +775,7 @@ void LLFloaterWorldMap::updateLocation()
 // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
                 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
                 {
-                        childSetValue("location", rlv_handler_t::cstrHiddenRegion);
+                        childSetValue("location", RlvStrings::getString(RLV_STRING_HIDDEN_REGION));
                         mSLURL.clear();
                 }
 // [/RLVa:KB]
diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index 2203452..bb678d7 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -58,6 +58,7 @@
 #include "llpreviewtexture.h"
 #include "llviewermessage.h"
 #include "llvoavatar.h"
+#include "llviewercontrol.h"
 #include "llviewerimagelist.h"
 #include "llviewerstats.h"
 #include "llweb.h"
@@ -602,6 +603,207 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
                                 LLWeb::loadURLInternal("http://failbook.failblog.org/");
                                 return TRUE;
                         }
+                        else if (LLStringUtil::compareInsensitive("/icanhaszombie", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhaszombies", cur_token) == 0)
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("zombiecat.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "Zombiecat!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhassupport", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhashelp", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhashalp", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://support.imprudenceviewer.org/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasblog", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://www.imprudenceviewer.org/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhascodie", cur_token) == 0)
+                        {
+                                LLChat chat;
+                                chat.mText = "All work and no play makes Codie a dull girl. All work and no play...";
+                                chat.mSourceType = CHAT_SOURCE_SYSTEM;
+                                LLFloaterChat::addChat(chat);
+                                if (revised_string)
+                                {
+                                        revised_string->assign(LLStringUtil::null);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasfail", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://www.failblog.org/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasdownload", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhasdownloads", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhasupdate", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhasupdates", cur_token) == 0 )
+                        {
+                                LLWeb::loadURLInternal("http://imprudenceviewer.org/wiki/Downloads");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasfeatures", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://imprudenceviewer.org/wiki/Features");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhaswiki", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://imprudenceviewer.org/wiki/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasbugs", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhasbug", cur_token) == 0 )
+                        {
+                                LLWeb::loadURLInternal("http://redmine.imprudenceviewer.org/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasgit", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://github.com/imprudence/imprudence/");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasplurk", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://plurk.com/imprudence");
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhastwitter", cur_token) == 0)
+                        {
+                                LLWeb::loadURLInternal("http://twitter.com/ImpViewer");
+                                return TRUE;
+                        }
+                        
+
+                        else if (LLStringUtil::compareInsensitive("/icanhasimprudence", cur_token) == 0)
+                        {
+                                LLChat chat;
+                                chat.mText = "You are using it right now, silly!...";
+                                chat.mSourceType = CHAT_SOURCE_SYSTEM;
+                                LLFloaterChat::addChat(chat);
+                                if (revised_string)
+                                {
+                                        revised_string->assign(LLStringUtil::null);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasnoms", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhasnom", cur_token) == 0)
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("nomnom.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "Om nom nom!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhasceilingcat", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhascielingcat", cur_token) == 0)
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("ceilingcat.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "Ceiling Cat is watching you!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhascake", cur_token) == 0 )
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("cakeisalie.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "THE CAKE IS A LIE!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhastentacles", cur_token) == 0 )
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("octopus.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "All hail the mighty octopus!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
+                        else if (LLStringUtil::compareInsensitive("/icanhashugs", cur_token) == 0 ||
+                                         LLStringUtil::compareInsensitive("/icanhashug", cur_token) == 0)
+                        {
+                                LLViewerImage* kitteh = gImageList.getImageFromFile("hugs.png", TRUE, TRUE);
+                                if (kitteh)
+                                {
+                                        S32 left, top;
+                                        gFloaterView->getNewFloaterPosition(&left, &top);
+                                        LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
+                                        rect.translate(left - rect.mLeft, top - rect.mTop);
+
+                                        LLPreviewTexture* preview;
+                                        preview = new LLPreviewTexture(rect, "Yes, you can has hugs!", kitteh);
+                                        preview->setSourceID(LLUUID::generateNewID());
+                                        preview->setFocus(TRUE);
+                                        preview->center();
+                                        gFloaterView->adjustToFitScreen(preview, FALSE);
+                                }
+                                return TRUE;
+                        }
+
                 }
                 
                 if(!gesture)
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index 3acfbf3..a487150 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -69,6 +69,10 @@
 #include "pipeline.h"
 #include "llspatialpartition.h"
  
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 BOOL LLAgent::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position)
 {
         if(object && object->isAttachment())
@@ -168,8 +172,8 @@ 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))
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT))) )
         {
                 return;
         }
diff --git a/linden/indra/newview/llgroupnotify.cpp b/linden/indra/newview/llgroupnotify.cpp
index 1b00dfb..8e98cbc 100644
--- a/linden/indra/newview/llgroupnotify.cpp
+++ b/linden/indra/newview/llgroupnotify.cpp
@@ -196,6 +196,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
         // 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);
+        text->setParseHTML(TRUE);
         text->appendColoredText(std::string("\n\n") + message,false,false,LLColor4::grey4);
 
         LLColor4 semi_transparent(1.0f,1.0f,1.0f,0.8f);
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 6367380..120bbaa 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -75,6 +75,10 @@
 
 #include "hippoGridManager.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //
 // Constants
 //
@@ -251,7 +255,7 @@ void LLHoverView::updateText()
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
                                 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
                                 {
-                                        line = gRlvHandler.getAnonym(line.append(firstname->getString()).append(1, ' ').append(lastname->getString()));
+                                        line = RlvStrings::getAnonym(line.append(firstname->getString()).append(1, ' ').append(lastname->getString()));
                                 }
                                 else
                                 {
@@ -350,7 +354,7 @@ void LLHoverView::updateText()
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
                                                         if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
                                                         {
-                                                                name = gRlvHandler.getAnonym(name);
+                                                                name = RlvStrings::getAnonym(name);
                                                         }
 // [/RLVa:KB]
 
@@ -538,7 +542,8 @@ void LLHoverView::updateText()
                 if (hover_parcel)
                 {
 // [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 );
+                        line.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+                                ? hover_parcel->getName() : RlvStrings::getString(RLV_STRING_HIDDEN_PARCEL) );
 // [/RLVa:KB]
                         //line.append(hover_parcel->getName());
                 }
@@ -570,7 +575,7 @@ void LLHoverView::updateText()
                         else if(gCacheName->getFullName(owner, 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));
+                                line.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? name : RlvStrings::getAnonym(name));
 // [/RLVa:KB]
                                 //line.append(name);
                         }
@@ -683,7 +688,14 @@ void LLHoverView::draw()
         // To toggle off hover tips, you have to just suppress the draw.
         // The picking is still needed to do cursor changes over physical
         // and scripted objects.  JC
+//      if (!sShowHoverTips)
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+#ifdef RLV_EXTENSION_CMD_INTERACT
+        if ( (!sShowHoverTips) || (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT)) )
+#else
         if (!sShowHoverTips) 
+#endif // RLV_EXTENSION_CMD_INTERACT
+// [/RLVa:KB]
         {
                 return;
         }
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index 2c0431b..75e2f30 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -48,6 +48,9 @@
 #include "llselectmgr.h"
 #include "llglheaders.h"
 #include "llresmgr.h"
+// [RLVa:KB] - Imprudence-1.3.0
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 #include "llxmltree.h"
 
@@ -599,7 +602,7 @@ void LLHUDEffectLookAt::render()
                         // Show anonyms in place of actual names when @shownames=n restricted
                         if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
                         {
-                                text = gRlvHandler.getAnonym(text);
+                                text = RlvStrings::getAnonym(text);
                         }
 // [/RLVa:KB]
 
diff --git a/linden/indra/newview/llhudtext.cpp b/linden/indra/newview/llhudtext.cpp
index 7d9f7f9..7c0c469 100644
--- a/linden/indra/newview/llhudtext.cpp
+++ b/linden/indra/newview/llhudtext.cpp
@@ -57,6 +57,9 @@
 #include "pipeline.h"
 #include <boost/tokenizer.hpp>
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 const F32 SPRING_STRENGTH = 0.7f;
 const F32 RESTORATION_SPRING_TIME_CONSTANT = 0.1f;
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 808a2c9..d9e822f 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -79,6 +79,10 @@
 #include "llstylemap.h"
 #include <sys/stat.h>
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //
 // Constants
 //
@@ -2115,18 +2119,18 @@ void LLFloaterIMPanel::sendMsg()
                         // Truncate and convert to UTF8 for transport
                         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
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | 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;
+                                                utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
                                 }
                                 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;
+                                                utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
                                 }
                                 else if (mSpeakers)                                                     // Conference chat: allow if all participants are sendim exceptions
                                 {
@@ -2139,14 +2143,14 @@ void LLFloaterIMPanel::sendMsg()
                                                 LLSpeaker* pSpeaker = *itSpeaker;
                                                 if ( (gAgent.getID() != pSpeaker->mID) && (!gRlvHandler.isException(RLV_BHVR_SENDIM, pSpeaker->mID)) )
                                                 {
-                                                        utf8_text = rlv_handler_t::cstrBlockedSendIM;
+                                                        utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
                                                         break;
                                                 }
                                         }
                                 }
                                 else                                                                            // Catch all fall-through
                                 {
-                                        utf8_text = rlv_handler_t::cstrBlockedSendIM;
+                                        utf8_text = RlvStrings::getString(RLV_STRING_BLOCKED_SENDIM);
                                 }
                         }
 // [/RLVa:KB]
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp
index a6eaeb3..2253404 100644
--- a/linden/indra/newview/llimview.cpp
+++ b/linden/indra/newview/llimview.cpp
@@ -71,6 +71,10 @@
 
 #include "llfirstuse.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //
 // Globals
 //
@@ -609,11 +613,11 @@ void LLIMMgr::addMessage(
         // create IM window as necessary
         if(!floater)
         {
-                if (!mIgnoreGroupList.empty())
+                if (gIMMgr->getIgnoreGroupListCount() > 0 && gAgent.isInGroup(session_id))
                 {
                         // Check to see if we're blocking this group's chat
-                        LLGroupData *group_data = NULL;
-
+                        LLGroupData* group_data = NULL;
+                        
                         // Search for this group in the agent's groups list
                         LLDynamicArray<LLGroupData>::iterator i;
 
@@ -627,9 +631,8 @@ void LLIMMgr::addMessage(
                         }
 
                         // If the group is in our list then return
-                        if (group_data && getIgnoreGroup(group_data->mID))
+                        if (group_data && gIMMgr->getIgnoreGroup(group_data->mID))
                         {
-                                // llinfos << "ignoring chat from group " << group_data->mID << llendl;
                                 return;
                         }
                 }
@@ -1379,7 +1382,7 @@ void LLIMMgr::saveIgnoreGroup()
         }
 }
 
-void LLIMMgr::updateIgnoreGroup(const LLUUID& group_id, const bool& ignore)
+void LLIMMgr::updateIgnoreGroup(const LLUUID& group_id, bool ignore)
 {
         if (group_id.notNull())
         {
@@ -1682,7 +1685,7 @@ public:
                                                 return;
                                 }
                                 else if (!gRlvHandler.isException(RLV_BHVR_RECVIM, from_id))
-                                        message = message.substr(0, message_offset) + rlv_handler_t::cstrBlockedRecvIM;
+                                        message = message.substr(0, message_offset) + RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM);
                         }
 // [/RLVa:KB]
 
diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index 8f665d2..2539203 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -174,7 +174,7 @@ public:
 
         void loadIgnoreGroup();
         void saveIgnoreGroup();
-        void updateIgnoreGroup(const LLUUID& group_id, const bool& ignore);
+        void updateIgnoreGroup(const LLUUID& group_id, bool ignore);
         // Returns true if group chat is ignored for the UUID, false if not
         bool getIgnoreGroup(const LLUUID& group_id);
 
@@ -219,6 +219,10 @@ private:
         LLSD    mPendingAgentListUpdates;
 
         std::list<LLUUID> mIgnoreGroupList;
+
+public:
+                
+        S32 getIgnoreGroupListCount() { return mIgnoreGroupList.size(); }
 };
 
 
diff --git a/linden/indra/newview/llinventoryactions.cpp b/linden/indra/newview/llinventoryactions.cpp
index f3277ad..7ae96ad 100644
--- a/linden/indra/newview/llinventoryactions.cpp
+++ b/linden/indra/newview/llinventoryactions.cpp
@@ -89,6 +89,9 @@
 // Defined in llinventorybridge.cpp
 void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove);
 
+// 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)
@@ -125,6 +128,12 @@ bool doToSelected(LLFolderView* folder, std::string action)
                 return true;
         }
 
+        if ( ("attach" == action) && (selected_items.size() > 1) )
+        {
+                wear_attachments_on_avatar(selected_items, FALSE);
+                return true;
+        }
+
         LLMultiPreview* multi_previewp = NULL;
         LLMultiProperties* multi_propertiesp = NULL;
 
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 0f999fc..b1627b5 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -94,6 +94,10 @@
 #include "llfloateropenobject.h"
 #include "llwlparammanager.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 // Helpers
 // bug in busy count inc/dec right now, logic is complex... do we really need it?
 void inc_busy_count()
@@ -164,7 +168,9 @@ struct LLWearInfo
         BOOL    mAppend;
 };
 
-BOOL gAddToOutfit = FALSE;
+// [RLVa:KB] - Made this part of LLWearableHoldingPattern
+//BOOL gAddToOutfit = FALSE;
+// [/RLVa:KB]
 
 // +=================================================+
 // |        LLInvFVBridge                            |
@@ -498,14 +504,14 @@ void LLInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                 items.push_back(std::string("Open"));
                 items.push_back(std::string("Properties"));
 
-// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Modified: RLVa-1.0.5c
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
                 if (rlv_handler_t::isEnabled())
                 {
                         LLInventoryObject* pItem = (mInventoryPanel->getModel()) ? mInventoryPanel->getModel()->getObject(mUUID) : NULL;
                         if ( (pItem) &&
                                  ( ((LLAssetType::AT_NOTECARD == pItem->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE))) ||
                                    ((LLAssetType::AT_LSL_TEXT == pItem->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWSCRIPT))) ||
-                                   ((LLAssetType::AT_NOTECARD == pItem->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))) ) )
+                                   ((LLAssetType::AT_TEXTURE == pItem->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))) ) )
                         {
                                 disabled_items.push_back(std::string("Open"));
                         }
@@ -2503,9 +2509,10 @@ void open_texture(const LLUUID& item_id,
                                    const LLUUID& source_id,
                                    BOOL take_focus)
 {
-// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Added: RLVa-1.0.5c
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
         if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))
         {
+                RlvNotifications::notifyBlockedViewTexture();
                 return;
         }
 // [/RLVa:KB]
@@ -3008,9 +3015,10 @@ void open_notecard(LLViewerInventoryItem* inv_item,
                                    const LLUUID& source_id,
                                    BOOL take_focus)
 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) )
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE))
         {
+                RlvNotifications::notifyBlockedViewNote();
                 return;
         }
 // [/RLVa:KB]
@@ -3867,9 +3875,10 @@ LLUIImagePtr LLLSLTextBridge::getIcon() const
 
 void LLLSLTextBridge::openItem()
 {
-// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Modified: RLVa-1.0.5c
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
         if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWSCRIPT))
         {
+                RlvNotifications::notifyBlockedViewScript();
                 return;
         }
 // [/RLVa:KB]
@@ -3917,6 +3926,9 @@ void wear_inventory_item_on_avatar( LLInventoryItem* item )
         }
 }
 
+// [RLVa:KB] - Checked: 2009-12-18 (RLVa-1.1.0i) | Added: RLVa-1.1.0i
+// Moved to llinventorybridge.h because we need it in RlvForceWear
+/*
 struct LLFoundData
 {
         LLFoundData(const LLUUID& item_id,
@@ -3948,7 +3960,8 @@ struct LLWearableHoldingPattern
         found_list_t mFoundList;
         S32 mResolved;
 };
-
+*/
+// [/RLVa:KB]
 
 class LLOutfitObserver : public LLInventoryFetchObserver
 {
@@ -4376,7 +4389,10 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
                         // wearables can be resolved immediately, then the
                         // callback will be called (and this object deleted)
                         // before the final getNextData().
-                        LLWearableHoldingPattern* holder = new LLWearableHoldingPattern;
+//                      LLWearableHoldingPattern* holder = new LLWearableHoldingPattern;
+// [RLVa:KB] - Checked: 2009-12-18 (RLVa-1.1.0i) | Added: RLVa-1.1.0i
+                        LLWearableHoldingPattern* holder = new LLWearableHoldingPattern(wear_info->mAppend);
+// [/RLVa:KB]
                         LLFoundData* found;
                         LLDynamicArray<LLFoundData*> found_container;
                         for(i = 0; i  < wearable_count; ++i)
@@ -4390,7 +4406,9 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
                         }
                         for(i = 0; i < wearable_count; ++i)
                         {
-                                gAddToOutfit = wear_info->mAppend;
+// [RLVa:KB] - Part of LLWearableHoldingPattern
+//                              gAddToOutfit = wear_info->mAppend;
+// [/RLVa:KB]
 
                                 found = found_container.get(i);
                                 gWearableList.getAsset(found->mAssetID,
@@ -4422,7 +4440,9 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
 void wear_inventory_category_on_avatar_loop(LLWearable* wearable, void* data)
 {
         LLWearableHoldingPattern* holder = (LLWearableHoldingPattern*)data;
-        BOOL append= gAddToOutfit;
+// [RLVa:KB] - Part of LLWearableHoldingPattern
+//      BOOL append= gAddToOutfit;
+// [/RLVa:KB]
         
         if(wearable)
         {
@@ -4440,7 +4460,10 @@ void wear_inventory_category_on_avatar_loop(LLWearable* wearable, void* data)
         holder->mResolved += 1;
         if(holder->mResolved >= (S32)holder->mFoundList.size())
         {
-                wear_inventory_category_on_avatar_step3(holder, append);
+//              wear_inventory_category_on_avatar_step3(holder, append);
+// [RLVa:KB] - Checked: 2009-12-18 (RLVa-1.1.0i) | Added: RLVa-1.1.0i
+                wear_inventory_category_on_avatar_step3(holder, holder->mAddToOutfit);
+// [/RLVa:KB]
         }
 }
 
@@ -4595,7 +4618,7 @@ void wear_attachments_on_avatar(const LLInventoryModel::item_array_t& items, BOO
                         msg->nextBlockFast(_PREHASH_HeaderData);
                         msg->addUUIDFast(_PREHASH_CompoundMsgID, compound_msg_id );
                         msg->addU8Fast(_PREHASH_TotalObjects, count );
-//                      msg->addBOOLFast(_PREHASH_FirstDetachAll, remove );
+//                      msg->addBOOLFast(_PREHASH_FirstDetachAll, !wear_info->mAppend );
 // [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
                         // This really should just *always* be FALSE since TRUE can result in loss of the current asset state
                         msg->addBOOLFast(_PREHASH_FirstDetachAll,
@@ -4608,11 +4631,22 @@ void wear_attachments_on_avatar(const LLInventoryModel::item_array_t& items, BOO
                 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-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
+// [RLVa:KB] - Checked: 2009-11-16 (RLVa-1.1.0c) | Modified: RLVa-1.1.0c
+                // We'll attach to the default attachment point if:
+                //   - RLV isn't enabled (or nothing is currently locked on)
+                //   - "Enable Default Wear" is checked and the current attach isn't the direct result of an RLV command
+                //   - "Enable Shared Wear" is checked and the current attach is the direct result of an RLV command
+                // RELEASE-RLVa: make sure the above assertions are still valid
                 msg->addU8Fast(_PREHASH_AttachmentPt,
-                        ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) )
+                        ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) ||
+#ifndef RLV_WORKAROUND_REZMULTIPLEATTACH
+                          ( (!gRlvHandler.getCurrentCommand()) && (RlvSettings::getEnableWear()) ) ||
+                          ( (gRlvHandler.getCurrentCommand()) && (RlvSettings::getEnableSharedWear()) ) )
+#else
+                          (RlvSettings::getEnableWear()) )
+#endif // RLV_WORKAROUND_REZMULTIPLEATTACH
                                 ? 0
-                                : gRlvHandler.getAttachPointIndex(gRlvHandler.getAttachPoint(item, true)));
+                                : gRlvHandler.getAttachPointIndex(gRlvHandler.getAttachPoint(item, true)) );
 // [/RLVa:KB]
                 pack_permissions_slam(msg, item->getFlags(), item->getPermissions());
                 msg->addStringFast(_PREHASH_Name, item->getName());
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index d6001b7..45486ed 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -94,6 +94,41 @@ struct LLAttachmentRezAction
         S32             mAttachPt;
 };
 
+// [RLVa:KB] - Checked: 2009-12-18 (RLVa-1.1.0i) | Added: RLVa-1.1.0i
+// Moved from llinventorybridge.cpp because we need it in RlvForceWear
+struct LLFoundData
+{
+        LLFoundData(const LLUUID& item_id,
+                                const LLUUID& asset_id,
+                                const std::string& name,
+                                LLAssetType::EType asset_type) :
+                mItemID(item_id),
+                mAssetID(asset_id),
+                mName(name),
+                mAssetType(asset_type),
+                mWearable( NULL ) {}
+
+        LLUUID mItemID;
+        LLUUID mAssetID;
+        std::string mName;
+        LLAssetType::EType mAssetType;
+        LLWearable* mWearable;
+};
+
+struct LLWearableHoldingPattern
+{
+        LLWearableHoldingPattern(BOOL fAddToOutfit) : mResolved(0), mAddToOutfit(fAddToOutfit) {}
+        ~LLWearableHoldingPattern()
+        {
+                for_each(mFoundList.begin(), mFoundList.end(), DeletePointer());
+                mFoundList.clear();
+        }
+        typedef std::list<LLFoundData*> found_list_t;
+        found_list_t mFoundList;
+        S32 mResolved;
+        BOOL mAddToOutfit;
+};
+// [/RLVa:KB]
 
 //helper functions
 class LLShowProps 
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index c066a04..1c7a049 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -61,6 +61,10 @@
 #include "llsdutil.h"
 #include <deque>
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //#define DIFF_INVENTORY_FILES
 #ifdef DIFF_INVENTORY_FILES
 #include "process.h"
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 939d50b..f8fb439 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -86,6 +86,10 @@
 
 #include "llsdserialize.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 static LLRegisterWidget<LLInventoryPanel> r("inventory_panel");
 
 LLDynamicArray<LLInventoryView*> LLInventoryView::sActiveViews;
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index 1362f0a..01fe6f8 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -68,6 +68,10 @@
 
 #include "hippoLimits.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const S32 NUM_AXES = 3;
 const S32 MOUSE_DRAG_SLOP = 2;       // pixels
 const F32 HANDLE_HIDE_ANGLE = 0.15f; // radians
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 8a12ff3..dc4456a 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -73,6 +73,10 @@
 
 #include "hippoLimits.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const F32 MAP_SCALE_MIN = 32;
 const F32 MAP_SCALE_MID = 1024;
 //const F32 MAP_SCALE_MAX = 4096; Now uses the max height value from hippo limits
@@ -640,14 +644,14 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
                 {
 //                      msg.append(fullname);
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.0b
-                        msg.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullname : gRlvHandler.getAnonym(fullname) );
+                        msg.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullname : RlvStrings::getAnonym(fullname) );
 // [/RLVa:KB]
                         msg.append("\n");
                 }
                 
 //              msg.append( region->getName() );
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-04 (RLVa-1.0.0a) | Modified: RLVa-0.2.0b
-                msg.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? region->getName() : rlv_handler_t::cstrHidden );
+                msg.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? region->getName() : RlvStrings::getString(RLV_STRING_HIDDEN) );
 // [/RLVa:KB]
                 msg.append("\n");
                 gSavedSettings.getBOOL( "MiniMapTeleport" ) ?
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index 1a7b247..b0f5f91 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -57,7 +57,7 @@
 
 #include "hippoGridManager.h"
 
-// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
+// [RLVa:KB] - Version: 1.23.4
 #include "rlvhandler.h"
 // [/RLVa:KB]
   
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 14ae3ff..5ca5905 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -67,6 +67,10 @@
 #include "llwindlightremotectrl.h"
 #include "llselectmgr.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //
 // Globals
 //
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index e88a16a..f4501be 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -81,6 +81,10 @@
 #include "roles_constants.h"
 #include "lluictrlfactory.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 // Statics
 std::list<LLPanelAvatar*> LLPanelAvatar::sAllPanels;
 BOOL LLPanelAvatar::sAllowFirstLife = FALSE;
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index 36fc86d..2249479 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -72,6 +72,10 @@
 
 #include "hippoGridManager.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const S32 MINIMUM_PRICE_FOR_LISTING = 50;       // L$
 const S32 MATURE_UNDEFINED = -1;
 const S32 MATURE_CONTENT = 1;
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index e5c4f79..02befea 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -68,8 +68,8 @@
 #include "lltoolcomp.h"
 #include "llpanelinventory.h"
 
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-#include "llvoavatar.h"
+// [RLVa:KB]
+#include "rlvhandler.h"
 // [/RLVa:KB]
 
 //
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index e17ba2b..15b4615 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -83,6 +83,10 @@
 // parent
 #include "llfloaterpreference.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #include <boost/regex.hpp>
 
 const F32 MAX_USER_FAR_CLIP = 512.f;
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index 55e1b33..e0d6376 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -561,6 +561,10 @@ bool LLPanelGroupGeneral::apply(std::string& mesg)
                 gIMMgr->saveIgnoreGroup();
         }
 
+        mCtrlReceiveNotices->resetDirty();      //resetDirty() here instead of in update because this is where the settings 
+    mCtrlListGroup->resetDirty();               //are actually being applied. onCommitUserOnly doesn't call updateChanged directly.
+        mCtrlReceiveChat->resetDirty();
+
         mChanged = FALSE;
 
         return true;
@@ -774,14 +778,21 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
                 {
                         mCtrlReceiveNotices->setEnabled(mAllowEdit);
                 }
-                mCtrlReceiveNotices->resetDirty();
         }
 
         if (mCtrlReceiveChat)
         {
                 mCtrlReceiveChat->setVisible(is_member);
                 mCtrlReceiveChat->setEnabled(TRUE);
-                mCtrlReceiveChat->resetDirty();
+        }
+
+        if (mCtrlListGroup)
+        {
+                mCtrlListGroup->setVisible(is_member);
+                if (is_member)
+                {
+                        mCtrlListGroup->setEnabled(mAllowEdit);
+                }
         }
 
 
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 333b83f..41ba513 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -84,8 +84,8 @@
 
 #include "hippoGridManager.h"
 
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-#include "llvoavatar.h"
+// [RLVa:KB]
+#include "rlvhandler.h"
 // [/RLVa:KB]
 
 ///----------------------------------------------------------------------------
@@ -750,13 +750,13 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                 {
                         disabled_items.push_back(std::string("Task Open"));
                 }
-// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Modified: RLVa-1.0.5c
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
                 else if (rlv_handler_t::isEnabled())
                 {
                         bool fLocked = gRlvHandler.isLockedAttachment(gObjectList.findObject(mPanel->getTaskUUID()), RLV_LOCK_REMOVE);
                         if ( ((LLAssetType::AT_LSL_TEXT == item->getType()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_VIEWSCRIPT)) || (fLocked))) ||
                                  ((LLAssetType::AT_NOTECARD == item->getType()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) || (fLocked))) ||
-                                 ((LLAssetType::AT_NOTECARD == item->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))) )
+                                 ((LLAssetType::AT_TEXTURE == item->getType()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))) )
                         {
                                 disabled_items.push_back(std::string("Task Open"));
                         }
@@ -986,9 +986,10 @@ LLUIImagePtr LLTaskTextureBridge::getIcon() const
 
 void LLTaskTextureBridge::openItem()
 {
-// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Added: RLVa-1.0.5c
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
         if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))
         {
+                RlvNotifications::notifyBlockedViewTexture();
                 return;
         }
 // [/RLVa:KB]
@@ -1274,11 +1275,12 @@ LLTaskLSLBridge::LLTaskLSLBridge(
 
 void LLTaskLSLBridge::openItem()
 {
-// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Modified: RLVa-1.0.5c
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
         LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
         if ( (rlv_handler_t::isEnabled()) && 
                 ((gRlvHandler.hasBehaviour(RLV_BHVR_VIEWSCRIPT)) || (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE))) )
         {
+                RlvNotifications::notifyBlockedViewScript();
                 return;
         }
 // [/RLVa:KB]
@@ -1401,10 +1403,11 @@ void LLTaskNotecardBridge::openItem()
         {
                 return;
         }
-// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
         if ( (rlv_handler_t::isEnabled()) && 
                  ( (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) || (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) ) )
         {
+                RlvNotifications::notifyBlockedViewNote();
                 return;
         }
 // [/RLVa:KB]
diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp
index 7c9faaf..ea6a557 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -51,6 +51,10 @@
 
 #include "hippoGridManager.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 LLPanelLandSelectObserver* LLPanelLandInfo::sObserver = NULL;
 LLPanelLandInfo* LLPanelLandInfo::sInstance = NULL;
 
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 23b7785..69539c7 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -83,7 +83,7 @@
 
 #include "llglheaders.h"
 
-// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
+// [RLVa:KB]
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
@@ -737,7 +737,7 @@ void LLPanelLogin::refreshLocation( bool force_visible )
         if ( ! force_visible )
                 show_start = gSavedSettings.getBOOL("ShowStartLocation");
 
-// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | 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())
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 10cd0bd..706f98e 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -78,8 +78,8 @@
 
 #include "hippoLimits.h"
 
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
-#include "llvoavatar.h"
+// [RLVa:KB]
+#include "rlvhandler.h"
 // [/RLVa:KB]
 
 //
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index fc05744..8492988 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -70,6 +70,10 @@
 
 #include "hippoGridManager.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 ///----------------------------------------------------------------------------
 /// Class llpanelpermissions
 ///----------------------------------------------------------------------------
@@ -349,7 +353,7 @@ void LLPanelPermissions::refresh()
                 // 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);
+                        owner_name = RlvStrings::getAnonym(owner_name);
                         fRlvEnableOwner = false;
                 }
         }
diff --git a/linden/indra/newview/llpanelpick.cpp b/linden/indra/newview/llpanelpick.cpp
index 9c2638f..3417b17 100644
--- a/linden/indra/newview/llpanelpick.cpp
+++ b/linden/indra/newview/llpanelpick.cpp
@@ -59,6 +59,10 @@
 #include "llviewerregion.h"
 #include "llviewerwindow.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //static
 std::list<LLPanelPick*> LLPanelPick::sAllPanels;
 
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index e7c39e2..2c8ef4d 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -50,6 +50,10 @@
 
 #include "hippoGridManager.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 class LLPrefsIMImpl : public LLPanel
 {
 public:
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index bde7242..98a5d8f 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -89,6 +89,9 @@
 
 #include "llpanelinventory.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 const std::string HELLO_LSL =
         "default\n"
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 1634950..5a10e98 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -87,6 +87,10 @@
 
 #include "llglheaders.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 LLViewerObject* getSelectedParentObject(LLViewerObject *object) ;
 //
 // Consts
@@ -3446,6 +3450,17 @@ void LLSelectMgr::deselectAllIfTooFar()
                 return;
         }
 
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+#ifdef RLV_EXTENSION_CMD_INTERACT
+        // [Fall-back code] Don't allow an active selection (except for HUD attachments - see above) when @interact=n restricted
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT))
+        {
+                deselectAll();
+                return;
+        }
+#endif // RLV_EXTENSION_CMD_INTERACT
+// [/RLVa:KB]
+
         // HACK: Don't deselect when we're navigating to rate an object's
         // owner or creator.  JC
         if (gPieObject->getVisible())
@@ -4282,6 +4297,12 @@ void LLSelectMgr::requestObjectPropertiesFamily(LLViewerObject* object)
         msg->sendReliable( regionp->getHost() );
 }
 
+// static
+void LLSelectMgr::waitForObjectResponse(LLUUID id)
+{
+        if (sObjectPropertiesFamilyRequests.count(id) == 0)
+                sObjectPropertiesFamilyRequests.insert(id);
+}
 
 // static
 void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data)
diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index c19d33d..495e61c 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -361,6 +361,7 @@ public:
         ~LLSelectMgr();
 
         static void cleanupGlobals();
+        static void waitForObjectResponse(LLUUID id);
 
         // LLEditMenuHandler interface
         virtual BOOL canUndo() const;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index b70253e..08d6d3f 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -201,6 +201,10 @@
 #include "llmozlib.h"
 #endif // LL_LIBXUL_ENABLED
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #if LL_WINDOWS
 #include "llwindebug.h"
 #include "lldxhardware.h"
@@ -2426,6 +2430,14 @@ bool idle_startup()
                         LLInventoryView::toggleVisibility(NULL);
                 }
 
+// [RLVa:KB] - Checked: 2009-11-27 (RLVa-1.1.0f) | Added: RLVa-1.1.0f
+                if (rlv_handler_t::isEnabled())
+                {
+                        // Regularly process a select subset of retained commands during logon
+                        gIdleCallbacks.addFunction(RlvHandler::onIdleStartup, new LLTimer());
+                }
+// [/RLVa:KB]
+
                 LLStartUp::setStartupState( STATE_MISC );
                 return FALSE;
         }
@@ -2776,8 +2788,11 @@ 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("FetchInventoryOnLogin"))
+                {
+                        // Start loading inventory
+                        gInventory.startBackgroundFetch();
+                }
 
                 if (gSavedSettings.getBOOL("LoginAsGod"))
                 {
@@ -2828,7 +2843,7 @@ bool idle_startup()
                 // reset keyboard focus to sane state of pointing at world
                 gFocusMgr.setKeyboardFocus(NULL);
 
-// [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
                 // RELEASE-RLVa: this should go in LLAppViewer::handleLoginComplete() but Imprudence doesn't call that function
                 gRlvHandler.initLookupTables();
 
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index fbb99f0..50be146 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -93,6 +93,9 @@ LLStatusBar *gStatusBar = NULL;
 S32 STATUS_BAR_HEIGHT = 0;
 extern S32 MENU_BAR_HEIGHT;
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 // TODO: these values ought to be in the XML too
 const S32 MENU_PARCEL_SPACING = 1;      // Distance from right of menu item to parcel information
@@ -539,7 +542,8 @@ void LLStatusBar::refresh()
         {
                 // 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());
+                        RlvStrings::getString(RLV_STRING_HIDDEN_REGION).c_str(), region->getSimAccessString().c_str(),
+                        RlvStrings::getString(RLV_STRING_HIDDEN).c_str());
         }
 // [/RLVa:KB]
 
@@ -577,7 +581,7 @@ void LLStatusBar::refresh()
         childGetRect("BalanceText", r);
         r.translate( new_right - r.mRight, 0);
         childSetRect("BalanceText", r);
-        new_right -= r.getWidth() - 18;
+        new_right -= r.getWidth() - 2;
 
         childGetRect("buycurrency", r);
         r.translate( new_right - r.mRight, 0);
diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 5cad14c..b5ad435 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -176,7 +176,7 @@ protected:
         LLTextureFetchWorker(LLTextureFetch* fetcher, const LLUUID& id, const LLHost& host,
                                                  F32 priority, S32 discard, S32 size);
         LLTextureFetchWorker(LLTextureFetch* fetcher, const std::string& url, const LLUUID& id, const LLHost& host,
-                                                 F32 priority, S32 discard, S32 size);
+                                                 F32 priority, S32 discard, S32 size, bool can_use_http);
 
 private:
         /*virtual*/ void startWork(S32 param); // called from addWork() (MAIN THREAD)
@@ -388,7 +388,8 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
                                                                                    const LLHost& host,  // Simulator host
                                                                                    F32 priority,                // Priority
                                                                                    S32 discard,                 // Desired discard
-                                                                                   S32 size)                    // Desired size
+                                                                                   S32 size,                    // Desired size
+                                                                                   bool can_use_http)   // Try HTTP first
         : LLWorkerClass(fetcher, "TextureFetch"),
           mState(INIT),
           mWriteToCacheState(NOT_WRITE),
@@ -420,7 +421,7 @@ LLTextureFetchWorker::LLTextureFetchWorker(LLTextureFetch* fetcher,
           mNeedsAux(FALSE),
           mHaveAllData(FALSE),
           mInLocalCache(FALSE),
-          mCanUseHTTP(true),
+          mCanUseHTTP(can_use_http),
           mHTTPFailCount(0),
           mRetryAttempt(0),
           mActiveCount(0),
@@ -1506,7 +1507,7 @@ LLTextureFetch::~LLTextureFetch()
 }
 
 bool LLTextureFetch::createRequest(const std::string& url, const LLUUID& id, const LLHost& host, F32 priority,
-                                                                   S32 w, S32 h, S32 c, S32 desired_discard, bool needs_aux)
+                                                                   S32 w, S32 h, S32 c, S32 desired_discard, bool needs_aux, bool can_use_http)
 {
         if (mDebugPause)
         {
@@ -1568,6 +1569,7 @@ bool LLTextureFetch::createRequest(const std::string& url, const LLUUID& id, con
                 worker->lockWorkMutex();
                 worker->setImagePriority(priority);
                 worker->setDesiredDiscard(desired_discard, desired_size);
+                worker->setCanUseHTTP(can_use_http);
                 worker->unlockWorkMutex();
                 if (!worker->haveWork())
                 {
@@ -1583,7 +1585,7 @@ bool LLTextureFetch::createRequest(const std::string& url, const LLUUID& id, con
         }
         else
         {
-                worker = new LLTextureFetchWorker(this, url, id, host, priority, desired_discard, desired_size);
+                worker = new LLTextureFetchWorker(this, url, id, host, priority, desired_discard, desired_size, can_use_http);
                 mRequestMap[id] = worker;
         }
         worker->mActiveCount++;
diff --git a/linden/indra/newview/lltexturefetch.h b/linden/indra/newview/lltexturefetch.h
index 5eca0ba..6c6bb52 100644
--- a/linden/indra/newview/lltexturefetch.h
+++ b/linden/indra/newview/lltexturefetch.h
@@ -60,7 +60,7 @@ public:
         /*virtual*/ S32 update(U32 max_time_ms);        
 
         bool createRequest(const std::string& url, const LLUUID& id, const LLHost& host, F32 priority,
-                                           S32 w, S32 h, S32 c, S32 discard, bool needs_aux);
+                                           S32 w, S32 h, S32 c, S32 discard, bool needs_aux, bool use_http);
         void deleteRequest(const LLUUID& id, bool cancel);
         bool getRequestFinished(const LLUUID& id, S32& discard_level,
                                                         LLPointer<LLImageRaw>& raw, LLPointer<LLImageRaw>& aux);
diff --git a/linden/indra/newview/lltoolbar.cpp b/linden/indra/newview/lltoolbar.cpp
index 645d29a..e961a9b 100644
--- a/linden/indra/newview/lltoolbar.cpp
+++ b/linden/indra/newview/lltoolbar.cpp
@@ -67,6 +67,10 @@
 #include "llimpanel.h"
 #include "llscrolllistctrl.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #if LL_DARWIN
 
         #include "llresizehandle.h"
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index a3ed16b..2bc6e3e 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -72,6 +72,9 @@
 #include "llparcel.h" // RezWithLandGroup
 #include "llviewerparcelmgr.h" // RezWithLandGroup
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 // MAX ITEMS is based on (sizeof(uuid)+2) * count must be < MTUBYTES
 // or 18 * count < 1200 => count < 1200/18 => 66. I've cut it down a
@@ -2183,8 +2186,8 @@ 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))
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) || (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT))) )
         {
                 return ACCEPT_NO_LOCKED;
         }
@@ -2253,9 +2256,12 @@ 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)) )
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+        // NOTE: if (mask & MASK_CONTROL) then it's a drop rather than a rez, so we let that pass through when @rez=n restricted
+        // (but not when @interact=n restricted unless the drop target is a HUD attachment)
+        if ( (rlv_handler_t::isEnabled()) &&
+                 ( ( (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) && ((mask & MASK_CONTROL) == 0) ) ||
+                   ( (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT)) && (((mask & MASK_CONTROL) == 0) || (!obj->isHUDAttachment())) ) ) )
         {
                 return ACCEPT_NO_LOCKED;
         }
@@ -2844,9 +2850,9 @@ 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))
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+        // [Fall-back code] Looks like this is only ever called from LLToolDragAndDrop::dad3dRezObjectOnObject()
+        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) || (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT))) )
         {
                 return ACCEPT_NO_LOCKED;
         }
@@ -2873,9 +2879,9 @@ 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))
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+        // [Fall-back code] Looks like this is only ever called from LLToolDragAndDrop::dad3dRezObjectOnObject()
+        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) || (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT))) )
         {
                 return ACCEPT_NO_LOCKED;
         }
diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp
index 3cddba7..735ecd9 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -48,6 +48,10 @@
 #include "llviewerwindow.h"
 #include "llfloatertools.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //
 // Member functions
 //
@@ -100,11 +104,10 @@ void LLToolFace::pickCallback(const LLPickInfo& pick_info)
                         return;
                 }
 
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
                 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) )))
+                           ((gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && (!gRlvHandler.canTouch(hit_obj, pick_info.mObjectOffset))) ) )
                 {
                         return;
                 }
diff --git a/linden/indra/newview/lltoolgrab.cpp b/linden/indra/newview/lltoolgrab.cpp
index 260d533..9b6d6f7 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -66,6 +66,10 @@
 
 #include "hippoLimits.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const S32 SLOP_DIST_SQ = 4;
 
 // Override modifier key behavior with these buttons
@@ -160,7 +164,11 @@ void LLToolGrab::pickCallback(const LLPickInfo& pick_info)
         }
 
         // if not over object, do nothing
-        if (!objectp)
+//      if (!objectp)
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
+        // Block initiating a drag operation on an object that can't be touched
+        if ( (!objectp) || ((rlv_handler_t::isEnabled()) && (!gRlvHandler.canTouch(objectp, pick_info.mObjectOffset))) )
+// [/RLVa:KB]
         {
                 LLToolGrab::getInstance()->setMouseCapture(TRUE);
                 LLToolGrab::getInstance()->mMode = GRAB_NOOBJECT;
@@ -188,12 +196,7 @@ BOOL LLToolGrab::handleObjectHit(const LLPickInfo& info)
                 return FALSE;
         }
 
-        //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 (objectp->isAvatar())
         {
                 if (gGrabTransientTool)
                 {
@@ -428,12 +431,10 @@ 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) )
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+        // Block dragging an object beyond touch range when @fartouch=n restricted
+        if ( (rlv_handler_t::isEnabled()) && (GRAB_INACTIVE != mMode) && (GRAB_NOOBJECT != mMode) && (hasMouseCapture()) &&
+                 (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && (!gRlvHandler.canTouch(mGrabPick.getObject(), mGrabPick.mObjectOffset)) )
         {
                 if (gGrabTransientTool)
                 {
@@ -442,6 +443,7 @@ BOOL LLToolGrab::handleHover(S32 x, S32 y, MASK mask)
                         gGrabTransientTool = NULL;
                 }
                 setMouseCapture(FALSE);
+                return TRUE;
         }
 // [/RLVa:KB]
 
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 2b63a24..02ad008 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -68,6 +68,10 @@
 #include "llui.h"
 #include "llweb.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 extern void handle_buy(void*);
 
 extern BOOL gDebugClicks;
@@ -167,10 +171,10 @@ 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) )
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+                // Block left-click special actions when fartouch restricted
+                if ( (rlv_handler_t::isEnabled()) &&
+                         (gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) && (!gRlvHandler.canTouch(object, mPick.mObjectOffset)) )
                 {
                         return TRUE;
                 }
@@ -253,6 +257,14 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                 ((object->usePhysics() || (parent && !parent->isAvatar() && parent->usePhysics())) || touchable) && 
                 !always_show)
         {
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+                // Triggered by left-clicking on a touchable object
+                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canTouch(object, mPick.mObjectOffset)) )
+                {
+                        return LLTool::handleMouseDown(x, y, mask);
+                }
+// [/RLVa:KB]
+
                 gGrabTransientTool = this;
                 LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolGrab::getInstance() );
                 return LLToolGrab::getInstance()->handleObjectHit( mPick );
@@ -377,20 +389,17 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                         }
 
 //                      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] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+                        // Don't show the pie menu on empty selection when fartouch/interaction restricted [see LLToolSelect::handleObjectSelection()]
+                        if ( (!rlv_handler_t::isEnabled()) || (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) ||
+                                 (!gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) )
+                        {
+                                gPieAvatar->show(x, y, mPieMouseButtonDown);
+                        }
+                        else
+                        {
+                                make_ui_sound("UISndInvalidOp");
+                        }
 // [/RLVa:KB]
                 }
                 else if (object->isAttachment() && !object->isHUDAttachment())
@@ -421,31 +430,28 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
                                 //gMuteObjectPieMenu->setLabel("Mute");
                         }
                         
-// [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] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+                        // Don't show the pie menu on empty selection when fartouch/interaction restricted
+                        // (not entirely accurate in case of Tools / Select Only XXX [see LLToolSelect::handleObjectSelection()]
+                        if ( (!rlv_handler_t::isEnabled()) || (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) ||
+                                 (!gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH)) )
+                        {
 // [/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);
+                                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
+                        }
+                        else
+                        {
+                                make_ui_sound("UISndInvalidOp");
+                        }
 // [/RLVa:KB]
                 }
         }
@@ -514,7 +520,11 @@ ECursorType cursor_from_object(LLViewerObject* object)
         switch(click_action)
         {
         case CLICK_ACTION_SIT:
-                if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) // not already sitting?
+//              if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) // not already sitting?
+// [RLVa:KB] - Checked: 2009-12-22 (RLVa-1.1.0k) | Added: RLVa-1.1.0j
+                if ( ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->mIsSitting)) && // not already sitting?
+                         ((!rlv_handler_t::isEnabled()) || (gRlvHandler.canSit(object, gViewerWindow->getHoverPick().mObjectOffset))) )
+// [/RLVa:KB]
                 {
                         cursor = UI_CURSOR_TOOLSIT;
                 }
@@ -619,7 +629,21 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
         LLViewerObject *parent = NULL;
         if (gHoverView)
         {
-                object = gViewerWindow->getHoverPick().getObject();
+//              object = gViewerWindow->getHoverPick().getObject();
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+                // Block all special click action cursors when:
+                //   - @fartouch=n restricted and the object is out of range
+                //   - @interact=n restricted and the object isn't a HUD attachment
+                const LLPickInfo& pick = gViewerWindow->getHoverPick();
+                object = pick.getObject();
+                if ( (object) && (rlv_handler_t::isEnabled()) &&
+                        ( ((gRlvHandler.hasBehaviour(RLV_BHVR_FARTOUCH))) && (!gRlvHandler.canTouch(object, pick.mObjectOffset)) ||
+                          ((gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT)) && (!object->isHUDAttachment())) ) )
+                {
+                        gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+                        return TRUE;
+                }
+// [/RLVa:KB]
         }
 
         if (object)
@@ -633,6 +657,13 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
                 gViewerWindow->getWindow()->setCursor(cursor);
                 lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
         }
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
+        else if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canTouch(object)) )
+        {
+                // Block showing the "grab" or "touch" cursor if we can't touch the object (@fartouch=n is handled above)
+                gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+        }
+// [/RLVa:KB]
         else if ((object && !object->isAvatar() && object->usePhysics()) 
                          || (parent && !parent->isAvatar() && parent->usePhysics()))
         {
diff --git a/linden/indra/newview/lltoolplacer.cpp b/linden/indra/newview/lltoolplacer.cpp
index 00b0c9f..477dbca 100644
--- a/linden/indra/newview/lltoolplacer.cpp
+++ b/linden/indra/newview/lltoolplacer.cpp
@@ -69,6 +69,10 @@
 #include "llviewerparcelmgr.h" // RezWithLandGroup
 #include "roles_constants.h" // Ele: Land Group Override
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const LLVector3 DEFAULT_OBJECT_SCALE(0.5f, 0.5f, 0.5f);
 
 //static 
@@ -556,8 +560,8 @@ 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))
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) || (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT))) )
         {
                 return TRUE; // Callers seem to expect a "did you handle it?" so we return TRUE rather than FALSE
         }
diff --git a/linden/indra/newview/lltoolselect.cpp b/linden/indra/newview/lltoolselect.cpp
index 02755d7..1e412de 100644
--- a/linden/indra/newview/lltoolselect.cpp
+++ b/linden/indra/newview/lltoolselect.cpp
@@ -51,7 +51,8 @@
 #include "llvoavatar.h"
 #include "llworld.h"
 
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+// [RLVa:KB]
+#include "rlvhandler.h"
 #include "llfloatertools.h"
 // [/RLVa:KB]
 
@@ -88,7 +89,7 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi
                 object = object->getRootEdit();
         }
 
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0f
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
         if (rlv_handler_t::isEnabled())
         {
                 if (gRlvHandler.hasBehaviour(RLV_BHVR_EDIT))
diff --git a/linden/indra/newview/lltracker.cpp b/linden/indra/newview/lltracker.cpp
index 654510d..43fd4c0 100644
--- a/linden/indra/newview/lltracker.cpp
+++ b/linden/indra/newview/lltracker.cpp
@@ -65,6 +65,10 @@
 #include "llworldmapview.h"
 #include "llviewercontrol.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const F32 DESTINATION_REACHED_RADIUS    = 3.0f;
 const F32 DESTINATION_VISITED_RADIUS    = 6.0f;
 
@@ -185,7 +189,7 @@ void LLTracker::render3D()
                         //                      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);
+                                (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLocationName : RlvStrings::getString(RLV_STRING_HIDDEN));
 // [/RLVa:KB]
                 }
         }
@@ -231,7 +235,8 @@ void LLTracker::render3D()
                                 //                        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);
+                                        (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? instance()->mTrackedLandmarkName
+                                                                                      : RlvStrings::getString(RLV_STRING_HIDDEN));
 // [/RLVa:KB]
                         }
                 }
@@ -264,7 +269,7 @@ void LLTracker::render3D()
                                 //                      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);
+                                        (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? av_tracker.getName() : RlvStrings::getString(RLV_STRING_HIDDEN));
 // [/RLVa:KB]
                         }
                 }
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 50224ad..88ea904 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -520,19 +520,6 @@ bool handleSliderScrollWheelMultiplierChanged(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]
 
 ////////////////////////////////////////////////////////////////////////////
 
@@ -677,13 +664,6 @@ void settings_setup_listeners()
         gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));     
         gSavedSettings.getControl("SliderScrollWheelMultiplier")->getSignal()->connect(boost::bind(&handleSliderScrollWheelMultiplierChanged, _1));     
         gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _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 5316337..78940cc 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -83,6 +83,10 @@
 #include "llwaterparammanager.h"
 #include "llpostprocess.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 extern LLPointer<LLImageGL> gStartImageGL;
 
 LLPointer<LLImageGL> gDisconnectedImagep = NULL;
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index 400fb2f..671a359 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -256,6 +256,10 @@ LLViewerImage::LLViewerImage(const LLUUID& id, const LLHost& host, BOOL usemipma
 {
         init(true);
         sImageCount++;
+        if (host != LLHost::invalid)
+        {
+                mCanUseHTTP = false; // this is a baked texture
+        }
 }
 
 LLViewerImage::LLViewerImage(const std::string& url, const LLUUID& id, BOOL usemipmaps)
@@ -346,6 +350,8 @@ void LLViewerImage::init(bool firstinit)
         mForceToSaveRawImage  = FALSE ;
         mSavedRawDiscardLevel = -1 ;
         mDesiredSavedRawDiscardLevel = -1 ;
+
+        mCanUseHTTP = true; //default on if cap/settings allows us
 }
 
 // virtual
@@ -1213,7 +1219,7 @@ bool LLViewerImage::updateFetch()
                 // bypass texturefetch directly by pulling from LLTextureCache
                 bool fetch_request_created = false;
                 fetch_request_created = LLAppViewer::getTextureFetch()->createRequest(mUrl, getID(),getTargetHost(), decode_priority,
-                                                                                                                                                          w, h, c, desired_discard, needsAux());
+                                                                                                                                                          w, h, c, desired_discard, needsAux(), mCanUseHTTP);
 
                 if (fetch_request_created)
                 {                               
@@ -1292,7 +1298,7 @@ BOOL LLViewerImage::forceFetch()
                 c = getComponents();
         }
         fetch_request_created = LLAppViewer::getTextureFetch()->createRequest(mUrl, getID(),getTargetHost(), maxDecodePriority(),
-                                                                                                                                                  w, h, c, desired_discard, needsAux());
+                                                                                                                                                  w, h, c, desired_discard, needsAux(), mCanUseHTTP);
 
         if (fetch_request_created)
         {
diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h
index c82b68b..3bee51c 100644
--- a/linden/indra/newview/llviewerimage.h
+++ b/linden/indra/newview/llviewerimage.h
@@ -314,6 +314,8 @@ public:
         void        addFace(LLFace* facep) ;
         void        removeFace(LLFace* facep) ;
 
+        void        setCanUseHTTP(bool can_use_http) {mCanUseHTTP = can_use_http;};
+
         friend class LocalBitmap; // tag: vaa emerald local_asset_browser
 
 private:
@@ -418,6 +420,8 @@ private:
         typedef std::list<LLFace*> ll_face_list_t ;
         ll_face_list_t mFaceList ; //reverse pointer pointing to the faces using this image as texture
 
+        bool mCanUseHTTP; // can this image be fetched by http
+
 public:
         static const U32 sCurrentFileVersion;
         // Default textures
diff --git a/linden/indra/newview/llviewerimagelist.cpp b/linden/indra/newview/llviewerimagelist.cpp
index cb02b09..869c9d7 100644
--- a/linden/indra/newview/llviewerimagelist.cpp
+++ b/linden/indra/newview/llviewerimagelist.cpp
@@ -65,6 +65,10 @@
 
 #include <sys/stat.h>
 
+#ifdef LL_DARWIN
+#include "llwindowmacosx-objc.h"
+#endif
+
 ////////////////////////////////////////////////////////////////////////////
 
 void (*LLViewerImageList::sUUIDCallback)(void **, const LLUUID&) = NULL;
@@ -920,7 +924,10 @@ BOOL LLViewerImageList::createUploadFile(const std::string& filename,
 {
         // First, load the image.
         LLPointer<LLImageRaw> raw_image = new LLImageRaw;
-        
+#ifdef LL_DARWIN
+        if (!decodeImageQuartz(filename, raw_image))
+                return FALSE;
+#else
         switch (codec)
         {
                 case IMG_CODEC_BMP:
@@ -993,7 +1000,7 @@ BOOL LLViewerImageList::createUploadFile(const std::string& filename,
                 default:
                         return FALSE;
         }
-        
+#endif
         LLPointer<LLImageJ2C> compressedImage = convertToUploadFile(raw_image);
         
         if( !compressedImage->save(out_filename) )
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 6ec7e46..524654a 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -241,10 +241,8 @@ 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
+// [RLVa:KB]
+#include "rlvhandler.h"
 #include "rlvfloaterbehaviour.h"
 void init_debug_rlva_menu(LLMenuGL* menu);
 // [/RLVa:KB]
@@ -860,7 +858,7 @@ 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
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.1b
         #ifdef RLV_ADVANCED_MENU
                 if (rlv_handler_t::isEnabled())
                 {
@@ -970,7 +968,7 @@ void init_client_menu(LLMenuGL* menu)
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-1.0.0e
         #ifdef RLV_ADVANCED_TOGGLE_RLVA
                 if (gSavedSettings.controlExists(RLV_SETTING_MAIN))
-                        menu->append(new LLMenuItemCheckGL("Restrained Life API", &rlvToggleEnabled, NULL, &rlvGetEnabled, NULL));
+                        menu->append(new LLMenuItemCheckGL("RestrainedLove API", &rlvToggleEnabled, NULL, &rlvGetEnabled, NULL));
         #endif // RLV_ADVANCED_TOGGLE_RLVA
 // [/RLVa:KB]
 
@@ -1433,7 +1431,7 @@ void init_debug_baked_texture_menu(LLMenuGL* menu)
         menu->createJumpKeys();
 }
 
-// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-1.0.0g
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-11-17 (RLVa-1.1.0d) | Modified: RLVa-1.1.0d
 void init_debug_rlva_menu(LLMenuGL* menu)
 {
         // Debug options
@@ -1442,26 +1440,31 @@ void init_debug_rlva_menu(LLMenuGL* menu)
 
                 if (gSavedSettings.controlExists(RLV_SETTING_DEBUG))
                         pDbgMenu->append(new LLMenuItemCheckGL("Show Debug Messages", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_DEBUG));
+                pDbgMenu->append(new LLMenuItemCallGL("Dump Attachment Locks", RlvHandler::dumpAttachmentLocks, NULL, NULL));
                 pDbgMenu->appendSeparator();
                 if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))
                         pDbgMenu->append(new LLMenuItemCheckGL("Enable Legacy Naming", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_ENABLELEGACYNAMING));
+                if (gSavedSettings.controlExists(RLV_SETTING_SHAREDINVAUTORENAME))
+                        pDbgMenu->append(new LLMenuItemCheckGL("Rename Shared Items on Wear", menu_toggle_control, NULL, menu_check_control, (void*)RLV_SETTING_SHAREDINVAUTORENAME));
 
                 menu->appendMenu(pDbgMenu);
                 menu->appendSeparator();
         }
 
-        #ifdef RLV_EXTENSION_ENABLE_WEAR
-                if (gSavedSettings.controlExists(RLV_SETTING_ENABLEWEAR))
-                        menu->append(new LLMenuItemCheckGL("Enable Wear", menu_toggle_control, rlvEnableWearEnabler, menu_check_control, (void*)RLV_SETTING_ENABLEWEAR));
-                menu->appendSeparator();
-        #endif // RLV_EXTENSION_ENABLE_WEAR
+        if (gSavedSettings.controlExists(RLV_SETTING_ENABLEWEAR))
+                menu->append(new LLMenuItemCheckGL("Enable Default Wear", menu_toggle_control, rlvEnableWearEnabler, menu_check_control, (void*)RLV_SETTING_ENABLEWEAR));
+#ifndef RLV_WORKAROUND_REZMULTIPLEATTACH
+        if (gSavedSettings.controlExists(RLV_SETTING_ENABLESHAREDWEAR))
+                menu->append(new LLMenuItemCheckGL("Enable Shared Wear", menu_toggle_control, rlvEnableSharedWearEnabler, menu_check_control, (void*)RLV_SETTING_ENABLESHAREDWEAR));
+#endif // RLV_WORKAROUND_REZMULTIPLEATTACH
+        menu->appendSeparator();
 
         #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));
+                        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();
                 }
@@ -1662,13 +1665,10 @@ 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)        )
+// [RLVa:KB] - Checked: 2010-01-01 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canTouch(object, pick.mObjectOffset)) )
                 {
-                        return true;    // Can't touch in-world objects (or other avie's attachments) farther than 1.5m away under @fartouch=n
+                        return true;
                 }
 // [/RLVa:KB]
 
@@ -1720,12 +1720,10 @@ class LLObjectEnableTouch : public view_listener_t
         {
                 LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
                 bool new_value = obj && obj->flagHandleTouch();
-// [RLVa:KB] - Version: 1.23.4 | 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) )
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2010-01-01 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+                if ( (new_value) && (rlv_handler_t::isEnabled()) && (!gRlvHandler.canTouch(obj, LLToolPie::getInstance()->getPick().mObjectOffset)) )
                 {
-                        new_value = false;      // Can't touch in-world objects (or other avie's attachments) farther than 1.5m away under @fartouch=n
+                        new_value = false;
                 }
 // [/RLVa:KB]
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
@@ -2681,7 +2679,7 @@ class LLAvatarFreeze : public view_listener_t
                                 LLSD args;
 //                              args["AVATAR_NAME"] = fullname;
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
-                                args["AVATAR_NAME"] = (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullname : gRlvHandler.getAnonym(fullname);
+                                args["AVATAR_NAME"] = (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullname : RlvStrings::getAnonym(fullname);
 // [/RLVa:KB]
                                 LLNotifications::instance().add("FreezeAvatarFullname",
                                                         args,
@@ -2810,7 +2808,7 @@ class LLAvatarEject : public view_listener_t
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
                         if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (!fullname.empty()) )
                         {
-                                fullname = gRlvHandler.getAnonym(fullname);
+                                fullname = RlvStrings::getAnonym(fullname);
                         }
 // [/RLVa:KB]
 
@@ -3418,10 +3416,9 @@ 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)) ) )
+// [RLVa:KB] - Checked: 2009-12-22 (RLVa-1.1.0k) | Modified: RLVa-1.1.0j
+        // Block if we can't sit on the selected object (also handles sitting and prevented from standing up)
+        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.canSit(object, pick.mObjectOffset)) )
         {
                 return true;
         }
@@ -3437,15 +3434,6 @@ 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());
@@ -3483,8 +3471,8 @@ 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))
+// [RLVa:KB] - Checked: 2010-03-31 (RLVa-1.1.1a) | Modified: RLVa-1.2.0c
+                if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SIT))) )
                 {
                         return true;
                 }
@@ -5800,7 +5788,9 @@ class LLObjectEnableSitOrStand : public view_listener_t
                                 new_value = true;
                         }
                 }
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+// [RLVa:KB] - Checked: 2009-12-22 (RLVa-1.1.0k) | Added: RLVa-1.1.0j
+//              gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+// [/RLVa:KB]
 
                 // Update label
                 std::string label;
@@ -5816,6 +5806,9 @@ class LLObjectEnableSitOrStand : public view_listener_t
                 if (sitting_on_selection())
                 {
                         label = stand_text;
+// [RLVa:KB] - Checked: 2009-12-22 (RLVa-1.1.0k) | Added: RLVa-1.1.0j
+                        new_value &= !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT);
+// [/RLVa:KB]
                 }
                 else
                 {
@@ -5828,8 +5821,22 @@ class LLObjectEnableSitOrStand : public view_listener_t
                         {
                                 label = sit_text;
                         }
+// [RLVa:KB] - Checked: 2009-12-22 (RLVa-1.1.0k) | Added: RLVa-1.1.0j
+                        if ( (rlv_handler_t::isEnabled()) && (new_value) )
+                        {
+                                // RELEASE-RLVa: [2009-12-22] make sure we examine the same object that handle_sit_or_stand() will request a sit for
+                                const LLPickInfo& pick = LLToolPie::getInstance()->getPick();
+                                if (pick.mObjectID.notNull())
+                                {
+                                        new_value = gRlvHandler.canSit(pick.getObject(), pick.mObjectOffset);
+                                }
+                        }
+// [/RLVa:KB]
                 }
                 gMenuHolder->childSetText("Object Sit", label);
+// [RLVa:KB] - Checked: 2009-12-22 (RLVa-1.1.0k) | Added: RLVa-1.1.0j
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+// [/RLVa:KB]
 
                 return true;
         }
@@ -7569,6 +7576,9 @@ class LLWorldEnableTeleportHome : public view_listener_t
                 LLViewerRegion* regionp = gAgent.getRegion();
                 bool agent_on_prelude = (regionp && regionp->isPrelude());
                 bool enable_teleport_home = gAgent.isGodlike() || !agent_on_prelude;
+// [RLVa:KB] - Checked: 2009-12-22 (RLVa-1.1.0k) | Added: RLVa-1.1.0j
+                enable_teleport_home &= !gRlvHandler.hasBehaviour(RLV_BHVR_TPLM);
+// [/RLVa:KB]
                 gMenuHolder->findControl(userdata["control"].asString())->setValue(enable_teleport_home);
                 return true;
         }
@@ -11420,4 +11430,10 @@ void initialize_menus()
         addMenu(new RLVaBehaviorsShow(), "RLVa.Behaviors.Show");
 // [/RLVa:KB]
 
+// [RLVa:KB] - Checked: 2010-01-18 (RLVa-1.1.0m) | Added: RLVa-1.1.0m
+        if (rlv_handler_t::isEnabled())
+        {
+                addMenu(new RlvEnableIfNot(), "RLV.EnableIfNot");
+        }
+// [/RLVa:KB]
 }
diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index 432fcc5..1981bb9 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -640,6 +640,38 @@ void upload_new_resource(const std::string& src_filename, std::string name,
                         return;
                 }
         }
+#ifdef LL_DARWIN
+        else if(exten == "psd")
+        {
+                asset_type = LLAssetType::AT_TEXTURE;
+                if (!LLViewerImageList::createUploadFile(src_filename,
+                                                                                                 filename,
+                                                                                                 IMG_CODEC_PSD ))
+                {
+                        error_message = llformat("Problem with file %s:\n\n%s\n",
+                                                                         src_filename.c_str(), LLImage::getLastError().c_str());
+                        args["FILE"] = src_filename;
+                        args["ERROR"] = LLImage::getLastError();
+                        upload_error(error_message, "ProblemWithFile", filename, args);
+                        return;
+                }
+        }
+        else if(exten == "tif" || exten == "tiff")
+        {
+                asset_type = LLAssetType::AT_TEXTURE;
+                if (!LLViewerImageList::createUploadFile(src_filename,
+                                                                                                 filename,
+                                                                                                 IMG_CODEC_TIFF ))
+                {
+                        error_message = llformat("Problem with file %s:\n\n%s\n",
+                                                                         src_filename.c_str(), LLImage::getLastError().c_str());
+                        args["FILE"] = src_filename;
+                        args["ERROR"] = LLImage::getLastError();
+                        upload_error(error_message, "ProblemWithFile", filename, args);
+                        return;
+                }
+        }
+#endif
         else if(exten == "wav")
         {
                 asset_type = LLAssetType::AT_SOUND;  // tag it as audio
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 52113ce..dbf9d72 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -143,6 +143,10 @@
 
 #include "panelradarentry.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #include <boost/tokenizer.hpp>
 #include <boost/regex.hpp> // Boost Reg Expresions
 
@@ -258,6 +262,13 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
                 msg->addUUIDFast(_PREHASH_TransactionID, payload["session_id"]);
                 msg->sendReliable(LLHost(payload["sender"].asString()));
                 break;
+        case 2:
+                // Push another notification
+                // Do we need to check for OfferFriendshipNoMessage here ever? -- MC
+                LLNotifications::instance().add("OfferFriendship", notification["substitutions"], notification["payload"]);
+                LLURLDispatcher::dispatch(llformat("secondlife:///app/agent/%s/about",payload["from_id"].asString().c_str()), NULL, true);
+                break;
+        case 3:
         default:
                 // close button probably, possibly timed out
                 break;
@@ -1130,7 +1141,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
                                 std::string full_name = first_name + " " + last_name;
                                 if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(mFromID)) )
                                 {
-                                        full_name = gRlvHandler.getAnonym(full_name);
+                                        full_name = RlvStrings::getAnonym(full_name);
                                 }
                                 from_string = std::string("An object named '") + mFromName + "' owned by " + full_name;
                                 chatHistory_string = mFromName + " owned by " + full_name;
@@ -1199,6 +1210,23 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
                         // This is an offer from an agent. In this case, the back
                         // end has already copied the items into your inventory,
                         // so we can fetch it out of our inventory.
+// [RLVa:KB] - Checked: 2010-01-01 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
+#ifdef RLV_EXTENSION_GIVETORLV_A2A
+                        if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getForbidGiveToRLV()) &&
+                                 (LLAssetType::AT_CATEGORY == mType) && (mDesc.find(RLV_PUTINV_PREFIX) == 0) )
+                        {
+                                RlvGiveToRLVAgentOffer* pOffer = new RlvGiveToRLVAgentOffer();
+                                LLInventoryFetchComboObserver::folder_ref_t folders;
+                                folders.push_back(mObjectID);
+                                pOffer->fetchDescendents(folders);
+                                if (pOffer->isEverythingComplete())
+                                        pOffer->done();
+                                else
+                                        gInventory.addObserver(pOffer);
+                        }
+#endif // RLV_EXTENSION_GIVETORLV_A2A
+// [/RLVa:KB]
+
                         LLInventoryFetchObserver::item_ref_t items;
                         items.push_back(mObjectID);
                         LLOpenAgentOffer* open_agent_offer = new LLOpenAgentOffer(from_string);
@@ -1389,7 +1417,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
                         if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
                         {
-                                first_name = gRlvHandler.getAnonym(first_name.append(" ").append(last_name));
+                                first_name = RlvStrings::getAnonym(first_name.append(" ").append(last_name));
                                 last_name.clear();
                         }
 // [/RLVa:KB]
@@ -1415,7 +1443,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
                 if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
                 {
-                        args["NAME"] = gRlvHandler.getAnonym(info->mFromName);
+                        args["NAME"] = RlvStrings::getAnonym(info->mFromName);
                 }
 // [/RLVa:KB]
                 p.name = "UserGiveItem";
@@ -1840,7 +1868,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 // [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);
+                        rlvSendBusyMessage(from_id, RlvStrings::getVersion(), 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);
@@ -1916,7 +1944,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                         gRlvHandler.filterLocation(message);
                                 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
                                 {
-                                        name = gRlvHandler.getAnonym(name);
+                                        name = RlvStrings::getAnonym(name);
                                         gRlvHandler.filterNames(message);
                                 }
                         }
@@ -1940,9 +1968,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 // [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;
+                                if (!is_muted)
+                                        rlvSendBusyMessage(from_id, RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM_REMOTE), session_id);
+                                message = message.substr(0, message_offset) + RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM);
                         }
 // [/RLVa:KB]
 
@@ -2167,7 +2195,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
                                 if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(from_id)) )
                                 {
-                                        name = gRlvHandler.getAnonym(name);
+                                        name = RlvStrings::getAnonym(name);
                                 }
 // [/RLVa:KB]
                         }
@@ -2207,11 +2235,17 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         }
                         else
                         {
-// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-09-10 (RLVa-1.0.3a)
-                                if ( (rlv_handler_t::isEnabled()) && (dialog == IM_TASK_INVENTORY_OFFERED) &&
-                                         (info->mDesc.find(RLV_PUTINV_PREFIX) == 1) && (gRlvHandler.getSharedRoot()) )
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+                                if ( (rlv_handler_t::isEnabled()) &&
+                                         (
+                                           ((IM_TASK_INVENTORY_OFFERED == dialog) && (info->mDesc.find(RLV_PUTINV_PREFIX) == 1))
+#ifdef RLV_EXTENSION_GIVETORLV_A2A
+                                           || ((IM_INVENTORY_OFFERED == dialog) && (info->mDesc.find(RLV_PUTINV_PREFIX) == 0))
+#endif // RLV_EXTENSION_GIVETORLV_A2A
+                                         ) &&
+                                         (gRlvHandler.getSharedRoot()) )
                                 {
-                                        LLFirstUse::warnRlvGiveToRLV();
+                                        RlvNotifications::warnGiveToRLV();
                                 }
 // [/RLVa:KB]
 
@@ -2225,7 +2259,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 // [RLVa:KB] - Version: 1.23.4 | 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);
+                args["NAME"] = (!fRlvObfuscate) ? name : RlvStrings::getAnonym(name);
 // [/RLVa:KB]
                 //args["NAME"] = name;
                 LLNotifications::instance().add("InventoryAccepted", args);
@@ -2236,7 +2270,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 // [RLVa:KB] - Version: 1.23.4 | 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);
+                args["NAME"] = (!fRlvObfuscate) ? name : RlvStrings::getAnonym(name);
 // [/RLVa:KB]
                 //args["NAME"] = name;
                 LLNotifications::instance().add("InventoryDeclined", args);
@@ -2285,7 +2319,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                         else
                         {
                                 if ( (from_id != gAgent.getID()) && (!gRlvHandler.isException(RLV_BHVR_RECVIM, from_id)) )
-                                        message = message.substr(0, message_offset) + rlv_handler_t::cstrBlockedRecvIM;
+                                        message = message.substr(0, message_offset) + RlvStrings::getString(RLV_STRING_BLOCKED_RECVIM);
                         }
                 }
 // [/RLVa:KB]
@@ -2453,7 +2487,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                         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);
+                                                rlvSendBusyMessage(from_id, RlvStrings::getString(RLV_STRING_BLOCKED_TPLURE_REMOTE));
                                                 return;
                                         }
 
@@ -2461,7 +2495,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                         if ( ( (gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) && (!gRlvHandler.isException(RLV_BHVR_RECVIM, from_id)) ) ||
                                                  (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
                                         {
-                                                message = rlv_handler_t::cstrHidden;
+                                                message = RlvStrings::getString(RLV_STRING_HIDDEN);
                                         }
                                 }
 // [/RLVa:KB]
@@ -2945,7 +2979,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                                 if (CHAT_SOURCE_AGENT == chat.mSourceType)
                                 {
                                         if (chat.mFromID != gAgent.getID())
-                                                from_name = gRlvHandler.getAnonym(from_name);
+                                                from_name = RlvStrings::getAnonym(from_name);
                                 } 
                                 else
                                 {
@@ -3045,7 +3079,8 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                                 verb = " " + LLTrans::getString("whisper") + " ";
                                 break;
                         case CHAT_TYPE_OWNER:
-// [RLVa:KB] - Checked: 2009-08-28 (RLVa-1.0.2a) | Modified: RLVa-1.0.2a
+// [RLVa:KB] - Checked: 2009-11-25 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+                                // TODO-RLVa: [2009-11-25] this could really use some rewriting
                                 if ( (rlv_handler_t::isEnabled()) && (mesg.length() > 3) && (RLV_CMD_PREFIX == mesg[0]) && (CHAT_TYPE_OWNER == chat.mChatType) )
                                 {
                                         mesg.erase(0, 1);
@@ -3054,24 +3089,33 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                                         std::string strExecuted, strFailed, strRetained, *pstr;
 
                                         boost_tokenizer tokens(mesg, boost::char_separator<char>(",", "", boost::drop_empty_tokens));
-                                        for (boost_tokenizer::const_iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
+                                        for (boost_tokenizer::iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
                                         {
-                                                if (LLStartUp::getStartupState() == STATE_STARTED)
+                                                std::string strCmd = *itToken;
+
+                                                ERlvCmdRet eRet = gRlvHandler.processCommand(from_id, strCmd, true);
+                                                if (RlvSettings::getDebug())
                                                 {
-                                                        if (gRlvHandler.processCommand(from_id, *itToken, true))
+                                                        if ( RLV_RET_SUCCESS == (eRet & RLV_RET_SUCCESS) )
                                                                 pstr = &strExecuted;
+                                                        else if ( RLV_RET_FAILED == (eRet & RLV_RET_FAILED) )
+                                                                pstr = &strFailed;
+                                                        else if (RLV_RET_RETAINED == eRet)
+                                                                pstr = &strRetained;
                                                         else
+                                                        {
+                                                                RLV_ASSERT(false);
                                                                 pstr = &strFailed;
-                                                }
-                                                else
-                                                {
-                                                        gRlvHandler.retainCommand(from_name, from_id, *itToken);
-                                                        pstr = &strRetained;
-                                                }
+                                                        }
 
-                                                if (!pstr->empty())
-                                                        pstr->push_back(',');
-                                                pstr->append(*itToken);
+                                                        const char* pstrSuffix = RlvStrings::getStringFromReturnCode(eRet);
+                                                        if (pstrSuffix)
+                                                                strCmd.append(" (").append(pstrSuffix).append(")");
+
+                                                        if (!pstr->empty())
+                                                                pstr->push_back(',');
+                                                        pstr->append(strCmd);
+                                                }
                                         }
 
                                         if (!RlvSettings::getDebug())
@@ -3079,11 +3123,20 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
                                         // Silly people want comprehensive debug messages, blah :p
                                         if ( (!strExecuted.empty()) && (strFailed.empty()) && (strRetained.empty()) )
+                                        {
                                                 verb = " executes: @";
+                                                mesg = strExecuted;
+                                        }
                                         else if ( (strExecuted.empty()) && (!strFailed.empty()) && (strRetained.empty()) )
+                                        {
                                                 verb = " failed: @";
+                                                mesg = strFailed;
+                                        }
                                         else if ( (strExecuted.empty()) && (strFailed.empty()) && (!strRetained.empty()) )
+                                        {
                                                 verb = " retained: @";
+                                                mesg = strRetained;
+                                        }
                                         else 
                                         {
                                                 verb = ": @";
@@ -3098,9 +3151,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                                         break;
                                 }
 // [/RLVa:KB]
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+// [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-10 (RLVa-1.0.0g)
                                 // Copy/paste from above
-                                if  ( (chatter) && (chat.mChatType != CHAT_TYPE_DEBUG_MSG) )
+                                if ( (chatter) && (chat.mSourceType == CHAT_SOURCE_OBJECT && chat.mChatType != CHAT_TYPE_DEBUG_MSG) )
                                 {
                                         LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
                                         psc->setSourceObject(chatter);
@@ -5361,7 +5414,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
 // [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);
+                                        notice.setArg("[REGIONNAME]", RlvStrings::getString(RLV_STRING_HIDDEN_REGION));
                                 }
 // [/RLVa:KB]
                                 std::string formatpos = llformat("%.1f, %.1f,%.1f", objpos[VX], objpos[VY], objpos[VZ]);
@@ -5588,12 +5641,12 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
                         LLViewerObject* pObj = gObjectList.findObject(taskid);
                         if (pObj)
                         {
-                                if (pObj->permYouOwner())
-                                {
+//                              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]);
-                                }
+//                              }
                         }
                 }
 
@@ -5944,7 +5997,7 @@ bool handle_lure_callback(const LLSD& notification, const LLSD& response)
                         {
                                 if (!gRlvHandler.isException(RLV_BHVR_SENDIM, it->asUUID()))
                                 {
-                                        text = rlv_handler_t::cstrHidden;
+                                        text = RlvStrings::getString(RLV_STRING_HIDDEN);
                                         break;
                                 }
                         }
@@ -5984,7 +6037,8 @@ void handle_lure(LLDynamicArray<LLUUID>& ids)
 {
         LLSD edit_args;
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-04 (RLVa-1.0.0a)
-        edit_args["REGION"] = (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? gAgent.getRegion()->getName() : rlv_handler_t::cstrHidden;
+        edit_args["REGION"] =
+                (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? gAgent.getRegion()->getName() : RlvStrings::getString(RLV_STRING_HIDDEN);
 // [/RLVa:KB]
         //edit_args["REGION"] = gAgent.getRegion()->getName();
 
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index cbd0472..1b79cd6 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -98,6 +98,10 @@
 #include "llvowlsky.h"
 #include "llmanip.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //#define DEBUG_UPDATE_TYPE
 
 BOOL gVelocityInterpolate = TRUE;
@@ -1616,6 +1620,24 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                                                 gObjectList.killObject(this);
                                                                 return retval;
                                                         }
+// [RLVa:KB] - Checked: 2009-12-27 (RLVa-1.1.0k) | Added: RLVa-1.1.0k
+                                                        if ( (rlv_handler_t::isEnabled()) && (sent_parentp->isAvatar()) && (sent_parentp->getID() == gAgent.getID()) )
+                                                        {
+                                                                // Rezzed object that's being worn as an attachment (we're assuming this will be due to llAttachToAvatar())
+                                                                S32 idxAttachPt = ATTACHMENT_ID_FROM_STATE(getState());
+                                                                if (gRlvHandler.isLockedAttachment(idxAttachPt, RLV_LOCK_ANY))
+                                                                {
+                                                                        // If this will end up on an "add locked" attachment point then treat the attach as a user action
+                                                                        LLNameValue* nvItem = getNVPair("AttachItemID");
+                                                                        if (nvItem)
+                                                                        {
+                                                                                LLUUID idItem(nvItem->getString());
+                                                                                if (idItem.notNull())
+                                                                                        gRlvHandler.onWearAttachment(idItem);
+                                                                        }
+                                                                }
+                                                        }
+// [/RLVa:KB]
                                                         sent_parentp->addChild(this);
                                                         // make sure this object gets a non-damped update
                                                         if (sent_parentp->mDrawable.notNull())
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 981c9bc..1616b97 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -63,6 +63,10 @@
 #include "llappviewer.h" // for gPacificDaylightTime
 #include "viewertime.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 static LLRegisterWidget<LLViewerTextEditor> r("text_editor");
 
 ///----------------------------------------------------------------------------
@@ -97,9 +101,10 @@ public:
                 }
                 else
                 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) )
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
+                        if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE))
                         {
+                                RlvNotifications::notifyBlockedViewNote();
                                 return;
                         }
 // [/RLVa:KB]
@@ -1388,9 +1393,10 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item, llwchar wc)
 
 void LLViewerTextEditor::openEmbeddedTexture( LLInventoryItem* item, llwchar wc )
 {
-// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Added: RLVa-1.0.5c
+// [RLVa:KB] - Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
         if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))
         {
+                RlvNotifications::notifyBlockedViewTexture();
                 return;
         }
 // [/RLVa:KB]
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 3a68f0f..401e62d 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -187,6 +187,10 @@
 #include "llfloatertest.h" // HACK!
 #include "llfloaternotificationsconsole.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #if LL_WINDOWS
 #include <tchar.h> // For Unicode conversion methods
 #endif
@@ -3473,17 +3477,41 @@ LLViewerObject* LLViewerWindow::cursorIntersect(S32 mouse_x, S32 mouse_y, F32 de
                         }
 
         else // check ALL objects
-                        {
+        {
                 found = gPipeline.lineSegmentIntersectInHUD(mouse_hud_start, mouse_hud_end, pick_transparent,
                                                                                                         face_hit, intersection, uv, normal, binormal);
 
-                if (!found) // if not found in HUD, look in world:
+// [RLVa:KB] - Checked: 2009-12-28 (RLVa-1.1.0k) | Modified: RLVa-1.1.0k
+                if ( (rlv_handler_t::isEnabled()) && (LLToolCamera::getInstance()->hasMouseCapture()) && (gKeyboard->currentMask(TRUE) & MASK_ALT) )
+                {
+                        found = NULL;
+                }
+// [/RLVa:KB]
 
-                        {
+                if (!found) // if not found in HUD, look in world:
+                {
                         found = gPipeline.lineSegmentIntersectInWorld(mouse_world_start, mouse_world_end, pick_transparent,
                                                                                                                   face_hit, intersection, uv, normal, binormal);
-                        }
 
+// [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
+#ifdef RLV_EXTENSION_CMD_INTERACT
+                        if ( (rlv_handler_t::isEnabled()) && (found) && (gRlvHandler.hasBehaviour(RLV_BHVR_INTERACT)) )
+                        {
+                                // Allow picking if:
+                                //   - the drag-and-drop tool is active (allows inventory offers)
+                                //   - the camera tool is active
+                                //   - the pie tool is active *and* we picked our own avie (allows "mouse steering" and the self pie menu)
+                                LLTool* pCurTool = LLToolMgr::getInstance()->getCurrentTool();
+                                if ( (LLToolDragAndDrop::getInstance() != pCurTool) &&
+                                         (!LLToolCamera::getInstance()->hasMouseCapture()) &&
+                                         ((LLToolPie::getInstance() != pCurTool) || (gAgent.getID() != found->getID())) )
+                                {
+                                        found = NULL;
+                                }
+                        }
+#endif // RLV_EXTENSION_CMD_INTERACT
+// [/RLVa:KB]
+                }
         }
 
         return found;
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index 535c504..afd9b95 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -73,10 +73,10 @@ LLVLComposition::LLVLComposition(LLSurface *surfacep, const U32 width, const F32
 
         // Load Terrain Textures - Original ones
         // Load from file as OpenSim-based grids don't include these yet -- MC
-        setDetailTextureID(0, TERRAIN_DIRT_DETAIL.asString()+".j2c", TRUE, TRUE);
-        setDetailTextureID(1, TERRAIN_GRASS_DETAIL.asString()+".j2c", TRUE, TRUE);
-        setDetailTextureID(2, TERRAIN_MOUNTAIN_DETAIL.asString()+".j2c", TRUE, TRUE);
-        setDetailTextureID(3, TERRAIN_ROCK_DETAIL.asString()+".j2c", TRUE, TRUE);
+        setDetailTextureID(0, TERRAIN_DIRT_DETAIL.asString()+".j2c", TRUE, FALSE, 0, 0, TERRAIN_DIRT_DETAIL);
+        setDetailTextureID(1, TERRAIN_GRASS_DETAIL.asString()+".j2c", TRUE, FALSE, 0, 0, TERRAIN_GRASS_DETAIL);
+        setDetailTextureID(2, TERRAIN_MOUNTAIN_DETAIL.asString()+".j2c", TRUE, FALSE, 0, 0, TERRAIN_MOUNTAIN_DETAIL);
+        setDetailTextureID(3, TERRAIN_ROCK_DETAIL.asString()+".j2c", TRUE, FALSE, 0, 0, TERRAIN_ROCK_DETAIL);
 
         // Initialize the texture matrix to defaults.
         for (S32 i = 0; i < CORNER_COUNT; ++i)
@@ -112,13 +112,13 @@ void LLVLComposition::setDetailTextureID(S32 corner, const LLUUID& id)
         mRawImages[corner] = NULL;
 }
 
-void LLVLComposition::setDetailTextureID(S32 corner, const std::string& filename, const bool& usemipmap, const bool& levelimmediate)
+void LLVLComposition::setDetailTextureID(S32 corner, const std::string& filename, const bool& usemipmap, const bool& levelimmediate,  LLGLint internal_format, LLGLenum primary_format, const LLUUID& force_id)
 {
         if(filename.empty())
         {
                 return;
         }
-        mDetailTextures[corner] = gImageList.getImageFromFile(filename, usemipmap, levelimmediate);
+        mDetailTextures[corner] = gImageList.getImageFromFile(filename, usemipmap, levelimmediate, internal_format, primary_format, force_id);
         mDetailTextures[corner]->setNoDelete() ;
         mRawImages[corner] = NULL;
 }
diff --git a/linden/indra/newview/llvlcomposition.h b/linden/indra/newview/llvlcomposition.h
index 4ae296c..eb61bfd 100644
--- a/linden/indra/newview/llvlcomposition.h
+++ b/linden/indra/newview/llvlcomposition.h
@@ -67,7 +67,7 @@ public:
         F32 getHeightRange(S32 corner);
 
         void setDetailTextureID(S32 corner, const LLUUID& id);
-        void setDetailTextureID(S32 corner, const std::string& filename, const bool& usemipmap, const bool& levelimmediate);
+        void setDetailTextureID(S32 corner, const std::string& filename, const bool& usemipmap, const bool& levelimmediate,  LLGLint internal_format, LLGLenum primary_format, const LLUUID& force_id);
         void setStartHeight(S32 corner, F32 start_height);
         void setHeightRange(S32 corner, F32 range);
 
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 3be166e..7bbaf48 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -96,7 +96,7 @@
 #include "hippoLimits.h"// getMaxPrimScale
 
 // [RLVa:KB]
-#include "llstartup.h"
+#include "rlvhandler.h"
 // [/RLVa:KB]
 
 using namespace LLVOAvatarDefines;
@@ -3473,10 +3473,10 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
         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) ) &&
+                                                ( (!fRlvShowNames) || (RlvSettings::getShowNameTags()) ) &&
 // [/RLVa:KB]
                                                 ((sRenderName == RENDER_NAME_ALWAYS) ||
-                                                (sRenderName == RENDER_NAME_FADE && time_visible < NAME_SHOW_TIME)));
+                                                 (sRenderName == RENDER_NAME_FADE && time_visible < NAME_SHOW_TIME)));
         // If it's your own avatar, don't draw in mouselook, and don't
         // draw if we're specifically hiding our own name.
         if (mIsSelf)
@@ -3506,7 +3506,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                 }
                 else if (sRenderGroupTitles != mRenderGroupTitles)
 // [/RLVa]
-                //if (sRenderGroupTitles != mRenderGroupTitles)
+//              if (sRenderGroupTitles != mRenderGroupTitles)
                 {
                         mRenderGroupTitles = sRenderGroupTitles;
                         new_name = TRUE;
@@ -3662,7 +3662,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 }
                                 else
                                 {
-                                        line = gRlvHandler.getAnonym(line.assign(firstname->getString()).append(" ").append(lastname->getString()));
+                                        line = RlvStrings::getAnonym(line.assign(firstname->getString()).append(" ").append(lastname->getString()));
                                 }
 // [/RLVa:KB]
 
@@ -5196,6 +5196,7 @@ void LLVOAvatar::addLocalTextureStats( ETextureIndex idx, LLViewerImage* imagep,
 
 void LLVOAvatar::addBakedTextureStats( LLViewerImage* imagep, F32 pixel_area, F32 texel_area_ratio, S32 boost_level)
 {
+        imagep->setCanUseHTTP(false) ; //turn off http fetching for baked textures.
         mMaxPixelArea = llmax(pixel_area, mMaxPixelArea);
         mMinPixelArea = llmin(pixel_area, mMinPixelArea);
         imagep->addTextureStats(pixel_area / texel_area_ratio);
@@ -6746,14 +6747,6 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
         gPipeline.markMoved(mDrawable, TRUE);
         mIsSitting = TRUE;
         LLFloaterAO::ChangeStand();
-// [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();
@@ -6762,6 +6755,15 @@ void LLVOAvatar::sitOnObject(LLViewerObject *sit_object)
 
         if (mIsSelf)
         {
+// [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]
+
                 // Might be first sit
                 LLFirstUse::useSit();
 
@@ -6815,14 +6817,6 @@ 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);
@@ -6833,6 +6827,15 @@ void LLVOAvatar::getOffObject()
 
         if (mIsSelf)
         {
+// [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]
+
                 LLQuaternion av_rot = gAgent.getFrameAgent().getQuaternion();
                 LLQuaternion obj_rot = sit_object ? sit_object->getRenderRotation() : LLQuaternion::DEFAULT;
                 av_rot = av_rot * obj_rot;
@@ -6908,6 +6911,20 @@ LLViewerObject* LLVOAvatar::getWornAttachment( const LLUUID& inv_item_id )
         return NULL;
 }
 
+// [RLVa:KB] - Checked: 2009-12-18 (RLVa-1.1.0i) | Added: RLVa-1.1.0i
+LLViewerJointAttachment* LLVOAvatar::getWornAttachmentPoint(const LLUUID& inv_item_id)
+{
+        for (attachment_map_t::const_iterator itAttach = mAttachmentPoints.begin();
+                        itAttach != mAttachmentPoints.end(); ++itAttach)
+        {
+                LLViewerJointAttachment* pAttachPt = itAttach->second;
+                if (pAttachPt->getItemID() == inv_item_id)
+                        return pAttachPt;
+        }
+        return NULL;
+}
+// [/RLVa:KB]
+
 const std::string LLVOAvatar::getAttachedPointName(const LLUUID& inv_item_id)
 {
         for (attachment_map_t::iterator iter = mAttachmentPoints.begin(); 
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 0c32244..50ce53a 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -288,6 +288,9 @@ public:
 
         BOOL isWearingAttachment( const LLUUID& inv_item_id );
         LLViewerObject* getWornAttachment( const LLUUID& inv_item_id );
+// [RLVa:KB] - Checked: 2009-12-18 (RLVa-1.1.0i) | Added: RLVa-1.1.0i
+        LLViewerJointAttachment* getWornAttachmentPoint(const LLUUID& inv_item_id);
+// [/RLVa:KB]
         const std::string getAttachedPointName(const LLUUID& inv_item_id);
 
         static LLVOAvatar* findAvatarFromAttachment( LLViewerObject* obj );
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index bed3e13..f3b8447 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -64,6 +64,10 @@
 #include "llselectmgr.h"
 #include "pipeline.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 const S32 MIN_QUIET_FRAMES_COALESCE = 30;
 const F32 FORCE_SIMPLE_RENDER_AREA = 512.f;
 const F32 FORCE_CULL_AREA = 8.f;
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index 5a6b35d..b9111d3 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -121,6 +121,7 @@ BOOL LLWindlightRemoteCtrl::postBuild()
         LLComboBox*     presetsCombo = getChild<LLComboBox>("Presets");
         if (presetsCombo)
         {
+                presetsCombo->setSimple(LLWLParamManager::instance()->mCurParams.mName);
                 presetsCombo->setCommitCallback(onCommitPreset);
                 presetsCombo->setCallbackUserData(this);
 
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index e12bd08..443ee74 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -64,6 +64,9 @@
 #include "lltexturefetch.h"
 #include "llappviewer.h"                                // Only for constants!
 #include "lltrans.h"
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 #include "llglheaders.h"
 
@@ -696,7 +699,7 @@ void LLWorldMapView::draw()
 // [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;
+                                mesg = RlvStrings::getString(RLV_STRING_HIDDEN);
                         }
                         else if (info->mAccess == SIM_ACCESS_DOWN)
 // [/RLVa:KB]
@@ -1285,7 +1288,7 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* stic
 // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-07-04 (RLVa-1.0.0a)
                 std::string message = 
                         llformat("%s (%s)",
-                                        (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? info->mName.c_str() : rlv_handler_t::cstrHidden.c_str(),
+                                        (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) ? info->mName.c_str() : RlvStrings::getString(RLV_STRING_HIDDEN).c_str(),
                                          LLViewerRegion::accessToString(info->mAccess).c_str());
 // [/RLVa:KB]
 
diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index ce91da2..a868ee2 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -57,7 +57,9 @@
 #include "llvoavatar.h"
 #include "llworld.h"
 #include "panelradarentry.h"
-
+// [RLVa:KB] - Alternate: Imprudence-1.2.0
+#include "rlvhandler.h"
+// [/RLVa:KB]
 
 PanelRadar::PanelRadar()
         :
@@ -112,7 +114,9 @@ bool PanelRadar::isImpDev(const LLUUID& agent_id)
         std::string agent_name = getSelectedName(agent_id);
         return (agent_name == "McCabe Maxsted" || 
                 agent_name == "Jacek Antonelli" ||
-                agent_name == "Armin Weatherwax");
+                agent_name == "Armin Weatherwax" ||
+                        agent_name == "Elektra Hesse" || 
+                        agent_name == "CodeBastard Redgrave");
 }
 
 void PanelRadar::updateRadarInfo()
@@ -303,7 +307,7 @@ void PanelRadar::updateRadarDisplay()
 // [RLVa:KB] - Alternate: Imprudence-1.2.0
                         element["columns"][0]["value"] =
                                 (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
-                                        ? gRlvHandler.getAnonym(entry->getName())
+                                        ? RlvStrings::getAnonym(entry->getName())
                                         : typing + entry->getName() + " " + mute_text;
 // [/RLVa:KB]
                         element["columns"][1]["column"] = "avatar_distance";
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 0ca94dc..cf766e0 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -102,6 +102,10 @@
 #include "llspatialpartition.h"
 #include "llmutelist.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 #ifdef _DEBUG
 // Debug indices is disabled for now for debug performance - djs 4/24/02
 //#define DEBUG_INDICES
diff --git a/linden/indra/newview/rlvcommon.cpp b/linden/indra/newview/rlvcommon.cpp
new file mode 100644
index 0000000..3f494bc
--- /dev/null
+++ b/linden/indra/newview/rlvcommon.cpp
@@ -0,0 +1,399 @@
+/**
+ *
+ * Copyright (c) 2009-2010, Kitty Barnett
+ *
+ * The source code in this file is provided to you under the terms of the
+ * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * 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.
+ *
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "llagent.h"
+#include "llappviewer.h"
+#include "lluictrlfactory.h"
+#include "llversionviewer.h"
+#include "llviewermenu.h"
+#include "llvoavatar.h"
+
+#include "rlvcommon.h"
+#include "rlvhandler.h"
+
+// ============================================================================
+// RlvNotifications
+//
+
+#ifdef RLV_EXTENSION_NOTIFY_BEHAVIOUR
+// Checked: 2009-12-05 (RLVa-1.1.0h) | Added: RLVa-1.1.0h
+void RlvNotifications::notifyBehaviour(ERlvBehaviour eBhvr, ERlvParamType eType)
+{
+        const std::string& strMsg = RlvStrings::getBehaviourNotificationString(eBhvr, eType);
+        if (!strMsg.empty())
+        {
+                LLSD argsNotify;
+                argsNotify["MESSAGE"] = strMsg;
+                LLNotifications::instance().add("SystemMessageTip", argsNotify);
+        }
+}
+#endif // RLV_EXTENSION_NOTIFY_BEHAVIOUR
+
+// Checked: 2009-11-11 (RLVa-1.1.0a) | Added: RLVa-1.1.0a
+void RlvNotifications::notifyBlockedViewXXX(const char* pstrAssetType)
+{
+        LLStringUtil::format_map_t argsMsg; std::string strMsg = RlvStrings::getString(RLV_STRING_BLOCKED_VIEWXXX);
+        argsMsg["[TYPE]"] = pstrAssetType;
+        LLStringUtil::format(strMsg, argsMsg);
+
+        LLSD argsNotify;
+        argsNotify["MESSAGE"] = strMsg;
+        LLNotifications::instance().add("SystemMessageTip", argsNotify);
+}
+
+// Checked: 2009-11-13 (RLVa-1.1.0b) | Modified: RLVa-1.1.0b
+void RlvNotifications::warnGiveToRLV()
+{
+        if ( (gSavedSettings.getWarning(RLV_SETTING_FIRSTUSE_GIVETORLV)) && (RlvSettings::getForbidGiveToRLV()) )
+                LLNotifications::instance().add(RLV_SETTING_FIRSTUSE_GIVETORLV, LLSD(), LLSD(), &RlvNotifications::onGiveToRLVConfirmation);
+}
+
+// Checked: 2009-11-13 (RLVa-1.1.0b) | Modified: RLVa-1.1.0b
+void RlvNotifications::onGiveToRLVConfirmation(const LLSD& notification, const LLSD& response)
+{
+        gSavedSettings.setWarning(RLV_SETTING_FIRSTUSE_GIVETORLV, FALSE);
+
+        S32 idxOption = LLNotification::getSelectedOption(notification, response);
+        if ( (0 == idxOption) || (1 == idxOption) )
+                gSavedSettings.setBOOL(RLV_SETTING_FORBIDGIVETORLV, (idxOption == 1));
+}
+
+// =========================================================================
+// RlvSettings
+//
+
+#ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+BOOL RlvSettings::fCompositeFolders = FALSE;
+#endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+BOOL RlvSettings::fLegacyNaming = TRUE;
+BOOL RlvSettings::fNoSetEnv = FALSE;
+BOOL RlvSettings::fShowNameTags = FALSE;
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Modified: RLVa-1.1.0i
+void RlvSettings::initClass()
+{
+        static bool fInitialized = false;
+        if (!fInitialized)
+        {
+                #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                fCompositeFolders = rlvGetSettingBOOL(RLV_SETTING_ENABLECOMPOSITES, FALSE);
+                if (gSavedSettings.controlExists(RLV_SETTING_ENABLECOMPOSITES))
+                        gSavedSettings.getControl(RLV_SETTING_ENABLECOMPOSITES)->getSignal()->connect(boost::bind(&onChangedSettingBOOL, _1, &fCompositeFolders));
+                #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+
+                fLegacyNaming = rlvGetSettingBOOL(RLV_SETTING_ENABLELEGACYNAMING, TRUE);
+                if (gSavedSettings.controlExists(RLV_SETTING_ENABLELEGACYNAMING))
+                        gSavedSettings.getControl(RLV_SETTING_ENABLELEGACYNAMING)->getSignal()->connect(boost::bind(&onChangedSettingBOOL, _1, &fLegacyNaming));
+
+                fNoSetEnv = rlvGetSettingBOOL(RLV_SETTING_NOSETENV, FALSE);
+
+                fShowNameTags = rlvGetSettingBOOL(RLV_SETTING_SHOWNAMETAGS, FALSE);
+                if (gSavedSettings.controlExists(RLV_SETTING_SHOWNAMETAGS))
+                        gSavedSettings.getControl(RLV_SETTING_SHOWNAMETAGS)->getSignal()->connect(boost::bind(&onChangedSettingBOOL, _1, &fShowNameTags));
+
+                fInitialized = true;
+        }
+}
+
+BOOL RlvSettings::getEnableWear()
+{
+        return
+                (rlvGetSettingBOOL(RLV_SETTING_ENABLEWEAR, TRUE)) && // "Enable Wear" is toggled on and...
+                (!gRlvHandler.hasBehaviour(RLV_BHVR_DEFAULTWEAR)) && // not restricted and...
+                (!gRlvHandler.hasBehaviour(RLV_BHVR_ADDATTACH));         // we have attach points we can attach to [see RlvHandler::onAddRemAttach()]
+}
+
+#ifndef RLV_WORKAROUND_REZMULTIPLEATTACH
+BOOL RlvSettings::getEnableSharedWear()
+{
+        // NOTE-RLVa: it's not proper but some code relies on the fact that getEnableSharedWear() returns FALSE if any attach point is locked
+        return
+                (rlvGetSettingBOOL(RLV_SETTING_ENABLESHAREDWEAR, FALSE)) && // "Enable Shared Wear" is toggled on and...
+                (!gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY));                       // no attachment point is non-attachable or non-detachable
+}
+#endif // RLV_WORKAROUND_REZMULTIPLEATTACH
+
+#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
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Added: RLVa-1.1.0i
+bool RlvSettings::onChangedSettingBOOL(const LLSD& newvalue, BOOL* pfSetting)
+{
+        if (pfSetting)
+                *pfSetting = newvalue.asBoolean();
+        return true;
+}
+
+// ============================================================================
+// RlvStrings
+//
+
+std::vector<std::string> RlvStrings::m_Anonyms;
+std::map<std::string, std::string> RlvStrings::m_StringMap;
+#ifdef RLV_EXTENSION_NOTIFY_BEHAVIOUR
+std::map<ERlvBehaviour, std::string> RlvStrings::m_BhvrAddMap;
+std::map<ERlvBehaviour, std::string> RlvStrings::m_BhvrRemMap;
+#endif // RLV_EXTENSION_NOTIFY_BEHAVIOUR
+
+// Checked: 2009-12-05 (RLVa-1.1.0h) | Added: RLVa-1.1.0h
+void RlvStrings::initClass()
+{
+        static bool fInitialized = false;
+        if (!fInitialized)
+        {
+                LLXMLNodePtr xmlRoot;
+                if ( (!LLUICtrlFactory::getLayeredXMLNode("rlva_strings.xml", xmlRoot)) || (xmlRoot.isNull()) || (!xmlRoot->hasName("rlva_strings")) )
+                {
+                        llerrs << "Problem reading RLVa string XML file" << llendl;
+                        return;
+                }
+
+                for (LLXMLNode* pNode = xmlRoot->getFirstChild(); pNode != NULL; pNode = pNode->getNextSibling())
+                {
+                        if (pNode->hasName("strings"))
+                        {
+                                std::string strName;
+                                for (LLXMLNode* pStringNode = pNode->getFirstChild(); pStringNode != NULL; pStringNode = pStringNode->getNextSibling())
+                                {
+                                        if ( (!pStringNode->hasName("string")) || (!pStringNode->getAttributeString("name", strName)) )
+                                                continue;
+                                        m_StringMap[strName] = pStringNode->getTextContents();
+                                }
+                        }
+                        else if (pNode->hasName("anonyms"))
+                        {
+                                for (LLXMLNode* pAnonymNode = pNode->getFirstChild(); pAnonymNode != NULL; pAnonymNode = pAnonymNode->getNextSibling())
+                                {
+                                        if (!pAnonymNode->hasName("anonym"))
+                                                continue;
+                                        m_Anonyms.push_back(pAnonymNode->getTextContents());
+                                }
+                        }
+                        #ifdef RLV_EXTENSION_NOTIFY_BEHAVIOUR
+                        else if (pNode->hasName("behaviour-notifications"))
+                        {
+                                std::string strBhvr, strType; ERlvBehaviour eBhvr;
+                                for (LLXMLNode* pNotifyNode = pNode->getFirstChild(); pNotifyNode != NULL; pNotifyNode = pNotifyNode->getNextSibling())
+                                {
+                                        if ( (!pNotifyNode->hasName("notification")) || (!pNotifyNode->getAttributeString("type", strType)) ||
+                                                 (!pNotifyNode->getAttributeString("behaviour", strBhvr)) ||
+                                                 ((eBhvr = RlvCommand::getBehaviourFromString(strBhvr)) == RLV_BHVR_UNKNOWN) )
+                                        {
+                                                continue;
+                                        }
+                                        if ("add" == strType)
+                                                m_BhvrAddMap.insert(std::pair<ERlvBehaviour, std::string>(eBhvr, pNotifyNode->getTextContents()));
+                                        else if ("rem" == strType)
+                                                m_BhvrRemMap.insert(std::pair<ERlvBehaviour, std::string>(eBhvr, pNotifyNode->getTextContents()));
+                                }
+                        }
+                        #endif // RLV_EXTENSION_NOTIFY_BEHAVIOUR
+                }
+
+                if ( (m_StringMap.empty()) || (m_Anonyms.empty()) )
+                {
+                        llerrs << "Problem parsing RLVa string XML file" << llendl;
+                        return;
+                }
+
+                fInitialized = true;
+        }
+}
+
+// Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
+const std::string& RlvStrings::getAnonym(const std::string& strName)
+{
+        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 m_Anonyms[nHash % m_Anonyms.size()];
+}
+
+#ifdef RLV_EXTENSION_NOTIFY_BEHAVIOUR
+// Checked: 2009-12-05 (RLVa-1.1.0h) | Added: RLVa-1.1.0h
+const std::string& RlvStrings::getBehaviourNotificationString(ERlvBehaviour eBhvr, ERlvParamType eType)
+{
+        if (RLV_TYPE_ADD == eType)
+        {
+                std::map<ERlvBehaviour, std::string>::const_iterator itString = m_BhvrAddMap.find(eBhvr);
+                return (itString != m_BhvrAddMap.end()) ? itString->second : LLStringUtil::null;
+        }
+        else if (RLV_TYPE_REMOVE == eType)
+        {
+                std::map<ERlvBehaviour, std::string>::const_iterator itString = m_BhvrRemMap.find(eBhvr);
+                return (itString != m_BhvrRemMap.end()) ? itString->second : LLStringUtil::null;
+        }
+        return LLStringUtil::null;
+}
+#endif // RLV_EXTENSION_NOTIFY_BEHAVIOUR
+
+// Checked: 2009-11-11 (RLVa-1.1.0a) | Added: RLVa-1.1.0a
+const std::string& RlvStrings::getString(const std::string& strStringName)
+{
+        static const std::string strMissing = "(Missing RLVa string)";
+        std::map<std::string, std::string>::const_iterator itString = m_StringMap.find(strStringName);
+        return (itString != m_StringMap.end()) ? itString->second : strMissing;
+}
+
+// Checked: 2009-11-25 (RLVa-1.1.0f) | Added: RLVa-1.1.0f
+const char* RlvStrings::getStringFromReturnCode(ERlvCmdRet eRet)
+{
+        // TODO-RLVa: [2009-11-25] clean this up along with the calling code in process_chat_from_simulator() once we're happy with the output
+        switch (eRet)
+        {
+                case RLV_RET_SUCCESS_UNSET:
+                        return "unset";
+                case RLV_RET_SUCCESS_DUPLICATE:
+                        return "duplicate";
+                case RLV_RET_FAILED_SYNTAX:
+                        return "syntax error";
+                case RLV_RET_FAILED_OPTION:
+                        return "invalid option";
+                case RLV_RET_FAILED_PARAM:
+                        return "invalid param";
+                case RLV_RET_FAILED_LOCK:
+                        return "locked command";
+                case RLV_RET_FAILED_DISABLED:
+                        return "disabled command";
+                case RLV_RET_FAILED_UNKNOWN:
+                        return "unknown command";
+                case RLV_RET_FAILED_NOSHAREDROOT:
+                        return "missing #RLV";
+                // The following are identified by the chat verb
+                case RLV_RET_RETAINED:
+                case RLV_RET_SUCCESS:
+                case RLV_RET_FAILED:
+                        break;
+                // The following shouldn't occur
+                case RLV_RET_UNKNOWN:
+                default:
+                        RLV_ASSERT(false);
+                        break;
+        };
+        return NULL;
+}
+
+// Checked: 2010-03-27 (RLVa-1.2.0b) | Modified: RLVa-1.2.0b
+std::string RlvStrings::getVersion(bool fLegacy /*=false*/)
+{
+        return llformat("%s viewer v%d.%d.%d (%s %d.%d.%d.%d - RLVa %d.%d.%d)",
+                ( (!fLegacy) ? "RestrainedLove" : "RestrainedLife" ),
+                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: 2010-04-18 (RLVa-1.2.0e) | Added: RLVa-1.2.0e
+std::string RlvStrings::getVersionAbout()
+{
+        return llformat("RLV v%d.%d.%d / RLVa v%d.%d.%d%c" ,
+                RLV_VERSION_MAJOR, RLV_VERSION_MINOR, RLV_VERSION_PATCH,
+                RLVa_VERSION_MAJOR, RLVa_VERSION_MINOR, RLVa_VERSION_PATCH, 'a' + RLVa_VERSION_BUILD);
+}
+
+// Checked: 2009-11-11 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
+std::string RlvStrings::getVersionNum()
+{
+        return llformat("%d%02d%02d%02d", RLV_VERSION_MAJOR, RLV_VERSION_MINOR, RLV_VERSION_PATCH, RLV_VERSION_BUILD);
+}
+
+// ============================================================================
+// Generic menu enablers
+//
+
+bool RlvEnableIfNot::handleEvent(LLPointer<LLEvent>, const LLSD& userdata)
+{
+        bool fEnable = true;
+        if (rlv_handler_t::isEnabled())
+        {
+                ERlvBehaviour eBhvr = RlvCommand::getBehaviourFromString(userdata["data"].asString());
+                fEnable = (eBhvr != RLV_BHVR_UNKNOWN) ? !gRlvHandler.hasBehaviour(eBhvr) : true;
+        }
+        gMenuHolder->findControl(userdata["control"].asString())->setValue(fEnable);
+        return true;
+}
+
+// ============================================================================
+// Selection functors
+//
+
+// Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0f
+bool RlvSelectHasLockedAttach::apply(LLSelectNode* pNode)
+{
+        return (pNode->getObject()) ? gRlvHandler.isLockedAttachment(pNode->getObject(), m_eLock) : false;
+}
+
+// Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-0.2.0f
+bool RlvSelectIsOwnedByOrGroupOwned::apply(LLSelectNode* pNode)
+{
+        return (pNode->mPermissions->isGroupOwned()) || (pNode->mPermissions->getOwner() == m_idAgent);
+}
+
+// Checked: 2009-05-31 (RLVa-0.2.0f) | Modified: RLVa-0.2.0f
+bool RlvSelectIsSittingOn::apply(LLSelectNode* pNode)
+{
+        return (pNode->getObject()) && (pNode->getObject()->getRootEdit() == m_pObject);
+}
+
+// ============================================================================
+// Various public helper functions
+//
+
+// Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
+BOOL rlvAttachToEnabler(void* pParam)
+{
+        // Visually disable an option on the "Attach to (HUD)" submenu if:
+        //   - the attachment point is locked non-detachable with an object attached
+        //   - the attachment point is locked non-attachable
+        return (pParam != NULL) &&
+                (!gRlvHandler.isLockedAttachment(((LLViewerJointAttachment*)pParam)->getObject(), RLV_LOCK_REMOVE)) &&
+                (!gRlvHandler.isLockedAttachment((LLViewerJointAttachment*)pParam, RLV_LOCK_ADD));
+}
+
+// Checked: 2009-10-04 (RLVa-1.0.4b) | Modified: RLVa-1.0.4b
+BOOL rlvEnableWearEnabler(void* pParam)
+{
+        // Visually disable the "Enable Wear" option when restricted from toggling it
+        return (!gRlvHandler.hasBehaviour(RLV_BHVR_DEFAULTWEAR));
+}
+
+// Checked: 2009-11-15 (RLVa-1.1.0c) | Added: RLVa-1.1.0c
+BOOL rlvEnableSharedWearEnabler(void* pParam)
+{
+        // Visually disable the "Enable Shared Wear" option when at least one attachment is non-detachable
+        return (!gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE));
+}
+
+// ============================================================================
diff --git a/linden/indra/newview/rlvcommon.h b/linden/indra/newview/rlvcommon.h
new file mode 100644
index 0000000..315b97a
--- /dev/null
+++ b/linden/indra/newview/rlvcommon.h
@@ -0,0 +1,199 @@
+/**
+ *
+ * Copyright (c) 2009-2010, Kitty Barnett
+ *
+ * The source code in this file is provided to you under the terms of the
+ * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * 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.
+ *
+ */
+
+#ifndef RLV_COMMON_H
+#define RLV_COMMON_H
+
+#include "llmemberlistener.h"
+#include "llselectmgr.h"
+#include "llviewercontrol.h"
+#include "rlvdefines.h"
+
+// ============================================================================
+// Forward declarations
+//
+
+class RlvCommand;
+
+// ============================================================================
+// RlvNotifications
+//
+
+class RlvNotifications
+{
+public:
+        static void notifyBehaviour(ERlvBehaviour eBhvr, ERlvParamType eType);
+        static void notifyBlockedViewNote()    { notifyBlockedViewXXX(LLAssetType::lookup(LLAssetType::AT_NOTECARD)); }
+        static void notifyBlockedViewScript()  { notifyBlockedViewXXX(LLAssetType::lookup(LLAssetType::AT_SCRIPT)); }
+        static void notifyBlockedViewTexture() { notifyBlockedViewXXX(LLAssetType::lookup(LLAssetType::AT_TEXTURE)); }
+
+        static void warnGiveToRLV();
+protected:
+        static void notifyBlockedViewXXX(const char* pstrAssetType);
+
+        static void onGiveToRLVConfirmation(const LLSD& notification, const LLSD& response);
+};
+
+// ============================================================================
+// RlvSettings
+//
+
+inline BOOL rlvGetSettingBOOL(const std::string& strSetting, BOOL fDefault)
+{
+        return (gSavedSettings.controlExists(strSetting)) ? gSavedSettings.getBOOL(strSetting) : fDefault;
+}
+inline BOOL rlvGetPerUserSettingsBOOL(const std::string& strSetting, BOOL fDefault)
+{
+        return (gSavedPerAccountSettings.controlExists(strSetting)) ? gSavedPerAccountSettings.getBOOL(strSetting) : fDefault;
+}
+
+class RlvSettings
+{
+public:
+        static BOOL getDebug()                                  { return rlvGetSettingBOOL(RLV_SETTING_DEBUG, FALSE); }
+        static BOOL getForbidGiveToRLV()                { return rlvGetSettingBOOL(RLV_SETTING_FORBIDGIVETORLV, TRUE); }
+        static BOOL getNoSetEnv()                               { return fNoSetEnv; }
+
+        #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        static BOOL getEnableComposites()               { return fCompositeFolders; }
+        #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        static BOOL getEnableLegacyNaming()             { return fLegacyNaming; }
+        static BOOL getEnableWear();
+        static BOOL getEnableSharedWear();
+        static BOOL getHideLockedLayers()               { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDLAYER, FALSE); }
+        static BOOL getHideLockedAttach()               { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDATTACH, FALSE); }
+        static BOOL getHideLockedInventory()    { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDINVENTORY, FALSE); }
+        static BOOL getSharedInvAutoRename()    { return rlvGetSettingBOOL(RLV_SETTING_SHAREDINVAUTORENAME, TRUE); }
+        static BOOL getShowNameTags()                   { return fShowNameTags; }
+
+        #ifdef RLV_EXTENSION_STARTLOCATION
+        static BOOL getLoginLastLocation()              { return rlvGetPerUserSettingsBOOL(RLV_SETTING_LOGINLASTLOCATION, TRUE); }
+        static void updateLoginLastLocation();
+        #endif // RLV_EXTENSION_STARTLOCATION
+
+        static void initClass();
+protected:
+        static bool onChangedSettingBOOL(const LLSD& newvalue, BOOL* pfSetting);
+
+        #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        static BOOL fCompositeFolders;
+        #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        static BOOL fLegacyNaming;
+        static BOOL fNoSetEnv;
+        static BOOL fShowNameTags;
+};
+
+#ifdef RLV_WORKAROUND_REZMULTIPLEATTACH
+inline BOOL RlvSettings::getEnableSharedWear()
+{
+        return FALSE;
+}
+#endif // RLV_WORKAROUND_REZMULTIPLEATTACH
+
+// ============================================================================
+// RlvStrings
+//
+
+class RlvStrings
+{
+public:
+        static void initClass();
+
+        static const std::string& getAnonym(const std::string& strName);                // @shownames
+        static const std::string& getBehaviourNotificationString(ERlvBehaviour eBhvr, ERlvParamType eType);
+        static const std::string& getString(const std::string& strStringName);
+        static const char*        getStringFromReturnCode(ERlvCmdRet eRet);
+        static std::string        getVersion(bool fLegacy = false);                             // @version
+        static std::string        getVersionAbout();                                                    // Shown in Help / About
+        static std::string        getVersionNum();                                                              // @versionnum
+
+protected:
+        static std::vector<std::string> m_Anonyms;
+        static std::map<std::string, std::string> m_StringMap;
+        #ifdef RLV_EXTENSION_NOTIFY_BEHAVIOUR
+        static std::map<ERlvBehaviour, std::string> m_BhvrAddMap;
+        static std::map<ERlvBehaviour, std::string> m_BhvrRemMap;
+        #endif // RLV_EXTENSION_NOTIFY_BEHAVIOUR
+};
+
+// ============================================================================
+// Extensibility classes
+//
+
+class RlvBehaviourObserver
+{
+public:
+        virtual ~RlvBehaviourObserver() {}
+        virtual void changed(const RlvCommand& rlvCmd, bool fInternal) = 0;
+};
+
+class RlvCommandHandler
+{
+public:
+        virtual ~RlvCommandHandler() {}
+        virtual bool onAddRemCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& cmdRet) { return false; }
+        virtual bool onClearCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& cmdRet)  { return false; }
+        virtual bool onReplyCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& cmdRet)  { return false; }
+        virtual bool onForceCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& cmdRet)  { return false; }
+};
+typedef bool (RlvCommandHandler::*rlvCommandHandler)(const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& cmdRet);
+
+// ============================================================================
+// Generic menu enablers
+//
+
+class RlvEnableIfNot : public LLMemberListener<LLView>
+{
+        bool handleEvent(LLPointer<LLEvent>, const LLSD&);
+};
+
+// ============================================================================
+// Selection functors
+//
+
+struct RlvSelectHasLockedAttach : public LLSelectedNodeFunctor
+{
+        RlvSelectHasLockedAttach(ERlvLockMask eLock) : m_eLock(eLock) {}
+        virtual bool apply(LLSelectNode* pNode);
+protected:
+        ERlvLockMask m_eLock;
+};
+
+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 public helper functions
+//
+
+BOOL rlvAttachToEnabler(void* pParam);
+BOOL rlvEnableWearEnabler(void* pParam);
+BOOL rlvEnableSharedWearEnabler(void* pParam);
+
+// ============================================================================
+
+#endif // RLV_COMMON_H
diff --git a/linden/indra/newview/rlvdefines.h b/linden/indra/newview/rlvdefines.h
index 21d7105..df67a55 100644
--- a/linden/indra/newview/rlvdefines.h
+++ b/linden/indra/newview/rlvdefines.h
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright (c) 2009-2010, Kitty Barnett
+ *
+ * The source code in this file is provided to you under the terms of the
+ * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * 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.
+ *
+ */
+
 #ifndef RLV_DEFINES_H
 #define RLV_DEFINES_H
 
@@ -10,8 +26,7 @@
 // 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"
+// Provides access to "advanced" features through the RLVa debug menu
 #define RLV_EXTENSION_FLOATER_RESTRICTIONS      // Enables the Advanced / RLVa / Restrictions... floater
 #define RLV_EXTENSION_HIDELOCKED                        // "Hide locked layers", "Hide locked attachments" and "Hide locked inventory"
 
@@ -19,41 +34,56 @@
 #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_FORCEWEAR_GESTURES        // @attach*/detach* commands also (de)activate gestures
+#define RLV_EXTENSION_GIVETORLV_A2A                     // Allow "Give to #RLV" on avatar-to-avatar inventory offers
+#define RLV_EXTENSION_NOTIFY_BEHAVIOUR          // Provides the option to show a customizable notification whenever a behaviour gets (un)set
 #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
+//#define RLV_EXPERIMENTAL_CMDS                         // Enables/disables experimental commands en masse
 
 // Experimental features
 #ifdef RLV_EXPERIMENTAL
         // Stable (will mature to RLV_EXTENSION_XXX in next release if no bugs are found)
-        #define RLV_EXPERIMENTAL_FARTOUCH_FEEDBACK              // Enables "cleaner" UI responses when fartouch blocks something
 
         // Under testing (stable, but requires further testing - safe for public release but may be quirky)
-        #define RLV_EXPERIMENTAL_FIRSTUSE                               // Enables a number of "first use" popups
+        #define RLV_EXPERIMENTAL_COMPOSITEFOLDERS
 
         // Under development (don't include in public release)
         #if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
+                #define RLV_EXPERIMENTAL_FIRSTUSE                               // Enables a number of "first use" popups
         #endif // LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
 #endif // RLV_EXPERIMENTAL
 
+// Experimental commands (not part of the RLV API spec, disabled on public releases)
+#ifdef RLV_EXPERIMENTAL_CMDS
+        #define RLV_EXTENSION_CMD_ALLOWIDLE             // Forces "Away" status when idle (effect is the same as setting AllowIdleAFK to TRUE)
+        #define RLV_EXTENSION_CMD_GETXXXNAMES   // @get[add|rem]attachnames:<option>=<channel> and @get[add|rem]outfitnames=<channel>
+        #define RLV_EXTENSION_CMD_INTERACT              // @interact=n
+        #define RLV_EXTENSION_CMD_TOUCHXXX              // @touch:uuid=n|y, @touchworld[:<uuid>]=n|y, @touchattach[:<uuid>]=n|y, @touchud[:<uuid>]=n|y
+#endif // RLV_EXPERIMENTAL_CMDS
+
+// Workarounds
+#define RLV_WORKAROUND_REZMULTIPLEATTACH        // See http://jira.secondlife.com/browse/SVC-5383 ; disables "Shared Wear"
+
 // ============================================================================
 // Defines
 //
 
 // Version of the specifcation we support
 const S32 RLV_VERSION_MAJOR = 1;
-const S32 RLV_VERSION_MINOR = 22;
+const S32 RLV_VERSION_MINOR = 23;
 const S32 RLV_VERSION_PATCH = 0;
 const S32 RLV_VERSION_BUILD = 0;
 
 // Implementation version
 const S32 RLVa_VERSION_MAJOR = 1;
-const S32 RLVa_VERSION_MINOR = 0;
-const S32 RLVa_VERSION_PATCH = 5;
-const S32 RLVa_VERSION_BUILD = 4;
+const S32 RLVa_VERSION_MINOR = 1;
+const S32 RLVa_VERSION_PATCH = 2;
+const S32 RLVa_VERSION_BUILD = 1;
 
 // 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, 23, 4)
+#define RLV_TARGET                                      RLV_MAKE_TARGET(1, 23, 5)
 
 // Defining these makes it easier if we ever need to change our tag
 #define RLV_WARNS       LL_WARNS("RLV")
@@ -92,75 +122,88 @@ const S32 RLVa_VERSION_BUILD = 4;
 // Enumeration declarations
 //
 
-// NOTE: any changes to this enumeration should be reflected in initLookupTable()
+// NOTE: any changes to this enumeration should be reflected in RlvCommand::initLookupTable()
 enum ERlvBehaviour {
-        RLV_BHVR_VERSION = 0,                   // "version"
-        RLV_BHVR_DETACH,                                // "detach"
-        RLV_BHVR_SENDCHAT,                              // "sendchat"
+        RLV_BHVR_DETACH = 0,                    // "detach"
+        RLV_BHVR_ATTACH,                                // "attach"
+        RLV_BHVR_ADDATTACH,                             // "addattach"
+        RLV_BHVR_REMATTACH,                             // "remattach"
+        RLV_BHVR_ADDOUTFIT,                             // "addoutfit"
+        RLV_BHVR_REMOUTFIT,                             // "remoutfit"
         RLV_BHVR_EMOTE,                                 // "emote"
-        RLV_BHVR_CHATSHOUT,                             // "chatshout"
-        RLV_BHVR_CHATNORMAL,                    // "chatnormal"
-        RLV_BHVR_CHATWHISPER,                   // "chatwhisper"
+        RLV_BHVR_SENDCHAT,                              // "sendchat"
+        RLV_BHVR_RECVCHAT,                              // "recvchat"
+        RLV_BHVR_RECVEMOTE,                             // "recvemote"
         RLV_BHVR_REDIRCHAT,                             // "redirchat"
         RLV_BHVR_REDIREMOTE,                    // "rediremote"
+        RLV_BHVR_CHATWHISPER,                   // "chatwhisper"
+        RLV_BHVR_CHATNORMAL,                    // "chatnormal"
+        RLV_BHVR_CHATSHOUT,                             // "chatshout"
+        RLV_BHVR_SENDCHANNEL,                   // "sendchannel"
         RLV_BHVR_SENDIM,                                // "sendim"
-        RLV_BHVR_RECVCHAT,                              // "recvchat"
-        RLV_BHVR_RECVEMOTE,                             // "recvemote"
         RLV_BHVR_RECVIM,                                // "recvim"
+        RLV_BHVR_PERMISSIVE,                    // "permissive"
+        RLV_BHVR_NOTIFY,                                // "notify"
+        RLV_BHVR_SHOWINV,                               // "showinv"
+        RLV_BHVR_SHOWMINIMAP,                   // "showminimap"
+        RLV_BHVR_SHOWWORLDMAP,                  // "showworldmap"
+        RLV_BHVR_SHOWLOC,                               // "showloc"
+        RLV_BHVR_SHOWNAMES,                             // "shownames"
+        RLV_BHVR_SHOWHOVERTEXT,                 // "showhovertext"
+        RLV_BHVR_SHOWHOVERTEXTHUD,              // "showhovertexthud"
+        RLV_BHVR_SHOWHOVERTEXTWORLD,    // "showhovertextworld"
+        RLV_BHVR_SHOWHOVERTEXTALL,              // "showhovertextall"
         RLV_BHVR_TPLM,                                  // "tplm"
         RLV_BHVR_TPLOC,                                 // "tploc"
         RLV_BHVR_TPLURE,                                // "tplure"
-        RLV_BHVR_SITTP,                                 // "sittp"
+        RLV_BHVR_VIEWNOTE,                              // "viewnote"
+        RLV_BHVR_VIEWSCRIPT,                    // "viewscript"
+        RLV_BHVR_VIEWTEXTURE,                   // "viewtexture"
+        RLV_BHVR_ACCEPTPERMISSION,              // "acceptpermission"
+        RLV_BHVR_ACCEPTTP,                              // "accepttp"
+        RLV_BHVR_DEFAULTWEAR,                   // "defaultwear"
+        RLV_BHVR_ALLOWIDLE,                             // "allowidle"
         RLV_BHVR_EDIT,                                  // "edit"
         RLV_BHVR_REZ,                                   // "rez"
-        RLV_BHVR_ADDOUTFIT,                             // "addoutfit"
-        RLV_BHVR_REMOUTFIT,                             // "remoutfit"
-        RLV_BHVR_GETOUTFIT,                             // "getoutfit"
-        RLV_BHVR_ADDATTACH,                             // "addattach"
-        RLV_BHVR_REMATTACH,                             // "remattach"
-        RLV_BHVR_GETATTACH,                             // "getattach"
-        RLV_BHVR_SHOWINV,                               // "showinv"
-        RLV_BHVR_VIEWNOTE,                              // "viewnote"
+        RLV_BHVR_FARTOUCH,                              // "fartouch"
+        RLV_BHVR_INTERACT,                              // "interact"
+        RLV_BHVR_TOUCH,                                 // "touch"
+        RLV_BHVR_TOUCHATTACH,                   // "touchattach"
+        RLV_BHVR_TOUCHHUD,                              // "touchhud"
+        RLV_BHVR_TOUCHWORLD,                    // "touchworld"
+        RLV_BHVR_FLY,                                   // "fly"
         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_SITTP,                                 // "sittp"
+        RLV_BHVR_SETDEBUG,                              // "setdebug"
+        RLV_BHVR_SETENV,                                // "setenv"
+        RLV_BHVR_DETACHME,                              // "detachme"
+        RLV_BHVR_DETACHTHIS,                    // "detachthis"
         RLV_BHVR_DETACHALL,                             // "detachall"
-        RLV_BHVR_GETPATH,                               // "getpath"
+        RLV_BHVR_DETACHALLTHIS,                 // "detachallthis"
         RLV_BHVR_ATTACHTHIS,                    // "attachthis"
+        RLV_BHVR_ATTACHALL,                             // "attachall"
         RLV_BHVR_ATTACHALLTHIS,                 // "attachallthis"
-        RLV_BHVR_DETACHTHIS,                    // "detachthis"
-        RLV_BHVR_DETACHALLTHIS,                 // "detachallthis"
-        RLV_BHVR_FARTOUCH,                              // "fartouch"
-        RLV_BHVR_SHOWWORLDMAP,                  // "showworldmap"
-        RLV_BHVR_SHOWMINIMAP,                   // "showminimap"
-        RLV_BHVR_SHOWLOC,                               // "showloc"
         RLV_BHVR_TPTO,                                  // "tpto"
-        RLV_BHVR_ACCEPTTP,                              // "accepttp"
-        RLV_BHVR_ACCEPTPERMISSION,              // "acceptpermission"
-        RLV_BHVR_SHOWNAMES,                             // "shownames"
-        RLV_BHVR_FLY,                                   // "fly"
-        RLV_BHVR_GETSITID,                              // "getsitid"
-        RLV_BHVR_SETDEBUG,                              // "setdebug"
-        RLV_BHVR_SETENV,                                // "setenv"
-        RLV_BHVR_DETACHME,                              // "detachme"
-        RLV_BHVR_SHOWHOVERTEXTALL,              // "showhovertextall"
-        RLV_BHVR_SHOWHOVERTEXTWORLD,    // "showhovertextworld"
-        RLV_BHVR_SHOWHOVERTEXTHUD,              // "showhovertexthud"
-        RLV_BHVR_SHOWHOVERTEXT,                 // "showhovertext"
-        RLV_BHVR_NOTIFY,                                // "notify"
-        RLV_BHVR_DEFAULTWEAR,                   // "defaultwear"
+        RLV_BHVR_VERSION,                               // "version"
+        RLV_BHVR_VERSIONNEW,                    // "versionnew"
         RLV_BHVR_VERSIONNUM,                    // "versionnum"
-        RLV_BHVR_PERMISSIVE,                    // "permissive"
-        RLV_BHVR_VIEWSCRIPT,                    // "viewscript"
-        RLV_BHVR_VIEWTEXTURE,                   // "viewtexture"
+        RLV_BHVR_GETATTACH,                             // "getattach"
+        RLV_BHVR_GETATTACHNAMES,                // "getattachnames"
+        RLV_BHVR_GETADDATTACHNAMES,             // "getaddattachnames"
+        RLV_BHVR_GETREMATTACHNAMES,             // "getremattachnames"
+        RLV_BHVR_GETOUTFIT,                             // "getoutfit"
+        RLV_BHVR_GETOUTFITNAMES,                // "getoutfitnames"
+        RLV_BHVR_GETADDOUTFITNAMES,             // "getaddoutfitnames"
+        RLV_BHVR_GETREMOUTFITNAMES,             // "getremoutfitnames"
+        RLV_BHVR_FINDFOLDER,                    // "findfolder"
+        RLV_BHVR_FINDFOLDERS,                   // "findfolders"
+        RLV_BHVR_GETPATH,                               // "getpath"
+        RLV_BHVR_GETINV,                                // "getinv"
+        RLV_BHVR_GETINVWORN,                    // "getinvworn"
+        RLV_BHVR_GETSITID,                              // "getsitid"
+        RLV_BHVR_GETSTATUS,                             // "getstatus"
+        RLV_BHVR_GETSTATUSALL,                  // "getstatusall"
 
         RLV_BHVR_COUNT,
         RLV_BHVR_UNKNOWN
@@ -176,16 +219,19 @@ enum ERlvParamType {
 };
 
 enum ERlvCmdRet {
-        RLV_RET_NOERROR,                                // Command executed succesfully
+        RLV_RET_UNKNOWN     = 0x0000,   // Unknown error (should only be used internally)
         RLV_RET_RETAINED,                               // Command was retained
-        RLV_RET_DISABLED,                               // Command is disabled (by user)
-        RLV_RET_FAILED,                                 // Command failed (general failure)
+        RLV_RET_SUCCESS     = 0x0100,   // Command executed succesfully
+        RLV_RET_SUCCESS_UNSET,                  // Command executed succesfully (RLV_TYPE_REMOVE for an unrestricted behaviour)
+        RLV_RET_SUCCESS_DUPLICATE,              // Command executed succesfully (RLV_TYPE_ADD for an already restricted behaviour)
+        RLV_RET_FAILED      = 0x0200,   // Command failed (general failure)
         RLV_RET_FAILED_SYNTAX,                  // Command failed (syntax error)
-        RLV_RET_FAILED_UNSET,                   // Command failed (unset restriction)
-        RLV_RET_FAILED_DUPLICATE,               // Command failed (duplicate)
         RLV_RET_FAILED_OPTION,                  // Command failed (invalid option)
         RLV_RET_FAILED_PARAM,                   // Command failed (invalid param)
-        RLV_RET_UNKNOWN                                 // Command unkown
+        RLV_RET_FAILED_LOCK,                    // Command failed (command is locked by another object)
+        RLV_RET_FAILED_DISABLED,                // Command failed (command disabled by user)
+        RLV_RET_FAILED_UNKNOWN,                 // Command failed (unknown command)
+        RLV_RET_FAILED_NOSHAREDROOT,    // Command failed (missing #RLV)
 };
 
 enum ERlvExceptionCheck {
@@ -200,20 +246,35 @@ enum ERlvLockMask {
         RLV_LOCK_ANY    = RLV_LOCK_ADD | RLV_LOCK_REMOVE
 };
 
+enum ERlvAttachGroupType
+{
+        RLV_ATTACHGROUP_HEAD = 0,
+        RLV_ATTACHGROUP_TORSO,
+        RLV_ATTACHGROUP_ARMS,
+        RLV_ATTACHGROUP_LEGS,
+        RLV_ATTACHGROUP_HUD,
+        RLV_ATTACHGROUP_COUNT,
+        RLV_ATTACHGROUP_INVALID
+};
+
 // ============================================================================
 // Settings
+//
 
-#define RLV_SETTING_MAIN                                "RestrainedLife"
-#define RLV_SETTING_DEBUG                               "RestrainedLifeDebug"
-#define RLV_SETTING_NOSETENV                    "RestrainedLifeNoSetEnv"
-#define RLV_SETTING_FORBIDGIVETORLV             "RestrainedLifeForbidGiveToRLV"
+#define RLV_SETTING_MAIN                                "RestrainedLove"
+#define RLV_SETTING_DEBUG                               "RestrainedLoveDebug"
+#define RLV_SETTING_NOSETENV                    "RestrainedLoveNoSetEnv"
+#define RLV_SETTING_FORBIDGIVETORLV             "RestrainedLoveForbidGiveToRLV"
 
-#define RLV_SETTING_ENABLEWEAR                  "RLVaEnableWear"
+#define RLV_SETTING_ENABLECOMPOSITES    "RLVaEnableCompositeFolders"
 #define RLV_SETTING_ENABLELEGACYNAMING  "RLVaEnableLegacyNaming"
+#define RLV_SETTING_ENABLEWEAR                  "RLVaEnableWear"
+#define RLV_SETTING_ENABLESHAREDWEAR    "RLVaEnableSharedWear"
 #define RLV_SETTING_HIDELOCKEDLAYER             "RLVaHideLockedLayers"
 #define RLV_SETTING_HIDELOCKEDATTACH    "RLVaHideLockedAttachments"
 #define RLV_SETTING_HIDELOCKEDINVENTORY "RLVaHideLockedInventory"
 #define RLV_SETTING_LOGINLASTLOCATION   "RLVaLoginLastLocation"
+#define RLV_SETTING_SHAREDINVAUTORENAME "RLVaSharedInvAutoRename"
 #define RLV_SETTING_SHOWNAMETAGS                "RLVaShowNameTags"
 
 #define RLV_SETTING_FIRSTUSE_PREFIX             "FirstRLV"
@@ -223,5 +284,19 @@ enum ERlvLockMask {
 #define RLV_SETTING_FIRSTUSE_GIVETORLV  RLV_SETTING_FIRSTUSE_PREFIX"GiveToRLV"
 
 // ============================================================================
+// Strings
+//
+
+#define RLV_STRING_HIDDEN                                       "hidden_generic"
+#define RLV_STRING_HIDDEN_PARCEL                        "hidden_parcel"
+#define RLV_STRING_HIDDEN_REGION                        "hidden_region"
+
+#define RLV_STRING_BLOCKED_RECVIM                       "blocked_recvim"
+#define RLV_STRING_BLOCKED_RECVIM_REMOTE        "blocked_recvim_remote"
+#define RLV_STRING_BLOCKED_SENDIM                       "blocked_sendim"
+#define RLV_STRING_BLOCKED_VIEWXXX                      "blocked_viewxxx"
+#define RLV_STRING_BLOCKED_TPLURE_REMOTE        "blocked_tplure_remote"
+
+// ============================================================================
 
 #endif // RLV_DEFINES_H
diff --git a/linden/indra/newview/rlvevent.h b/linden/indra/newview/rlvevent.h
deleted file mode 100644
index a98996f..0000000
--- a/linden/indra/newview/rlvevent.h
+++ /dev/null
@@ -1,227 +0,0 @@
-#ifndef RLV_EVENTEMITTER_H
-#define RLV_EVENTEMITTER_H
-
-#include <algorithm>
-#include <typeinfo>
-#include <list>
-
-#include "lluuid.h"
-
-#include "rlvhelper.h"
-
-// ============================================================================
-// RlvEvent - Passed to observer event handlers (contains the same paramaters as RlvHandler::processXXXCommand)
-//
-
-class RlvEvent
-{
-public:
-        RlvEvent(const LLUUID& uuid, const RlvCommand& rlvCmd) : m_UUID(uuid), m_rlvCmd(rlvCmd) {}
-        virtual ~RlvEvent() {}
-
-        const LLUUID&           getSenderID() const     { return m_UUID; };
-        const RlvCommand&       getCommand() const      { return m_rlvCmd; };
-
-protected:
-        LLUUID     m_UUID;
-        RlvCommand m_rlvCmd;
-};
-
-// ============================================================================
-/*
- * RlvObserver
- * ===========
- * Provides a way to extend the existing command set without changing the main RlvHandler class
- *
- * Steps:
- *   - derive your class from RlvObserver
- *   - override any of the event functions you need
- *   - add it as an observer: gRlvHandler.addObserver(new RlbObserverDerivedClass());
- *   - done
- *
- * Notes:
- *   - as long as you don't call gRlvHandler.remObserver() your class will be cleaned up from
- *     RlvEventEmitter destructor (see below)
- *   - event handlers are called only if RlvHandler didn't handle it so while you can
- *     add a new command @foobar=n, you won't get called for @detach=n
- *   - event handlers are called *after* the command is added so a call to 
- *     RlvHandler::hasBehaviour("foobar") would return TRUE
- *   - return TRUE if you handled the command (won't get passed on to the next observer)
- *     return FALSE if you didn't handle the command (gets passed on to the next observer)
- *
- */
-
-class RlvObserver
-{
-public:
-        virtual ~RlvObserver() {}
-
-        typedef RlvEvent EventType;
-
-        virtual BOOL onAddCommand(const EventType& rlvEvent)    { return FALSE; }
-        virtual BOOL onRemoveCommand(const EventType& rlvEvent) { return FALSE; }
-        virtual BOOL onClearCommand(const EventType& rlvEvent)  { return FALSE; }
-        virtual BOOL onReplyCommand(const EventType& rlvEvent)  { return FALSE; }
-        virtual BOOL onForceCommand(const EventType& rlvEvent)  { return FALSE; }
-};
-
-// ============================================================================
-/*
- * RlvEventEmitter
- * ===============
- * Essentially a slightly modified eventEmitter (see lleventemitter.h)
- *
- * Changes:
- *   - if an event handler returns TRUE then no further observers are notified
- *   - cleans up the (remaining) observers in the destructor
- */
-
-template < class T >
-class RlvEventEmitter
-{
-        public:
-                typedef typename T::EventType EventType;
-                typedef std::list< T* > ObserverContainer;
-                typedef BOOL ( T::*observerMethod )( const EventType& );
-
-        protected:
-                ObserverContainer observers;
-
-        public:
-                RlvEventEmitter() { };
-
-                ~RlvEventEmitter()
-                {
-                        clearObservers();
-                }
-
-                BOOL addObserver ( T* observerIn )
-                {
-                        if ( ! observerIn )
-                                return FALSE;
-
-                        // check if observer already exists
-                        if ( std::find ( observers.begin (), observers.end (), observerIn ) != observers.end () )
-                                return FALSE;
-
-                        // save it
-                        observers.push_back ( observerIn );
-
-                        return true;
-                }
-
-                BOOL remObserver ( T* observerIn )
-                {
-                        if ( ! observerIn )
-                                return FALSE;
-
-                        observers.remove ( observerIn );
-
-                        return TRUE;
-                }
-
-                void clearObservers()
-                {
-                        typename std::list< T* >::iterator iter = observers.begin ();
-
-                        while (iter != observers.end ())
-                        {
-                                delete *iter;
-                                ++iter;
-                        };
-
-                        observers.clear();
-                }
-
-                BOOL update ( observerMethod method, const EventType& msgIn )
-                {
-                        typename std::list< T* >::iterator iter = observers.begin ();
-
-                        BOOL fContinue = TRUE;
-                        while ( (iter != observers.end ()) && (fContinue) )
-                        {
-                                fContinue = !( ( ( *iter )->*method ) ( msgIn ) );
-                                ++iter;
-                        };
-
-                        return !fContinue;
-                }
-};
-
-// ============================================================================
-
-class RlvBehaviourObserver
-{
-public:
-        virtual ~RlvBehaviourObserver() {}
-        virtual void changed(const RlvCommand& rlvCmd, bool fInternal) = 0;
-};
-
-// ============================================================================
-
-class RlvBehaviourNotifyObserver : public RlvBehaviourObserver
-{
-public:
-        virtual ~RlvBehaviourNotifyObserver() { }
-
-        void changed(const RlvCommand& rlvCmd, bool fInternal)
-        {
-                if (fInternal)
-                        return;
-
-                std::string strCmd = rlvCmd.asString(), strNotify; ERlvParamType eCmdType = rlvCmd.getParamType();
-                if ( (RLV_TYPE_ADD == eCmdType) || (RLV_TYPE_REMOVE == eCmdType) )
-                        strNotify = llformat("/%s=%s", strCmd.c_str(), rlvCmd.getParam().c_str());
-                else if (RLV_TYPE_CLEAR == eCmdType)
-                        strNotify = llformat("/%s", strCmd.c_str());
-                else
-                        return;
-
-                for (std::multimap<LLUUID, notifyData>::const_iterator itNotify = m_Notifications.begin(); 
-                                itNotify != m_Notifications.end(); ++itNotify)
-                {
-                        if ( (itNotify->second.strFilter.empty()) || (std::string::npos != strCmd.find(itNotify->second.strFilter)) )
-                                rlvSendChatReply(itNotify->second.nChannel, strNotify);
-                }
-        }
-
-        void addNotify(const LLUUID& idObj, S32 nChannel, const std::string& strFilter)
-        {
-                m_Notifications.insert(std::pair<LLUUID, notifyData>(idObj, notifyData(nChannel, strFilter)));
-        }
-
-        void clearNotify(const LLUUID& idObj)
-        {
-                m_Notifications.erase(idObj);
-        }
-
-        bool hasNotify()
-        {
-                return (m_Notifications.size() != 0);
-        }
-
-        void removeNotify(const LLUUID& idObj, S32 nChannel, const std::string& strFilter)
-        {
-                for (std::multimap<LLUUID, notifyData>::iterator itNotify = m_Notifications.lower_bound(idObj), 
-                                endNotify = m_Notifications.upper_bound(idObj); itNotify != endNotify; ++itNotify)
-                {
-                        if ( (itNotify->second.nChannel == nChannel) && (itNotify->second.strFilter == strFilter) )
-                        {
-                                m_Notifications.erase(itNotify);
-                                break;
-                        }
-                }
-        }
-protected:
-        struct notifyData
-        {
-                S32         nChannel;
-                std::string strFilter;
-                notifyData(S32 channel, const std::string& filter) : nChannel(channel), strFilter(filter) {}
-        };
-        std::multimap<LLUUID, notifyData> m_Notifications;
-};
-
-// ============================================================================
-
-#endif // RLV_EVENTEMITTER_H
diff --git a/linden/indra/newview/rlvextensions.cpp b/linden/indra/newview/rlvextensions.cpp
index f31c62e..c20c077 100644
--- a/linden/indra/newview/rlvextensions.cpp
+++ b/linden/indra/newview/rlvextensions.cpp
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright (c) 2009-2010, Kitty Barnett
+ *
+ * The source code in this file is provided to you under the terms of the
+ * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * 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.
+ *
+ */
+
 #include "llviewerprecompiledheaders.h"
 #include "llagent.h"
 #include "llfloaterwindlight.h"
@@ -38,19 +54,19 @@ RlvExtGetSet::RlvExtGetSet()
 }
 
 // Checked: 2009-05-17 (RLVa-0.2.0a)
-BOOL RlvExtGetSet::onForceCommand(const RlvEvent& rlvEvent)
+bool RlvExtGetSet::onForceCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& cmdRet)
 {
-        return processCommand(rlvEvent.getSenderID(), rlvEvent.getCommand());
+        return processCommand(idObj, rlvCmd, cmdRet);
 }
 
 // Checked: 2009-05-17 (RLVa-0.2.0a)
-BOOL RlvExtGetSet::onReplyCommand(const EventType& rlvEvent)
+bool RlvExtGetSet::onReplyCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& cmdRet)
 {
-        return processCommand(rlvEvent.getSenderID(), rlvEvent.getCommand());
+        return processCommand(idObj, rlvCmd, cmdRet);
 }
 
-// Checked: 2009-06-18 (RLVa-0.2.1d) | Modified: RLVa-0.2.1d
-BOOL RlvExtGetSet::processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd)
+// Checked: 2009-12-23 (RLVa-1.1.0k) | Modified: RLVa-1.1.0k
+bool RlvExtGetSet::processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& eRet)
 {
         std::string strBehaviour = rlvCmd.getBehaviour(), strGetSet, strSetting;
         int idxSetting = strBehaviour.find('_');
@@ -67,13 +83,14 @@ BOOL RlvExtGetSet::processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd)
                         if ( ("get" == strGetSet) && (RLV_TYPE_REPLY == rlvCmd.getParamType()) )
                         {
                                 rlvSendChatReply(rlvCmd.getParam(), onGetDebug(strSetting));
-                                return TRUE;
+                                eRet = RLV_RET_SUCCESS;
+                                return true;
                         }
                         else if ( ("set" == strGetSet) && (RLV_TYPE_FORCE == rlvCmd.getParamType()) )
                         {
                                 if (!gRlvHandler.hasBehaviourExcept(RLV_BHVR_SETDEBUG, idObj))
-                                        onSetDebug(strSetting, rlvCmd.getOption());
-                                return TRUE;
+                                        eRet = onSetDebug(strSetting, rlvCmd.getOption());
+                                return true;
                         }
                 }
                 else if ("env" == strBehaviour)
@@ -81,13 +98,14 @@ BOOL RlvExtGetSet::processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd)
                         if ( ("get" == strGetSet) && (RLV_TYPE_REPLY == rlvCmd.getParamType()) )
                         {
                                 rlvSendChatReply(rlvCmd.getParam(), onGetEnv(strSetting));
-                                return TRUE;
+                                eRet = RLV_RET_SUCCESS;
+                                return true;
                         }
                         else if ( ("set" == strGetSet) && (RLV_TYPE_FORCE == rlvCmd.getParamType()) )
                         {
                                 if (!gRlvHandler.hasBehaviourExcept(RLV_BHVR_SETENV, idObj))
-                                        onSetEnv(strSetting, rlvCmd.getOption());
-                                return TRUE;
+                                        eRet = onSetEnv(strSetting, rlvCmd.getOption());
+                                return true;
                         }
                 }
         }
@@ -97,7 +115,7 @@ BOOL RlvExtGetSet::processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd)
                 F32 nAngle = 0.0f;
                 if (LLStringUtil::convertToF32(rlvCmd.getOption(), nAngle))
                 {
-                        nAngle += RLV_SETROT_OFFSET;
+                        nAngle = RLV_SETROT_OFFSET - nAngle;
 
                         gAgent.startCameraAnimation();
 
@@ -106,10 +124,13 @@ BOOL RlvExtGetSet::processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd)
                         at.normalize();
                         gAgent.resetAxes(at);
 
-                        return TRUE;
+                        eRet = RLV_RET_SUCCESS;
                 }
+                else
+                        eRet = RLV_RET_FAILED_OPTION;
+                return true;
         }
-        return FALSE;
+        return false;
 }
 
 // Checked: 2009-06-03 (RLVa-0.2.0h) | Modified: RLVa-0.2.0h
@@ -117,6 +138,10 @@ bool RlvExtGetSet::findDebugSetting(std::string& strSetting, S16& flags)
 {
         LLStringUtil::toLower(strSetting);      // Convenience for non-RLV calls
 
+        // HACK-RLVa: bad code but it's just a temporary measure to provide a smooth changeover from the old to the new rebranded settings
+        if ( (strSetting.length() >= 14) && (0 == strSetting.find("restrainedlife")) )
+                strSetting = "restrainedlove" + strSetting.substr(14);
+
         std::string strTemp;
         for (std::map<std::string, S16>::const_iterator itSetting = m_DbgAllowed.begin(); itSetting != m_DbgAllowed.end(); ++itSetting)
         {
@@ -194,11 +219,12 @@ std::string RlvExtGetSet::onGetPseudoDebug(const std::string& strSetting)
 }
 
 // Checked: 2009-10-10 (RLVa-1.0.4e) | Modified: RLVa-1.0.4e
-void RlvExtGetSet::onSetDebug(std::string strSetting, const std::string& strValue)
+ERlvCmdRet RlvExtGetSet::onSetDebug(std::string strSetting, const std::string& strValue)
 {
-        S16 dbgFlags;
+        S16 dbgFlags; ERlvCmdRet eRet = RLV_RET_FAILED_UNKNOWN;
         if ( (findDebugSetting(strSetting, dbgFlags)) && ((dbgFlags & DBG_WRITE) == DBG_WRITE) )
         {
+                eRet = RLV_RET_FAILED_OPTION;
                 if ((dbgFlags & DBG_PSEUDO) == 0)
                 {
                         LLControlVariable* pSetting = gSavedSettings.getControl(strSetting);
@@ -209,18 +235,28 @@ void RlvExtGetSet::onSetDebug(std::string strSetting, const std::string& strValu
                                 {
                                         case TYPE_U32:
                                                 if (LLStringUtil::convertToU32(strValue, u32Value))
+                                                {
                                                         gSavedSettings.setU32(strSetting, u32Value);
+                                                        eRet = RLV_RET_SUCCESS;
+                                                }
                                                 break;
                                         case TYPE_S32:
                                                 if (LLStringUtil::convertToS32(strValue, s32Value))
+                                                {
                                                         gSavedSettings.setS32(strSetting, s32Value);
+                                                        eRet = RLV_RET_SUCCESS;
+                                                }
                                                 break;
                                         case TYPE_BOOLEAN:
                                                 if (LLStringUtil::convertToBOOL(strValue, fValue))
+                                                {
                                                         gSavedSettings.setBOOL(strSetting, fValue);
+                                                        eRet = RLV_RET_SUCCESS;
+                                                }
                                                 break;
                                         default:
                                                 RLV_ERRS << "Unexpected debug setting type" << LL_ENDL;
+                                                eRet = RLV_RET_FAILED;
                                                 break;
                                 }
 
@@ -230,20 +266,26 @@ void RlvExtGetSet::onSetDebug(std::string strSetting, const std::string& strValu
                 }
                 else
                 {
-                        onSetPseudoDebug(strSetting, strValue);
+                        eRet = onSetPseudoDebug(strSetting, strValue);
                 }
         }
+        return eRet;
 }
 
 // Checked: 2009-10-10 (RLVa-1.0.4e) | Modified: RLVa-1.0.4e
-void RlvExtGetSet::onSetPseudoDebug(const std::string& strSetting, const std::string& strValue)
+ERlvCmdRet RlvExtGetSet::onSetPseudoDebug(const std::string& strSetting, const std::string& strValue)
 {
+        ERlvCmdRet eRet = RLV_RET_FAILED_OPTION;
         if ("AvatarSex" == strSetting)
         {
                 BOOL fValue;
                 if (LLStringUtil::convertToBOOL(strValue, fValue))
+                {
                         m_PseudoDebug[strSetting] = strValue;
+                        eRet = RLV_RET_SUCCESS;
+                }
         }
+        return eRet;
 }
 
 // Checked: 2009-09-16 (RLVa-1.0.3c) | Modified: RLVa-1.0.3c
@@ -322,7 +364,7 @@ std::string RlvExtGetSet::onGetEnv(std::string strSetting)
 }
 
 // Checked: 2009-09-16 (RLVa-1.0.3c) | Modified: RLVa-1.0.3c
-void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
+ERlvCmdRet RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
 {
         // HACK: see RlvExtGetSet::onGetEnv
         if (!LLFloaterWindLight::isOpen())
@@ -337,8 +379,8 @@ void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
 
         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;
+        if ( (RlvSettings::getNoSetEnv()) || ( (!LLStringUtil::convertToF32(strValue, nValue)) && ("preset" != strSetting) ))
+                return RLV_RET_FAILED_OPTION;
 
         // 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;
@@ -357,19 +399,19 @@ void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
                         pWLParams->mAnimator.mIsRunning = true;
                         pWLParams->mAnimator.mUseLindenTime = true;     
                 }
-                return;
+                return RLV_RET_SUCCESS;
         }
         // See LLFloaterWindLight::onChangePresetName()
         else if ("preset" == strSetting)
         {
                 pWLParams->loadPreset(strValue, true);
-                return;
+                return RLV_RET_SUCCESS;
         }
         // See LLFloaterWindLight::onStarAlphaMoved
         else if ("starbrightness" == strSetting)
         {
                 pWLParams->mCurParams.setStarBrightness(nValue);
-                return;
+                return RLV_RET_SUCCESS;
         }
         // See LLFloaterWindLight::onGlowRMoved() / LLFloaterWindLight::onGlowBMoved()
         else if ( ("sunglowfocus" == strSetting) || ("sunglowsize" == strSetting) )
@@ -382,7 +424,7 @@ void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
 
                 pColour->update(pWLParams->mCurParams);
                 pWLParams->propagateParameters();
-                return;
+                return RLV_RET_SUCCESS;
         }
         // See LLFloaterWindLight::onSunMoved()
         else if ( ("eastangle" == strSetting) || ("sunmoonposition" == strSetting) )    
@@ -401,18 +443,18 @@ void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
 
                 pColour->update(pWLParams->mCurParams);
                 pWLParams->propagateParameters();
-                return;
+                return RLV_RET_SUCCESS;
         }
         // See LLFloaterWindLight::onCloudScrollXMoved() / LLFloaterWindLight::onCloudScrollYMoved() 
         else if ("cloudscrollx" == strSetting)
         {
                 pWLParams->mCurParams.setCloudScrollX(nValue + 10.0f);
-                return;
+                return RLV_RET_SUCCESS;
         }
         else if ("cloudscrolly" == strSetting)
         {
                 pWLParams->mCurParams.setCloudScrollY(nValue + 10.0f);
-                return;
+                return RLV_RET_SUCCESS;
         }
         // See LLFloaterWindLight::onFloatControlMoved()
         else if ("cloudcoverage" == strSetting)                 pFloat = &pWLParams->mCloudCoverage;
@@ -430,14 +472,14 @@ void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
                 pFloat->x = nValue / pFloat->mult;
                 pFloat->update(pWLParams->mCurParams);
                 pWLParams->propagateParameters();
-                return;
+                return RLV_RET_SUCCESS;
         } 
         else if (pColour)
         {
                 pColour->r = nValue;
                 pColour->update(pWLParams->mCurParams);
                 pWLParams->propagateParameters();
-                return;
+                return RLV_RET_SUCCESS;
         }
 
         // RGBI settings
@@ -466,7 +508,7 @@ void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
                         if ('i' == ch)                                                                  // (See: LLFloaterWindLight::onColorControlIMoved)
                         {
                                 if (!pColour->hasSliderName)
-                                        return;
+                                        return RLV_RET_FAILED_UNKNOWN;
 
                                 F32 curMax = llmax(pColour->r, pColour->g, pColour->b);
                                 if ( (0.0f == nValue) || (0.0f == curMax) )
@@ -490,8 +532,11 @@ void RlvExtGetSet::onSetEnv(std::string strSetting, const std::string& strValue)
 
                         pColour->update(pWLParams->mCurParams);
                         pWLParams->propagateParameters();
+
+                        return RLV_RET_SUCCESS;
                 }
         }
+        return RLV_RET_FAILED_UNKNOWN;
 }
 
 // ============================================================================
diff --git a/linden/indra/newview/rlvextensions.h b/linden/indra/newview/rlvextensions.h
index 5720ba0..3e3e75e 100644
--- a/linden/indra/newview/rlvextensions.h
+++ b/linden/indra/newview/rlvextensions.h
@@ -1,8 +1,23 @@
+/**
+ *
+ * Copyright (c) 2009-2010, Kitty Barnett
+ *
+ * The source code in this file is provided to you under the terms of the
+ * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * 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.
+ *
+ */
+
 #ifndef RLV_EXTENSIONS_H
 #define RLV_EXTENSIONS_H
 
-#include "rlvhelper.h"
-#include "rlvevent.h"
+#include "rlvcommon.h"
 
 // ============================================================================
 /*
@@ -12,24 +27,24 @@
  *
  */
 
-class RlvExtGetSet : public RlvObserver
+class RlvExtGetSet : public RlvCommandHandler
 {
 public:
         RlvExtGetSet();
         virtual ~RlvExtGetSet() {}
 
-        virtual BOOL onForceCommand(const RlvEvent& rlvEvent);
-        virtual BOOL onReplyCommand(const RlvEvent& rlvEvent);
+        virtual bool onForceCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& cmdRet);
+        virtual bool onReplyCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& cmdRet);
 protected:
         std::string onGetDebug(std::string strSetting);
         std::string onGetPseudoDebug(const std::string& strSetting);
-        void        onSetDebug(std::string strSetting, const std::string& strValue);
-        void        onSetPseudoDebug(const std::string& strSetting, const std::string& strValue);
+        ERlvCmdRet  onSetDebug(std::string strSetting, const std::string& strValue);
+        ERlvCmdRet  onSetPseudoDebug(const std::string& strSetting, const std::string& strValue);
 
         std::string onGetEnv(std::string strSetting);
-        void        onSetEnv(std::string strSetting, const std::string& strValue);
+        ERlvCmdRet  onSetEnv(std::string strSetting, const std::string& strValue);
 
-        BOOL processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd);
+        bool processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& eRet);
 
 public:
         enum { DBG_READ = 0x01, DBG_WRITE = 0x02, DBG_PERSIST = 0x04, DBG_PSEUDO = 0x08 };
diff --git a/linden/indra/newview/rlvfloaterbehaviour.cpp b/linden/indra/newview/rlvfloaterbehaviour.cpp
index 39fcf12..d34a511 100644
--- a/linden/indra/newview/rlvfloaterbehaviour.cpp
+++ b/linden/indra/newview/rlvfloaterbehaviour.cpp
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright (c) 2009-2010, Kitty Barnett
+ *
+ * The source code in this file is provided to you under the terms of the
+ * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * 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.
+ *
+ */
+
 #include "llviewerprecompiledheaders.h"
 
 #include "llagent.h"
@@ -9,6 +25,7 @@
 #include "llvoavatar.h"
 
 #include "rlvfloaterbehaviour.h"
+#include "rlvhandler.h"
 
 // ============================================================================
 
diff --git a/linden/indra/newview/rlvfloaterbehaviour.h b/linden/indra/newview/rlvfloaterbehaviour.h
index 1410dd5..8cbc94c 100644
--- a/linden/indra/newview/rlvfloaterbehaviour.h
+++ b/linden/indra/newview/rlvfloaterbehaviour.h
@@ -1,8 +1,24 @@
+/**
+ *
+ * Copyright (c) 2009-2010, Kitty Barnett
+ *
+ * The source code in this file is provided to you under the terms of the
+ * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * 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.
+ *
+ */
+
 #ifndef RLV_FLOATER_BEHAVIOUR
 #define RLV_FLOATER_BEHAVIOUR
 
 #include "llfloater.h"
-#include "rlvevent.h"
+#include "rlvcommon.h"
 
 // ============================================================================
 
diff --git a/linden/indra/newview/rlvhandler.cpp b/linden/indra/newview/rlvhandler.cpp
index 18c0836..43a5ba3 100644
--- a/linden/indra/newview/rlvhandler.cpp
+++ b/linden/indra/newview/rlvhandler.cpp
@@ -1,12 +1,26 @@
+/**
+ *
+ * Copyright (c) 2009-2010, Kitty Barnett
+ *
+ * The source code in this file is provided to you under the terms of the
+ * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * 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.
+ *
+ */
+
 #include "llviewerprecompiledheaders.h"
-#include "llagent.h"
+#include "llcallbacklist.h"
 #include "lldrawpoolalpha.h"
-#include "llfirstuse.h"
 #include "llfloaterbeacons.h"
 #include "llfloaterchat.h"
 #include "llfloaterdaycycle.h"
 #include "llfloaterenvsettings.h"
-#include "llfloatergodtools.h"
 #include "llfloaterland.h"
 #include "llfloatermap.h"
 #include "llfloaterregioninfo.h"
@@ -14,22 +28,19 @@
 #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 "llviewerobjectlist.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"
+#include "rlvextensions.h"
 
 // Only defined in llinventorybridge.cpp
 #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
@@ -43,46 +54,51 @@ extern const char* NEW_CATEGORY_NAME;
 //
 
 BOOL RlvHandler::m_fEnabled = FALSE;
-BOOL RlvHandler::fNoSetEnv = FALSE;
-BOOL RlvHandler::fLegacyNaming = FALSE;
-BOOL RlvHandler::m_fFetchStarted = FALSE;
-BOOL RlvHandler::m_fFetchComplete = 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 being", "This being", 
-        "That 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
+// Attachment group helper functions
 //
 
-// Checked: 2009-07-12 (RLVa-1.0.0h) | Added: RLVa-0.2.0e
-inline bool rlvIsWearingItem(const LLInventoryItem* pItem)
+// Has to match the order of ERlvAttachGroupType
+const std::string cstrAttachGroups[RLV_ATTACHGROUP_COUNT] = { "head", "torso", "arms", "legs", "hud" };
+
+// Checked: 2009-10-19 (RLVa-1.1.0e) | Added: RLVa-1.1.0e
+inline ERlvAttachGroupType rlvGetAttachGroupTypeFromIndex(S32 idxGroup)
 {
-        return 
-                ((LLAssetType::AT_OBJECT == pItem->getType()) && (gAgent.getAvatarObject()->isWearingAttachment(pItem->getUUID()))) ||
-                ((LLAssetType::AT_GESTURE == pItem->getType()) && (gGestureManager.isGestureActive(pItem->getUUID()))) ||
-                (gAgent.isWearingItem(pItem->getUUID()));
+        switch (idxGroup)
+        {
+                case 0: // Right Hand
+                case 1: // Right Arm
+                case 3: // Left Arm
+                case 4: // Left Hand
+                        return RLV_ATTACHGROUP_ARMS;
+                case 2: // Head
+                        return RLV_ATTACHGROUP_HEAD;
+                case 5: // Left Leg
+                case 7: // Right Leg
+                        return RLV_ATTACHGROUP_LEGS;
+                case 6: // Torso
+                        return RLV_ATTACHGROUP_TORSO;
+                case 8: // HUD
+                        return RLV_ATTACHGROUP_HUD;
+                default:
+                        return RLV_ATTACHGROUP_INVALID;
+        }
+}
+
+// Checked: 2009-10-19 (RLVa-1.1.0e) | Added: RLVa-1.1.0e
+inline ERlvAttachGroupType rlvGetAttachGroupTypeFromString(const std::string& strGroup)
+{
+        for (int idx = 0; idx < RLV_ATTACHGROUP_COUNT; idx++)
+                if (cstrAttachGroups[idx] == strGroup)
+                        return (ERlvAttachGroupType)idx;
+        return RLV_ATTACHGROUP_INVALID;
 }
 
 // ============================================================================
@@ -116,7 +132,7 @@ static bool rlvParseNotifyOption(const std::string& strOption, S32& nChannel, st
 
 // Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
 RlvHandler::RlvHandler() 
-        : m_fCanCancelTp(true), m_idCurObject(LLUUID::null), m_pCurCommand(NULL), m_pGCTimer(NULL), m_pWLSnapshot(NULL), m_pBhvrNotify(NULL)
+        : m_fCanCancelTp(true), 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);
@@ -137,38 +153,30 @@ RlvHandler::~RlvHandler()
 // 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
+S32 RlvHandler::getAttachPointIndex(const LLInventoryCategory* pFolder, bool /*fStrict*/) const
 {
         if (!pFolder)
-                return NULL;
+                return 0;
 
         // 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);
+        if (RlvSettings::getEnableLegacyNaming())
+                return getAttachPointIndexLegacy(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;
+        return ( (1 == idxMatch) && (RLV_FOLDER_PREFIX_HIDDEN == pFolder->getName().at(0)) ) ? getAttachPointIndex(strAttachPt, true) : 0;
 }
 
 // Checked: 2009-07-29 (RLVa-1.0.1b) | Modified: RLVa-1.0.1b
-LLViewerJointAttachment* RlvHandler::getAttachPoint(const LLInventoryItem* pItem, bool fStrict) const
+S32 RlvHandler::getAttachPointIndex(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;
+                return 0;
 
         // 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)
@@ -177,20 +185,20 @@ LLViewerJointAttachment* RlvHandler::getAttachPoint(const LLInventoryItem* pItem
 
         // 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;
+        S32 idxAttachPt = 0;
         if (pItem->getPermissions().allowModifyBy(gAgent.getID()))
         {
-                pAttachPt = (!strAttachPt.empty()) ? getAttachPoint(strAttachPt, true) : NULL;
-                if (!pAttachPt)
-                        pAttachPt = getAttachPoint(gInventory.getCategory(pItem->getParentUUID()), fStrict);
+                idxAttachPt = (!strAttachPt.empty()) ? getAttachPointIndex(strAttachPt, true) : 0;
+                if (!idxAttachPt)
+                        idxAttachPt = getAttachPointIndex(gInventory.getCategory(pItem->getParentUUID()), fStrict);
         }
         else
         {
-                pAttachPt = getAttachPoint(gInventory.getCategory(pItem->getParentUUID()), fStrict);
-                if ( (!pAttachPt) && (!strAttachPt.empty()) )
-                        pAttachPt = getAttachPoint(strAttachPt, true);
+                idxAttachPt = getAttachPointIndex(gInventory.getCategory(pItem->getParentUUID()), fStrict);
+                if ( (!idxAttachPt) && (!strAttachPt.empty()) )
+                        idxAttachPt = getAttachPointIndex(strAttachPt, true);
         }
-        return pAttachPt;
+        return idxAttachPt;
 }
 
 // Checked: 2009-07-12 (RLVa-1.0.0h) | Added: RLVa-0.2.2a
@@ -210,11 +218,11 @@ S32 RlvHandler::getAttachPointIndex(const LLViewerJointAttachment* pAttachPt) co
 }
 
 // Checked: 2009-07-29 (RLVa-1.0.1b) | Added: RLVa-1.0.1b
-LLViewerJointAttachment* RlvHandler::getAttachPointLegacy(const LLInventoryCategory* pFolder) const
+S32 RlvHandler::getAttachPointIndexLegacy(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;
+                return 0;
 
         // Check for a (...) block *somewhere* in the name
         std::string::size_type idxMatch;
@@ -236,7 +244,7 @@ LLViewerJointAttachment* RlvHandler::getAttachPointLegacy(const LLInventoryCateg
                 if (RLV_FOLDER_PREFIX_HIDDEN == strAttachPt[0])
                         strAttachPt.erase(0, 1);
         }
-        return getAttachPoint(strAttachPt, true);
+        return getAttachPointIndex(strAttachPt, true);
 }
 
 bool RlvHandler::hasLockedHUD() const
@@ -255,16 +263,12 @@ bool RlvHandler::hasLockedHUD() const
         return false;                   // None of our locked attachments is a HUD
 }
 
-// Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
-bool RlvHandler::isLockedAttachment(const LLInventoryItem* pItem, ERlvLockMask eLock) const
-{
-        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
-        return (pItem) && (pAvatar) && (isLockedAttachment(pAvatar->getWornAttachment(pItem->getUUID()), eLock));
-}
-
 // Checked: 2009-10-13 (RLVa-1.0.5b) | Added: RLVa-1.0.5b
-bool RlvHandler::isLockedAttachmentExcept(S32 idxAttachPt, ERlvLockMask eLock, LLViewerObject *pObj) const
+bool RlvHandler::isLockedAttachmentExcept(S32 idxAttachPt, ERlvLockMask eLock, LLViewerObject *pExceptObj) const
 {
+        if (!pExceptObj)
+                return isLockedAttachment(idxAttachPt, eLock);
+
         // Loop over every object that marked the specific attachment point eLock type locked (but ignore pObj and any of its children)
         LLViewerObject* pTempObj;
         if (eLock & RLV_LOCK_REMOVE)
@@ -272,7 +276,7 @@ bool RlvHandler::isLockedAttachmentExcept(S32 idxAttachPt, ERlvLockMask eLock, L
                 for (rlv_attachlock_map_t::const_iterator itAttach = m_AttachRem.lower_bound(idxAttachPt), 
                         endAttach = m_AttachRem.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
                 {
-                        if ( ((pTempObj = gObjectList.findObject(itAttach->second)) == NULL) || (pTempObj->getRootEdit()->getID() != pObj->getID()) )
+                        if ( ((pTempObj = gObjectList.findObject(itAttach->second)) == NULL) || (pTempObj->getRootEdit()->getID() != pExceptObj->getID()) )
                                 return true;
                 }
         }
@@ -281,7 +285,7 @@ bool RlvHandler::isLockedAttachmentExcept(S32 idxAttachPt, ERlvLockMask eLock, L
                 for (rlv_attachlock_map_t::const_iterator itAttach = m_AttachAdd.lower_bound(idxAttachPt), 
                         endAttach = m_AttachAdd.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
                 {
-                        if ( ((pTempObj = gObjectList.findObject(itAttach->second)) == NULL) || (pTempObj->getRootEdit()->getID() != pObj->getID()) )
+                        if ( ((pTempObj = gObjectList.findObject(itAttach->second)) == NULL) || (pTempObj->getRootEdit()->getID() != pExceptObj->getID()) )
                                 return true;
                 }
         }
@@ -310,6 +314,40 @@ void RlvHandler::addAttachmentLock(S32 idxAttachPt, const LLUUID &idRlvObj, ERlv
         }
 }
 
+// Checked: 2010-07-18 (RLVa-1.1.2b) | Added: RLVa-1.1.2a
+void RlvHandler::dumpAttachmentLocks(void*)
+{
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        if (!pAvatar)
+        {
+                RLV_INFOS << "No avatar object to dump attachments for" << RLV_ENDL;
+                return;
+        }
+
+        RLV_INFOS << "Dumping 'remove' locks:" << RLV_ENDL;
+        for (rlv_attachlock_map_t::iterator itAttachPt = gRlvHandler.m_AttachRem.begin();
+                        itAttachPt != gRlvHandler.m_AttachRem.end(); ++itAttachPt)
+        {
+                // Grab the attachment on the attachment point that's locked (if there is one)
+                /*const*/ LLViewerJointAttachment* pAttachPt =
+                        get_if_there(pAvatar->mAttachmentPoints, (S32)itAttachPt->first, (LLViewerJointAttachment*)NULL);
+                /*const*/ LLViewerObject* pAttachObj = (pAttachPt) ? pAttachPt->getObject() : NULL;
+                const LLViewerInventoryItem* pAttachItem = (pAttachPt) ? gInventory.getItem(pAttachPt->getItemID()) : NULL;
+
+                // Grab the locking attachment (if we can)
+                /*const*/ LLViewerObject* pRlvObj = gObjectList.findObject(itAttachPt->second);
+                /*const*/ LLViewerJointAttachment* pRlvAttachPt = (pRlvObj) ? pAvatar->getTargetAttachmentPoint(pRlvObj) : NULL;
+                const LLViewerInventoryItem* pRlvItem = (pRlvAttachPt) ? gInventory.getItem(pRlvAttachPt->getItemID()) : NULL;
+
+                std::string strMsg = llformat("'%s' on %s held by '%s' on %s",
+                        ((pAttachItem) ? pAttachItem->getName().c_str() : ((pAttachObj) ? pAttachObj->getID().asString().c_str() : "(empty)")),
+                        (pAttachPt) ? pAttachPt->getName().c_str() : "(unknown)",
+                        ((pRlvItem) ? pRlvItem->getName().c_str() : ((pRlvObj) ? pRlvObj->getID().asString().c_str() : "(empty)")),
+                        (pRlvAttachPt) ? pRlvAttachPt->getName().c_str() : "(unknown)");
+                RLV_INFOS << strMsg << RLV_ENDL;
+        }
+}
+
 // Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
 void RlvHandler::removeAttachmentLock(S32 idxAttachPt, const LLUUID &idRlvObj, ERlvLockMask eLock)
 {
@@ -344,7 +382,7 @@ void RlvHandler::removeAttachmentLock(S32 idxAttachPt, const LLUUID &idRlvObj, E
 }
 
 #ifdef RLV_EXTENSION_FLAG_NOSTRIP
-        // Checked: 2009-05-26 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+        // Checked: 2009-12-25 (RLVa-1.1.0k) | Modified: RLVa-1.1.0k
         bool RlvHandler::isStrippable(const LLUUID& idItem) const
         {
                 // An item is exempt from @detach or @remoutfit if:
@@ -359,8 +397,13 @@ void RlvHandler::removeAttachmentLock(S32 idxAttachPt, const LLUUID &idRlvObj, E
                                         return false;
 
                                 LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID());
-                                if ( (pFolder) && (std::string::npos != pFolder->getName().find(RLV_FOLDER_FLAG_NOSTRIP)) )
-                                        return false;
+                                while ( (pFolder) && gAgent.getInventoryRootID() != (pFolder->getUUID()) )
+                                {
+                                        if (std::string::npos != pFolder->getName().find(RLV_FOLDER_FLAG_NOSTRIP))
+                                                return false;
+                                        // If the item's parent is a folded folder then we need to check its parent as well
+                                        pFolder = (isFoldedFolder(pFolder, false, true)) ? gInventory.getCategory(pFolder->getParentUUID()) : NULL;
+                                }
                         }
                 }
                 return true;
@@ -419,539 +462,210 @@ bool RlvHandler::isException(ERlvBehaviour eBhvr, const RlvExceptionOption& varO
 // Command processing functions
 //
 
-// Checked: 2009-06-03 (RLVa-0.2.0h)
+// Checked: 2009-11-27 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
 void RlvHandler::addBehaviourObserver(RlvBehaviourObserver* pBhvrObserver)
 {
-        std::list<RlvBehaviourObserver*>::iterator itBhvrObserver = std::find(m_BhvrObservers.begin(), m_BhvrObservers.end(), pBhvrObserver);
-        if (itBhvrObserver == m_BhvrObservers.end())
+        if ( (pBhvrObserver) && (std::find(m_BhvrObservers.begin(), m_BhvrObservers.end(), pBhvrObserver) == m_BhvrObservers.end()) )
                 m_BhvrObservers.push_back(pBhvrObserver);
 }
 
-// Checked: 2009-06-03 (RLVa-0.2.0h)
+// Checked: 2009-11-27 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+void RlvHandler::addCommandHandler(RlvCommandHandler* pCmdHandler)
+{
+        if ( (pCmdHandler) && (std::find(m_CommandHandlers.begin(), m_CommandHandlers.end(), pCmdHandler) == m_CommandHandlers.end()) )
+                m_CommandHandlers.push_back(pCmdHandler);
+}
+
+// Checked: 2009-11-27 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
 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);
+        if (pBhvrObserver)
+                m_BhvrObservers.remove(pBhvrObserver);
+}
+
+// Checked: 2009-11-27 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+void RlvHandler::removeCommandHandler(RlvCommandHandler* pCmdHandler)
+{
+        if (pCmdHandler)
+                m_CommandHandlers.remove(pCmdHandler);
+}
+
+// Checked: 2009-10-26 (RLVa-1.1.0a) | Modified: RLVa-1.1.0a
+void RlvHandler::clearCommandHandlers()
+{
+        std::list<RlvCommandHandler*>::const_iterator itHandler = m_CommandHandlers.begin();
+        while (itHandler != m_CommandHandlers.end())
+        {
+                delete *itHandler;
+                ++itHandler;
+        }
+        m_CommandHandlers.clear();
 }
 
 // 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 != m_BhvrObservers.end(); ++itBhvrObserver)
         {
                 (*itBhvrObserver)->changed(rlvCmd, fInternal);
         }
 }
 
-// Checked:
-BOOL RlvHandler::processCommand(const LLUUID& idObj, const std::string& strCmd, bool fFromObj)
+// Checked: 2009-11-26 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+bool RlvHandler::notifyCommandHandlers(rlvCommandHandler f, const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& eRet, bool fNotifyAll) const
+{
+        std::list<RlvCommandHandler*>::const_iterator itHandler = m_CommandHandlers.begin(); bool fContinue = true; eRet = RLV_RET_UNKNOWN;
+        while ( (itHandler != m_CommandHandlers.end()) && ((fContinue) || (fNotifyAll)) )
+        {
+                ERlvCmdRet eCmdRet = RLV_RET_UNKNOWN;
+                if ((fContinue = !((*itHandler)->*f)(idObj, rlvCmd, eCmdRet)) == false)
+                        eRet = eCmdRet;
+                ++itHandler;
+        }
+        RLV_ASSERT( (fContinue) || (eRet != RLV_RET_UNKNOWN) );
+        return !fContinue;
+}
+
+// Checked: 2009-11-25 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+ERlvCmdRet RlvHandler::processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, bool fFromObj)
 {
         #ifdef RLV_DEBUG
-                RLV_INFOS << "[" << idObj << "]: " << strCmd << LL_ENDL;
+                RLV_INFOS << "[" << idObj << "]: " << rlvCmd.asString() << RLV_ENDL;
         #endif // RLV_DEBUG
 
-        RlvCommand rlvCmd(strCmd);
         if (!rlvCmd.isValid())
         {
                 #ifdef RLV_DEBUG
-                        RLV_INFOS << "\t-> invalid command: " << strCmd << LL_ENDL;
+                        RLV_INFOS << "\t-> invalid syntax" << RLV_ENDL;
                 #endif // RLV_DEBUG
-                return FALSE;
+                return RLV_RET_FAILED_SYNTAX;
         }
 
-        // NOTE: if we pass RlvObject::m_UUID for idObj somewhere and process a @clear then it will point to invalid/cleared memory at the end
-        //       so make sure to *always* pass our private copy to other functions
-        m_pCurCommand = &rlvCmd; m_idCurObject = idObj;
+        // Using a stack for executing commands solves a few problems:
+        //   - if we passed RlvObject::m_UUID for idObj somewhere and process a @clear then idObj points to invalid/cleared memory at the end
+        //   - if command X triggers command Y along the way then getCurrentCommand()/getCurrentObject() still return Y even when finished
+        m_CurCommandStack.push(&rlvCmd); m_CurObjectStack.push(idObj);
+        const LLUUID& idCurObj = m_CurObjectStack.top();
 
-        BOOL fRet = FALSE;
+        ERlvCmdRet eRet = RLV_RET_UNKNOWN;
         switch (rlvCmd.getParamType())
         {
-                case RLV_TYPE_ADD:              // Checked: 2009-06-03 (RLVa-0.2.0h) | Modified: RLVa-0.2.0h
+                case RLV_TYPE_ADD:              // Checked: 2009-11-26 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
                         {
                                 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;
+                                                RLV_INFOS << "\t- " << rlvCmd.getBehaviour() << " is already set by another object => discarding" << RLV_ENDL;
                                         #endif // RLV_DEBUG
+                                        eRet = RLV_RET_FAILED_LOCK;
                                         break;
                                 }
 
-                                rlv_object_map_t::iterator itObj = m_Objects.find(m_idCurObject);
+                                rlv_object_map_t::iterator itObj = m_Objects.find(idCurObj); bool fAdded = false;
                                 if (itObj != m_Objects.end())
                                 {
                                         RlvObject& rlvObj = itObj->second;
-                                        fRet = rlvObj.addCommand(rlvCmd);
+                                        fAdded = rlvObj.addCommand(rlvCmd);
                                 }
                                 else
                                 {
-                                        RlvObject rlvObj(m_idCurObject);
-                                        fRet = rlvObj.addCommand(rlvCmd);
-                                        m_Objects.insert(std::pair<LLUUID, RlvObject>(m_idCurObject, rlvObj));
+                                        RlvObject rlvObj(idCurObj);
+                                        fAdded = rlvObj.addCommand(rlvCmd);
+                                        m_Objects.insert(std::pair<LLUUID, RlvObject>(idCurObj, rlvObj));
                                 }
 
                                 #ifdef RLV_DEBUG
-                                        RLV_INFOS << "\t- " << ( (fRet) ? "adding behaviour" : "skipping duplicate") << LL_ENDL;
+                                        RLV_INFOS << "\t- " << ( (fAdded) ? "adding behaviour" : "skipping duplicate" ) << RLV_ENDL;
                                 #endif // RLV_DEBUG
 
-                                if (fRet) {     // If FALSE then this was a duplicate, there's no need to handle those
+                                if (fAdded) {   // If FALSE then this was a duplicate, there's no need to handle those
                                         if (!m_pGCTimer)
                                                 m_pGCTimer = new RlvGCTimer();
-                                        processAddCommand(m_idCurObject, rlvCmd);
+                                        eRet = processAddRemCommand(idCurObj, rlvCmd);
                                         notifyBehaviourObservers(rlvCmd, !fFromObj);
                                 }
+                                else
+                                {
+                                        eRet = RLV_RET_SUCCESS_DUPLICATE;
+                                }
                         }
                         break;
-                case RLV_TYPE_REMOVE:           // Checked:
+                case RLV_TYPE_REMOVE:           // Checked: 2009-11-26 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
                         {
-                                rlv_object_map_t::iterator itObj = m_Objects.find(m_idCurObject);
+                                rlv_object_map_t::iterator itObj = m_Objects.find(idCurObj); bool fRemoved = false;
                                 if (itObj != m_Objects.end())
-                                        fRet = itObj->second.removeCommand(rlvCmd);
+                                        fRemoved = itObj->second.removeCommand(rlvCmd);
 
                                 #ifdef RLV_DEBUG
-                                        RLV_INFOS << "\t- " << ( (fRet) ? "removing behaviour"
-                                                                            : "skipping remove (unset behaviour or unknown object)") << LL_ENDL;
+                                        RLV_INFOS << "\t- " << ( (fRemoved)     ? "removing behaviour"
+                                                                                                                : "skipping remove (unset behaviour or unknown object)") << RLV_ENDL;
                                 #endif // RLV_DEBUG
 
-                                if (fRet) {     // Don't handle non-sensical removes
-                                        processRemoveCommand(m_idCurObject, rlvCmd);
+                                if (fRemoved) { // Don't handle non-sensical removes
+                                        eRet = processAddRemCommand(idCurObj, rlvCmd);
                                         notifyBehaviourObservers(rlvCmd, !fFromObj);
 
                                         if (0 == itObj->second.m_Commands.size())
                                         {
                                                 #ifdef RLV_DEBUG
-                                                        RLV_INFOS << "\t- command list empty => removing " << m_idCurObject << LL_ENDL;
+                                                        RLV_INFOS << "\t- command list empty => removing " << idCurObj << RLV_ENDL;
                                                 #endif // RLV_DEBUG
                                                 m_Objects.erase(itObj);
                                         }
                                 }
+                                else
+                                {
+                                        eRet = RLV_RET_SUCCESS_UNSET;
+                                }
                         }
                         break;
-                case RLV_TYPE_CLEAR:
-                        fRet = processClearCommand(m_idCurObject, rlvCmd);
+                case RLV_TYPE_CLEAR:            // Checked: 2009-11-25 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+                        eRet = processClearCommand(idCurObj, rlvCmd);
                         notifyBehaviourObservers(rlvCmd, !fFromObj);
                         break;
-                case RLV_TYPE_FORCE:            // Checked:
-                        fRet = processForceCommand(m_idCurObject, rlvCmd);
-                        break;
-                case RLV_TYPE_REPLY:            // Checked:
-                        fRet = processReplyCommand(m_idCurObject, rlvCmd);
+                case RLV_TYPE_FORCE:            // Checked: 2009-11-26 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+                        eRet = processForceCommand(idCurObj, rlvCmd);
                         break;
-                case RLV_TYPE_UNKNOWN:          // Checked:
+                case RLV_TYPE_REPLY:            // Checked: 2009-11-25 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+                        eRet = processReplyCommand(idCurObj, rlvCmd);
                         break;
-                #ifdef LL_GNUC
+                case RLV_TYPE_UNKNOWN:          // Checked: 2009-11-25 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
                 default:
+                        eRet = RLV_RET_FAILED_PARAM;
                         break;
-                #endif // LL_GNUC
         }
+        RLV_ASSERT(RLV_RET_UNKNOWN != eRet);
 
         #ifdef RLV_DEBUG
-                RLV_INFOS << "\t--> command " << ((fRet) ? "succeeded" : "failed") << LL_ENDL;
+                RLV_INFOS << "\t--> command " << ((eRet & RLV_RET_SUCCESS) ? "succeeded" : "failed") << RLV_ENDL;
         #endif // RLV_DEBUG
 
-        m_pCurCommand = NULL; m_idCurObject.setNull();
-        return fRet;
+        m_CurCommandStack.pop(); m_CurObjectStack.pop();
+        return eRet;
 }
 
-BOOL RlvHandler::processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd)
+// Checked: 2009-11-25 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+void RlvHandler::processRetainedCommands(ERlvBehaviour eBhvrFilter /*=RLV_BHVR_UNKNOWN*/, ERlvParamType eTypeFilter /*=RLV_TYPE_UNKNOWN*/)
 {
-        // 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()) )
+        rlv_retained_list_t::iterator itCmd = m_Retained.begin(), itCurCmd;
+        while (itCmd != m_Retained.end())
         {
-                if (rlvCmd.isStrict())
-                        addException(uuid, RLV_BHVR_PERMISSIVE, eBehaviour);
-                m_Behaviours[eBehaviour]++;
-        }
+                itCurCmd = itCmd++;  // Point the loop iterator ahead
 
-        bool fRefCount = false; // Unused for the moment
-        switch (eBehaviour)
-        {
-                case RLV_BHVR_DETACH:                           // @detach[:<option>]=n         - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                        onAddRemDetach(uuid, rlvCmd, fRefCount);
-                        break;
-                case RLV_BHVR_ADDATTACH:                        // @addattach[:<option>]=n      - Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
-                case RLV_BHVR_REMATTACH:                        // @addattach[:<option>]=n      - Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
-                        onAddRemAttach(uuid, rlvCmd, fRefCount);
-                        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 RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
-                                        if (gFloaterMap->getVisible())
-                                                LLFloaterMap::toggle(NULL);
-                                #else                                                                                           // Version: 1.23.4
-                                        if (LLFloaterMap::instanceVisible())
-                                                LLFloaterMap::hideInstance();
-                                #endif
-                        }
-                        break;
-                #ifdef RLV_EXTENSION_STARTLOCATION
-                case RLV_BHVR_TPLOC:                            // @tploc=n                                     - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
-                case RLV_BHVR_UNSIT:                            // @unsit=n                                     - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
-                        {
-                                if (strOption.empty())
-                                        RlvSettings::updateLoginLastLocation();
-                        }
-                        break;
-                #endif // RLV_EXTENSION_STARTLOCATION
-                case RLV_BHVR_EDIT:                                     // @edit=n                                      - Checked: 2009-07-04 (RLVa-1.0.0b)
-                        {
-                                // Turn off "View / Highlight Transparent"
-                                LLDrawPoolAlpha::sShowDebugAlpha = FALSE;
-
-                                // Close the Beacons floater if it's open
-                                if (LLFloaterBeacons::instanceVisible())
-                                        LLFloaterBeacons::toggleInstance();
-
-                                // Get rid of the build floater if it's open [copy/paste from toggle_build_mode()]
-                                if (gFloaterTools->getVisible())
-                                {
-                                        gAgent.resetView(FALSE);
-                                        gFloaterTools->close();
-                                        gViewerWindow->showCursor();
-                                }
-                        }
-                        break;
-                case RLV_BHVR_ADDOUTFIT:                        // @addoutfit[:<layer>]=n       - Checked: 2009-07-07 (RLVa-1.0.0d)
-                case RLV_BHVR_REMOUTFIT:                        // @remoutfit[:<layer>]=n       - Checked: 2009-07-07 (RLVa-1.0.0d)
-                        {
-                                S16* pLayers = (eBehaviour == RLV_BHVR_ADDOUTFIT) ? m_LayersAdd : m_LayersRem;
-
-                                if (strOption.empty())
-                                {
-                                        for (int idx = 0; idx < WT_COUNT; idx++)
-                                                pLayers[idx]++;
-                                }
-                                else
-                                {
-                                        EWearableType type = LLWearable::typeNameToType(strOption);
-                                        if (WT_INVALID != type)
-                                        {
-                                                pLayers[type]++;
-                                                m_Behaviours[eBehaviour]++;
-                                        }
-                                }
-                        }
-                        break;
-                case RLV_BHVR_SHOWINV:                          // @showinv=n                           - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-1.0.0g
-                        {
-                                // Close all open inventory windows
-                                LLInventoryView::closeAll();
-                        }
-                        break;
-                case RLV_BHVR_SHOWLOC:                          // @showloc=n                           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                        {
-                                // If we're the first @showloc=n restriction refresh all object text so we can filter it if necessary
-                                if (1 == m_Behaviours[RLV_BHVR_SHOWLOC])
-                                        LLHUDText::refreshAllObjectText();
-
-                                // Close the "About Land" floater if it's currently visible
-                                if (LLFloaterLand::instanceVisible())
-                                        LLFloaterLand::hideInstance();
-
-                                // Close the "Estate Tools" floater is it's currently visible
-                                if (LLFloaterRegionInfo::instanceVisible())
-                                        LLFloaterRegionInfo::hideInstance();
-
-                                // NOTE: we should close the "God Tools" floater as well, but since calling LLFloaterGodTools::instance() always
-                                //       creates a new instance of the floater and since it's very unlikely to be open it's just better not to
-                        }
-                        break;
-                case RLV_BHVR_SHOWNAMES:                        // @shownames=n                         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                        {
-                                // If we're the first @shownames=n restriction refresh all object text so we can filter it if necessary
-                                if (1 == m_Behaviours[RLV_BHVR_SHOWNAMES])
-                                        LLHUDText::refreshAllObjectText();
-
-                                // Close the "Active Speakers" panel if it's currently visible
-                                LLFloaterChat::getInstance()->childSetVisible("active_speakers_panel", false);
-                        }
-                        break;
-                case RLV_BHVR_FARTOUCH:
-                        {
-                                #ifdef RLV_EXPERIMENTAL_FIRSTUSE
-                                        //LLFirstUse::useRlvFartouch();
-                                #endif // RLV_EXPERIMENTAL_FIRSTUSE
-                        }
-                        break;
-                case RLV_BHVR_FLY:                                      // @fly=n                                       - Checked: 2009-07-05 (RLVa-1.0.0c)
-                        {
-                                // If currently flying, simulate clicking the Fly button [see LLToolBar::onClickFly()]
-                                if (gAgent.getFlying())
-                                        gAgent.toggleFlying();
-                        }
-                        break;
-                case RLV_BHVR_SETENV:                           // @setenv=n                            - Checked: 2009-07-10 (RLVa-1.0.0g) | Modified: RLVa-0.2.0a
-                        {
-                                if (!fNoSetEnv)
-                                {
-                                        // Only close the floaters if their instance exists and they're actually visible
-                                        if ( (LLFloaterEnvSettings::isOpen()) && (LLFloaterEnvSettings::instance()->getVisible()) )
-                                                LLFloaterEnvSettings::instance()->close();
-                                        if ( (LLFloaterWindLight::isOpen()) && (LLFloaterWindLight::instance()->getVisible()) )
-                                                LLFloaterWindLight::instance()->close();
-                                        if ( (LLFloaterWater::isOpen()) && (LLFloaterWater::instance()->getVisible()) )
-                                                LLFloaterWater::instance()->close();
-                                        if ( (LLFloaterDayCycle::isOpen()) && (LLFloaterDayCycle::instance()->getVisible()) )
-                                                LLFloaterDayCycle::instance()->close();
-
-                                        // Save the current WindLight params so we can restore them on @setenv=y
-                                        if (m_pWLSnapshot)
-                                        {
-                                                RLV_ERRS << "m_pWLSnapshot != NULL" << LL_ENDL; // Safety net in case we set @setenv=n for more than 1 object
-                                                delete m_pWLSnapshot;
-                                        }
-                                        m_pWLSnapshot = RlvWLSnapshot::takeSnapshot();
-                                }
-                        }
-                        break;
-                case RLV_BHVR_SHOWHOVERTEXTALL:         // @showhovertextal=n           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_SHOWHOVERTEXTWORLD:       // @showhovertextworld=n        - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_SHOWHOVERTEXTHUD:         // @showhovertexthud=n          - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                        {
-                                // Refresh all hover text (LLHUDText::setStringUTF8() will decide what needs clearing and what doesn't)
-                                LLHUDText::refreshAllObjectText();
-                        }
-                        break;
-                case RLV_BHVR_SHOWHOVERTEXT:            // @showhovertext:<uuid>=n      - Checked: 2009-07-09 (RLVa-0.2.2a) | Modified: RLVa-1.0.0f
-                        {
-                                LLUUID idException(strOption);
-                                if (idException.notNull())      // If there's an option it should be a valid UUID
-                                {
-                                        addException(uuid, eBehaviour, idException);
-
-                                        // Clear the object's hover text
-                                        LLViewerObject* pObj = gObjectList.findObject(idException);
-                                        if ( (pObj) && (pObj->mText.notNull()) && (!pObj->mText->getObjectText().empty()) )
-                                                pObj->mText->setStringUTF8("");
-                                }
-                        }
-                        break;
-                case RLV_BHVR_NOTIFY:                           // @notify:<option>=add         - Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
-                        {
-                                S32 nChannel; std::string strFilter;
-                                if ( (!strOption.empty()) && (rlvParseNotifyOption(strOption, nChannel, strFilter)) )
-                                {
-                                        if (!m_pBhvrNotify)
-                                                addBehaviourObserver(m_pBhvrNotify = new RlvBehaviourNotifyObserver());
-                                        m_pBhvrNotify->addNotify(uuid, nChannel, strFilter);
-                                }
-                        }
-                        break;
-                case RLV_BHVR_SENDCHANNEL:                      // @sendchannel:<uuid>=add      - Checked: 2009-10-05 (RLVa-1.0.4a) | Modified: RLVa-1.0.4a
-                        {
-                                S32 nChannel;   // If there's an option it should be a valid (=positive and non-zero) chat channel
-                                if ( (!strOption.empty()) && (LLStringUtil::convertToS32(strOption, nChannel)) && (nChannel > 0) )
-                                        addException(uuid, eBehaviour, nChannel);
-                        }
-                        break;
-                case RLV_BHVR_RECVCHAT:                         // @recvchat:<uuid>=add         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_RECVEMOTE:                        // @recvemote:<uuid>=add        - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_RECVIM:                           // @recvim:<uuid>=add           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_SENDIM:                           // @sendim:<uuid>=add           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_TPLURE:                           // @tplure:<uuid>=add           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_ACCEPTTP:                         // @accepttp:<uuid>=add         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                        {
-                                LLUUID idException(strOption);
-                                if (idException.notNull())      // If there's an option it should be a valid UUID
-                                        addException(uuid, eBehaviour, LLUUID(strOption));
-                        }
-                        break;
-                case RLV_BHVR_UNKNOWN:
-                        {
-                                // Give our observers a chance to handle any command we don't
-                                RlvEvent rlvEvent(uuid, rlvCmd);
-                                m_Emitter.update(&RlvObserver::onAddCommand, rlvEvent);
-                        }
-                        break;
-                default:
-                        break;
-        }
-        return TRUE; // Add command success/failure is decided by RlvObject::addCommand()
-}
-
-// Checked: 2009-08-05 (RLVa-1.0.1e) | Added: RLVa-1.0.1e
-void RlvHandler::processRetainedCommands()
-{
-        for (rlv_retained_list_t::const_iterator itCmd = m_Retained.begin(); itCmd != m_Retained.end(); ++itCmd)
-        {
-                const RlvRetainedCommand& cmd = *itCmd;
-                processCommand(cmd.idObject, cmd.strCmd, true);
-        }
-        m_Retained.clear();
-}
-
-BOOL RlvHandler::processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvCmd)
-{
-        // NOTE: - the RlvObject instance still exists at this point, but the viewer might already have removed it from its object list
-        ERlvBehaviour eBehaviour = rlvCmd.getBehaviourType();
-        const std::string& strOption = rlvCmd.getOption();
-
-        if ( (RLV_BHVR_UNKNOWN != eBehaviour) && (strOption.empty()) )
-        {
-                if (rlvCmd.isStrict())
-                        removeException(uuid, RLV_BHVR_PERMISSIVE, eBehaviour);
-                m_Behaviours[eBehaviour]--;
-        }
-
-        bool fRefCount = false; // Unused for the moment
-        switch (eBehaviour)
-        {
-                case RLV_BHVR_DETACH:                           // @detach[:<option>]=y         - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                        onAddRemDetach(uuid, rlvCmd, fRefCount);
-                        break;
-                case RLV_BHVR_ADDATTACH:                        // @addattach[:<option>]=y      - Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
-                case RLV_BHVR_REMATTACH:                        // @addattach[:<option>]=y      - Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
-                        onAddRemAttach(uuid, rlvCmd, fRefCount);
-                        break;
-                case RLV_BHVR_REDIRCHAT:                        // @redirchat:<option>=y        - Checked: 2009-07-07 (RLVa-1.0.0d)
-                case RLV_BHVR_REDIREMOTE:                       // @rediremote:<option>=y       - Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.2a
-                        {
-                                if (!strOption.empty())
-                                        m_Behaviours[eBehaviour]--;     // @redirchat and @rediremote don't have an optionless version so keep track of it here
-                                else
-                                        m_Behaviours[eBehaviour]++;     // @redirchat=n and @rediremote=n are undefined, don't keep track of them
-                        }
-                        break;
-                #ifdef RLV_EXTENSION_STARTLOCATION
-                case RLV_BHVR_TPLOC:                            // @tploc=y                                     - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
-                case RLV_BHVR_UNSIT:                            // @unsit=y                                     - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.1d
-                        {
-                                if (strOption.empty())
-                                        RlvSettings::updateLoginLastLocation();
-                        }
-                        break;
-                #endif // RLV_EXTENSION_STARTLOCATION
-                case RLV_BHVR_ADDOUTFIT:                        // @addoutfit[:<layer>]=y       - Checked: 2009-07-07 (RLVa-1.0.0d)
-                case RLV_BHVR_REMOUTFIT:                        // @remoutfit[:<layer>]=y       - Checked: 2009-07-07 (RLVa-1.0.0d)
-                        {
-                                S16* pLayers = (eBehaviour == RLV_BHVR_ADDOUTFIT) ? m_LayersAdd : m_LayersRem;
-
-                                if (strOption.empty())
-                                {
-                                        for (int idx = 0; idx < WT_COUNT; idx++)
-                                                pLayers[idx]--;
-                                }
-                                else
-                                {
-                                        EWearableType type = LLWearable::typeNameToType(strOption);
-                                        if (WT_INVALID != type)
-                                        {
-                                                pLayers[type]--;
-                                                m_Behaviours[eBehaviour]--;
-                                        }
-                                }
-                        }
-                        break;
-                case RLV_BHVR_SETENV:                           // @setenv=y                            - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-0.2.0h
-                        {
-                                if (!fNoSetEnv)
-                                {
-                                        // Restore WindLight parameters to what they were before @setenv=n was issued
-                                        RlvWLSnapshot::restoreSnapshot(m_pWLSnapshot);
-                                        delete m_pWLSnapshot;
-                                        m_pWLSnapshot = NULL;
-                                }
-                        }
-                        break;
-                case RLV_BHVR_SHOWLOC:                          // @showloc=y                           - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
-                case RLV_BHVR_SHOWNAMES:                        // @shownames=y                         - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
-                case RLV_BHVR_SHOWHOVERTEXTALL:         // @showhovertextal=y           - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
-                case RLV_BHVR_SHOWHOVERTEXTWORLD:       // @showhovertextworld=y        - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
-                case RLV_BHVR_SHOWHOVERTEXTHUD:         // @showhovertexthud=y          - Checked: 2009-07-09 (RLVa-1.0.0f) | Added: RLVa-1.0.0f
-                        {
-                                // If this was the last of any of the five restrictions we should refresh all hover text in case anything needs restoring
-                                if (!m_Behaviours[eBehaviour])
-                                        LLHUDText::refreshAllObjectText();
-                        }
-                        break;
-                case RLV_BHVR_SHOWHOVERTEXT:            // @showhovertext:<uuid>=y      - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                        {
-                                LLUUID idException(strOption);
-                                if (idException.notNull())      // If there's an option it should be a valid UUID
-                                {
-                                        removeException(uuid, eBehaviour, idException);
-
-                                        // Restore the object's hover text
-                                        LLViewerObject* pObj = gObjectList.findObject(idException);
-                                        if ( (pObj) && (pObj->mText.notNull()) && (!pObj->mText->getObjectText().empty()) )
-                                                pObj->mText->setStringUTF8(pObj->mText->getObjectText());
-                                }
-                        }
-                        break;
-                case RLV_BHVR_NOTIFY:                           // @notify:<option>=rem         - Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
-                        {
-                                S32 nChannel; std::string strFilter;
-                                if ( (m_pBhvrNotify) && (!strOption.empty()) && (rlvParseNotifyOption(strOption, nChannel, strFilter)) )
-                                {
-                                        m_pBhvrNotify->removeNotify(uuid, nChannel, strFilter);
-
-                                        if (!m_pBhvrNotify->hasNotify())
-                                        {
-                                                removeBehaviourObserver(m_pBhvrNotify);
-                                                delete m_pBhvrNotify;
-                                                m_pBhvrNotify = NULL;
-                                        }
-                                }
-                        }
-                        break;
-                case RLV_BHVR_SENDCHANNEL:                      // @sendchannel:<uuid>=rem      - Checked: 2009-10-05 (RLVa-1.0.4a) | Modified: RLVa-1.0.4a
-                        {
-                                S32 nChannel;   // If there's an option it should be a valid (=positive and non-zero) chat channel
-                                if ( (!strOption.empty()) && (LLStringUtil::convertToS32(strOption, nChannel)) && (nChannel > 0) )
-                                        removeException(uuid, eBehaviour, nChannel);
-                        }
-                        break;
-                case RLV_BHVR_RECVCHAT:                         // @recvchat:<uuid>=rem         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_RECVEMOTE:                        // @recvemote:<uui>=red         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_RECVIM:                           // @recvim:<uuid>=rem           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_SENDIM:                           // @sendim:<uuid>=rem           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_TPLURE:                           // @recvim:<uuid>=rem           - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                case RLV_BHVR_ACCEPTTP:                         // @accepttp:<uuid>=rem         - Checked: 2009-07-09 (RLVa-1.0.0f) | Modified: RLVa-1.0.0f
-                        {
-                                LLUUID idException(strOption);
-                                if (idException.notNull())      // If there's an option it should be a valid UUID
-                                        removeException(uuid, eBehaviour, LLUUID(strOption));
-                        }
-                        break;
-                case RLV_BHVR_UNKNOWN:
-                        {
-                                // Give our observers a chance to handle any command we don't
-                                RlvEvent rlvEvent(uuid, rlvCmd);
-                                m_Emitter.update(&RlvObserver::onRemoveCommand, rlvEvent);
-                        }
-                        break;
-                default:
-                        break;
+                const RlvRetainedCommand& cmd = *itCurCmd;
+                if ( ((RLV_BHVR_UNKNOWN == eBhvrFilter) || (cmd.rlvCmd.getBehaviourType() == eBhvrFilter)) &&
+                     ((RLV_TYPE_UNKNOWN == eTypeFilter) || (cmd.rlvCmd.getParamType() == eTypeFilter)) )
+                {
+                        processCommand(cmd.idObject, cmd.rlvCmd, true);
+                        m_Retained.erase(itCurCmd);
+                }
         }
-        return TRUE; // Remove commands don't fail, doesn't matter what we return here
 }
 
-BOOL RlvHandler::processClearCommand(const LLUUID idObj, const RlvCommand& rlvCmd)
+ERlvCmdRet RlvHandler::processClearCommand(const LLUUID& idObj, const RlvCommand& rlvCmd)
 {
         const std::string& strFilter = rlvCmd.getParam(); std::string strCmdRem;
 
@@ -974,340 +688,10 @@ BOOL RlvHandler::processClearCommand(const LLUUID idObj, const RlvCommand& rlvCm
         }
 
         // Let our observers know about clear commands
-        RlvEvent rlvEvent(idObj, rlvCmd);
-        m_Emitter.update(&RlvObserver::onClearCommand, rlvEvent);
+        ERlvCmdRet eRet = RLV_RET_SUCCESS;
+        notifyCommandHandlers(&RlvCommandHandler::onClearCommand, idObj, rlvCmd, eRet, true);
 
-        return TRUE; // Don't fail clear commands even if the object didn't exist since it confuses people
-}
-
-BOOL RlvHandler::processForceCommand(const LLUUID& idObj, const RlvCommand& rlvCmd) const
-{
-        const std::string& strOption = rlvCmd.getOption();
-        BOOL fHandled = TRUE;
-
-        switch (rlvCmd.getBehaviourType())
-        {
-                case RLV_BHVR_DETACH:           // @detach[:<option>]=force             - Checked: 2009-10-12 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                        onForceDetach(idObj, rlvCmd);
-                        break;
-                case RLV_BHVR_REMATTACH:        // @remattach[:<option>]=force  - Checked: 2009-10-12 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                        onForceRemAttach(idObj, rlvCmd);
-                        break;
-                case RLV_BHVR_REMOUTFIT:        // @remoutfit:<option>=force    - Checked:
-                        onForceRemOutfit(idObj, strOption);
-                        break;
-                case RLV_BHVR_UNSIT:            // @unsit=force                                 - Checked: 2009-06-02 (RLVa-0.2.0g)
-                        {
-                                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
-                                if ( (pAvatar) && (pAvatar->mIsSitting) && (!hasBehaviourExcept(RLV_BHVR_UNSIT, idObj)) )
-                                {
-                                        // See behaviour notes on why we have to force an agent update here
-                                        gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
-                                        send_agent_update(TRUE, TRUE);
-                                }
-                        }
-                        break;
-                case RLV_BHVR_TPTO:                     // @tpto:<option>=force                 - Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-1.0.0h
-                        {
-                                fHandled = FALSE;
-                                if ( (!strOption.empty()) && (-1 == strOption.find_first_not_of("0123456789/.")) )
-                                {
-                                        LLVector3d posGlobal;
-
-                                        boost_tokenizer tokens(strOption, boost::char_separator<char>("/", "", boost::keep_empty_tokens)); int idx = 0;
-                                        for (boost_tokenizer::const_iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
-                                        {
-                                                if (idx < 3)
-                                                        LLStringUtil::convertToF64(*itToken, posGlobal[idx++]);
-                                        }
-
-                                        if (idx == 3)
-                                        {
-                                                gAgent.teleportViaLocation(posGlobal);
-                                                fHandled = TRUE;
-                                        }
-                                } 
-                        }
-                        break;
-                case RLV_BHVR_SIT:                      // @sit:<option>=force                  - Checked: 2009-06-02 (RLVa-0.2.0g)
-                        fHandled = onForceSit(idObj, rlvCmd.getOption());
-                        break;
-                case RLV_BHVR_ADDOUTFIT:        // @addoutfit:<option>=force <- synonym of @attach:<option>=force
-                case RLV_BHVR_ATTACH:           // @attach:<option>=force               - Checked:
-                        onForceWear(rlvCmd.getOption(), true, false);   // Force attach single folder
-                        break;
-                case RLV_BHVR_ATTACHALL:        // @attachall:<option>=force    - Checked:
-                        onForceWear(rlvCmd.getOption(), true, true);    // Force attach nested folders
-                        break;
-                case RLV_BHVR_DETACHALL:        // @detachall:<option>=force    - Checked:
-                        onForceWear(rlvCmd.getOption(), false, true);   // Force detach nested folders
-                        break;
-                case RLV_BHVR_ATTACHTHIS:
-                case RLV_BHVR_ATTACHALLTHIS:
-                case RLV_BHVR_DETACHTHIS:
-                case RLV_BHVR_DETACHALLTHIS:
-                        {
-                                ERlvBehaviour eBehaviour = rlvCmd.getBehaviourType();
-                                std::string strReply;
-                                if (onGetPath(idObj, strOption, strReply))
-                                {
-                                        LLStringUtil::toLower(strReply);
-                                        onForceWear(strReply, 
-                                                (RLV_BHVR_ATTACHTHIS == eBehaviour) || (RLV_BHVR_ATTACHALLTHIS == eBehaviour), 
-                                                (RLV_BHVR_ATTACHALLTHIS == eBehaviour) || (RLV_BHVR_DETACHALLTHIS == eBehaviour));
-                                }
-                        }
-                        break;
-                case RLV_BHVR_DETACHME:         // @detachme=force                              - Checked: 2009-06-07 (RLVa-0.2.1c)
-                        {
-                                // NOTE: @detachme=force could be seen as a @detach:<attachpt>=force but RLV implements it as a "detach by UUID"
-                                LLViewerObject* pObj; LLVOAvatar* pAvatar; LLViewerJointAttachment* pAttachPt;
-                                if ( ((pObj = gObjectList.findObject(idObj)) != NULL) && (pObj->isAttachment()) && 
-                                         ((pAvatar = gAgent.getAvatarObject()) != NULL) && 
-                                         ((pAttachPt = pAvatar->getTargetAttachmentPoint(pObj->getRootEdit())) != NULL) )
-                                {
-                                        handle_detach_from_avatar(pAttachPt);
-                                }
-                        }
-                        break;
-                case RLV_BHVR_UNKNOWN:
-                        {
-                                // Give our observers a chance to handle any command we don't
-                                RlvEvent rlvEvent(idObj, rlvCmd);
-                                fHandled = m_Emitter.update(&RlvObserver::onForceCommand, rlvEvent);
-                        }
-                        break;
-                default:
-                        break;
-        }
-        return fHandled; // If we handled it then it'll still be TRUE; if an observer doesn't handle it'll be FALSE
-}
-
-// Checked: 2009-07-12 (RLVa-1.0.0h)
-BOOL RlvHandler::processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const
-{
-        const std::string& strOption = rlvCmd.getOption();
-        const std::string& strChannel = rlvCmd.getParam();
-        std::string strReply;
-
-        BOOL fHandled = TRUE;
-        switch (rlvCmd.getBehaviourType())
-        {
-                case RLV_BHVR_VERSION:                  // @version=<channel>                             - Checked: 2009-07-12 (RLVa-1.0.0h)
-                        strReply = getVersionString();
-                        break;
-                case RLV_BHVR_VERSIONNUM:               // @versionnum=<channel>                          - Checked: 2009-10-04 (RLVa-1.0.4b) | Added: RLVa-1.0.4b
-                        strReply = getVersionNumString();
-                        break;
-                case RLV_BHVR_GETOUTFIT:                // @getoufit[:<layer>]=<channel>          - Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0d
-                        {
-                                // (Quirk: RLV 1.16.1 will execute @getoutfit=<channel> if <layer> is invalid, so we need to as well)
-                                EWearableType layerType = LLWearable::typeNameToType(strOption);
-
-                                const EWearableType layerTypes[] =
-                                        { 
-                                                WT_GLOVES, WT_JACKET, WT_PANTS, WT_SHIRT, WT_SHOES, WT_SKIRT, WT_SOCKS,
-                                                WT_UNDERPANTS, WT_UNDERSHIRT, WT_SKIN, WT_EYES, WT_HAIR, WT_SHAPE, WT_ALPHA, WT_TATTOO
-                                        };
-
-                                #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-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                        {
-                                // 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()) || 
-                                                                  ( (!isLockedAttachmentExcept(itAttach->first, RLV_LOCK_REMOVE, gObjectList.findObject(uuid))) && 
-                                                                    (isStrippable(pAttachment->getItemID())) ) );
-                                                        strReply.push_back( (fWorn) ? '1' : '0' );
-                                                }
-                                        #endif // RLV_EXPERIMENTAL_COMPOSITE_FOLDING
-                                }
-                        }
-                        break;
-                case RLV_BHVR_GETSTATUS:                // @getstatus[:<option>]=<channel>        - Checked: 2009-07-12 (RLVa-1.0.0h)
-                        {
-                                // NOTE: specification says response should start with '/' but RLV-1.16.1 returns an empty string when no rules are set
-                                rlv_object_map_t::const_iterator itObj = m_Objects.find(uuid);
-                                if (itObj != m_Objects.end())
-                                {
-                                        std::string strObjStatus = itObj->second.getStatusString(strOption);
-                                        if (!strObjStatus.empty())
-                                        {
-                                                strReply.push_back('/');
-                                                strReply += strObjStatus;
-                                        }
-                                }
-                        }
-                        break;
-                case RLV_BHVR_GETSTATUSALL:             // @getstatusall[:<option>]=<channel> - Checked: 2009-07-12 (RLVa-1.0.0h)
-                        {
-                                // NOTE: specification says response should start with '/' but RLV-1.16.1 returns an empty string when no rules are set
-                                std::string strObjStatus;
-                                for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
-                                {
-                                        strObjStatus = itObj->second.getStatusString(strOption);
-                                        if (!strObjStatus.empty())
-                                        {
-                                                strReply.push_back('/');
-                                                strReply += strObjStatus;
-                                        }
-                                }
-                        }
-                        break;
-                case RLV_BHVR_GETINV:                   // @getinv[:<path>]=<channel>             - Checked: 2009-07-28 (RLVa-1.0.1b) | Modified: RLVa-1.0.1b
-                        {
-                                LLViewerInventoryCategory* pFolder = getSharedFolder(strOption);
-                                if (pFolder)
-                                {
-                                        LLInventoryModel::cat_array_t*  pFolders;
-                                        LLInventoryModel::item_array_t* pItems;
-                                        gInventory.getDirectDescendentsOf(pFolder->getUUID(), pFolders, pItems);
-
-                                        if (pFolders)
-                                        {
-                                                for (S32 idxFolder = 0, cntFolder = pFolders->count(); idxFolder < cntFolder; idxFolder++)
-                                                {
-                                                        const std::string& strFolder = pFolders->get(idxFolder)->getName();
-                                                        if ( (!strFolder.empty()) && (RLV_FOLDER_PREFIX_HIDDEN != strFolder[0]) &&
-                                                                 (!isFoldedFolder(pFolders->get(idxFolder).get(), true)) )
-                                                        {
-                                                                if (!strReply.empty())
-                                                                        strReply.push_back(',');
-                                                                strReply += strFolder;
-                                                        }
-                                                }
-                                        }
-                                }
-                        }
-                        break;
-                case RLV_BHVR_GETINVWORN:               // @getinvworn[:path]=<channel>           - Checked:
-                        onGetInvWorn(rlvCmd.getOption(), strReply);
-                        break;
-                case RLV_BHVR_FINDFOLDER:               // @findfolder:<criteria>=<channel>   - Checked: 2009-08-26 (RLVa-1.0.2a) | Modified: RLVa-1.0.2a
-                        {
-                                // COMPAT-RLV: RLV 1.16.1 returns the first random folder it finds (probably tries to match "" to a folder name?)
-                                //             (just going to stick with what's there for now... no option => no folder)
-                                LLInventoryModel::cat_array_t folders;
-                                if ( (!strOption.empty()) && (findSharedFolders(strOption, folders)) )
-                                {
-                                        // We need to return an "in depth" result so whoever has the most '/' is our lucky winner
-                                        // (maxSlashes needs to be initialized to -1 since children of the #RLV folder won't have '/' in their shared path)
-                                        int maxSlashes = -1, curSlashes; std::string strFolderName;
-                                        for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++)
-                                        {
-                                                strFolderName = getSharedPath(folders.get(idxFolder));
-
-                                                curSlashes = std::count(strFolderName.begin(), strFolderName.end(), '/');
-                                                if (curSlashes > maxSlashes)
-                                                {
-                                                        maxSlashes = curSlashes;
-                                                        strReply = strFolderName;
-                                                }
-                                        }
-                                }
-                        }
-                        break;
-                #ifdef RLV_EXTENSION_CMD_FINDFOLDERS
-                        case RLV_BHVR_FINDFOLDERS:      // @findfolders:<criteria>=<channel>  - Checked: 2009-07-12 (RLVa-1.0.0h) | Added: RLVa-0.2.0b
-                                {
-                                        LLInventoryModel::cat_array_t folders;
-                                        if ( (!strOption.empty()) && (findSharedFolders(strOption, folders)) )
-                                        {
-                                                for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++)
-                                                {
-                                                        if (!strReply.empty())
-                                                                strReply.push_back(',');
-                                                        strReply += getSharedPath(folders.get(idxFolder));
-                                                }
-                                        }
-                                }
-                                break;
-                #endif // RLV_EXTENSION_CMD_FINDFOLDERS
-                case RLV_BHVR_GETPATH:                  // @getpath[:<option>]=<channel>          - Checked: 2009-07-12 (RLVa-1.0.0h)
-                        onGetPath(uuid, rlvCmd.getOption(), strReply);
-                        break;
-                case RLV_BHVR_GETSITID:                 // @getsitid=<channel>                            - Checked: 2009-07-12 (RLVa-1.0.0h)
-                        {
-                                // (Quirk: RLV 1.16.1 returns a NULL uuid if we're not sitting)
-                                LLVOAvatar* pAvatarObj = gAgent.getAvatarObject(); LLUUID uuid;
-                                if ( (pAvatarObj) && (pAvatarObj->mIsSitting) )
-                                {
-                                        // LLVOAvatar inherits from 2 classes so make sure we get the right vfptr
-                                        LLViewerObject* pAvatar = dynamic_cast<LLViewerObject*>(pAvatarObj), *pParent;
-                                        // (If there is a parent, we need to upcast it from LLXform to LLViewerObject to get its UUID)
-                                        if ( (pAvatar) && ((pParent = static_cast<LLViewerObject*>(pAvatar->getRoot())) != pAvatar) )
-                                                uuid = pParent->getID();
-                                }
-                                strReply = uuid.asString();
-                        }
-                        break;
-                case RLV_BHVR_UNKNOWN:
-                        {
-                                // Give our observers a chance to handle any command we don't
-                                RlvEvent rlvEvent(uuid, rlvCmd);
-                                return m_Emitter.update(&RlvObserver::onReplyCommand, rlvEvent);
-                        }
-                        break;
-                default:
-                        break;
-        }
-
-        if (fHandled)
-                rlvSendChatReply(strChannel, strReply);
-        return fHandled;
+        return RLV_RET_SUCCESS; // Don't fail clear commands even if the object didn't exist since it confuses people
 }
 
 // ============================================================================
@@ -1340,7 +724,7 @@ void RlvHandler::initLookupTables()
         }
 }
 
-// Checked: 2009-08-11 (RLVa-1.0.1h) | Modified: RLVa-1.0.1h
+// Checked: 2010-07-18 (RLVa-1.1.2b) | Modified: RLVa-1.1.2a
 void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt)
 {
         // Sanity check - LLVOAvatar::attachObject() should call us *after* calling LLViewerJointAttachment::addObject()
@@ -1359,25 +743,25 @@ void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt)
         rlv_object_map_t::iterator itObj = m_Objects.find(pObj->getID());
         if (itObj != m_Objects.end())
         {
-                // Save the attachment point index
-                itObj->second.m_idxAttachPt = idxAttachPt;
-
-                // If it's an attachment we processed commands for but that only just rezzed in we need to mark it as existing in gObjectList
-                if (!itObj->second.m_fLookup)
-                        itObj->second.m_fLookup = true;
-
-                // In both cases we should check for "@detach=n" and actually lock down the attachment point it got attached to
-                if (itObj->second.hasBehaviour(RLV_BHVR_DETACH, false))
+                // Only if we haven't been able to find this object (= attachment that rezzed in) or if it's a rezzed prim attached from in-world
+                if ( (!itObj->second.m_fLookup) || (!itObj->second.m_idxAttachPt) )
                 {
-                        // (Copy/paste from processAddCommand)
-                        addAttachmentLock(idxAttachPt, itObj->second.m_UUID, RLV_LOCK_REMOVE);
+                        // Reset any lookup information we might have for this object
+                        itObj->second.m_idxAttachPt = idxAttachPt;
+                        itObj->second.m_fLookup = true;
 
-                        if (pObj->isHUDAttachment())
-                                LLPipeline::sShowHUDAttachments = TRUE; // Prevents hiding of locked HUD attachments
+                        // In both cases we should check for "@detach=n" and actually lock down the attachment point it got attached to
+                        if (itObj->second.hasBehaviour(RLV_BHVR_DETACH, false))
+                        {
+                                // (Copy/paste from processAddCommand)
+                                addAttachmentLock(idxAttachPt, itObj->second.m_UUID, RLV_LOCK_REMOVE);
+                                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
+        // Fetch the inventory item if it isn't already (we need it for a potential 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) )
@@ -1386,20 +770,22 @@ void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt)
                 f.fetchItem(idItem);
         }
 
-        // If what we're wearing is located under the shared root then append the attachment point name (if needed)
+        // If what we're wearing is located under the shared root then append the attachment point name as needed
         LLViewerInventoryCategory* pRlvRoot = getSharedRoot();
-        if ( (STATE_STARTED == LLStartUp::getStartupState()) && (pRlvRoot) && (pItem) && (pItem->isComplete()) &&
+        if ( (!RlvSettings::getEnableSharedWear()) && (RlvSettings::getSharedInvAutoRename()) &&
+             (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()))
+                // TODO: find a not too convoluted way to rename the attachment in case it specifies a name different than the current attach point
+                S32 idxAttachPtItem = getAttachPointIndex(pItem, true);
+                if ( (idxAttachPt != idxAttachPtItem) && (!idxAttachPtItem) )
                 {
-                        if (!getAttachPoint(pItem, true))
+                        std::string strAttachPt = pAttachPt->getName();
+                        LLStringUtil::toLower(strAttachPt);
+
+                        // If we can modify the item then we rename it directly, otherwise we create a new folder and move it
+                        if (pItem->getPermissions().allowModifyBy(gAgent.getID()))
                         {
-                                // 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);
 
@@ -1410,25 +796,30 @@ void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt)
                                 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)) )
+                        else
                         {
-                                // It's no mod and its parent folder doesn't contain an attach point
-                                if ( (1 == rlvGetDirectDescendentsCount(pFolder, LLAssetType::AT_OBJECT)) && (NEW_CATEGORY_NAME == pFolder->getName()) )
+                                // Don't do anything if the item is a direct descendant of the shared root, or a folded folder
+                                LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID());
+                                if ( (pFolder) && (pFolder->getUUID() != pRlvRoot->getUUID()) && (!isFoldedFolder(pFolder, true, false)) )
                                 {
-                                        // Only rename if there's exactly 1 object/attachment inside of it [see LLFolderBridge::renameItem()]
-                                        std::string strName = ".(" + strAttachPt + ")";
+                                        std::string strFolderName = ".(" + strAttachPt + ")";
 
-                                        pFolder->rename(strName);
-                                        pFolder->updateServer(FALSE);
-                                        gInventory.updateCategory(pFolder);
-                                        //gInventory.notifyObservers(); <- done further down in LLVOAvatar::attachObject()
+                                        // Rename the item's parent folder if it's called "New Folder", isn't directly under #RLV and contains exactly 1 object
+                                        if ( (NEW_CATEGORY_NAME == pFolder->getName()) && (pFolder->getParentUUID() != pRlvRoot->getUUID()) &&
+                                                 (1 == rlvGetDirectDescendentsCount(pFolder, LLAssetType::AT_OBJECT)) )
+                                        {
+                                                pFolder->rename(strFolderName);
+                                                pFolder->updateServer(FALSE);
+                                                gInventory.updateCategory(pFolder);
+                                                //gInventory.notifyObservers(); <- done further down in LLVOAvatar::attachObject()
+                                        }
+                                        else
+                                        {
+                                                // "No modify" item with a non-renameable parent: create a new folder named and move the item into it
+                                                LLUUID idAttachFolder = gInventory.createNewCategory(pFolder->getUUID(), LLAssetType::AT_NONE, strFolderName);
+                                                move_inventory_item(gAgent.getID(), gAgent.getSessionID(), pItem->getUUID(), idAttachFolder, std::string(), NULL);
+                                                //gInventory.notifyObservers(); <- done further down in LLVOAvatar::attachObject()
+                                        }
                                 }
                         }
                 }
@@ -1515,6 +906,28 @@ bool RlvHandler::onGC()
         return (0 != m_Objects.size()); // GC will kill itself if it has nothing to do
 }
 
+// Checked: 2009-11-26 (RLVa-1.1.0f) | Added: RLVa-1.1.0f
+void RlvHandler::onIdleStartup(void* pParam)
+{
+        LLTimer* pTimer = (LLTimer*)pParam;
+        if (LLStartUp::getStartupState() < STATE_STARTED)
+        {
+                // We don't want to run this *too* often
+                if ( (LLStartUp::getStartupState() >= STATE_MISC) && (pTimer->getElapsedTimeF32() >= 2.0) )
+                {
+                        gRlvHandler.processRetainedCommands(RLV_BHVR_VERSION, RLV_TYPE_REPLY);
+                        gRlvHandler.processRetainedCommands(RLV_BHVR_VERSIONNUM, RLV_TYPE_REPLY);
+                        pTimer->reset();
+                }
+        }
+        else
+        {
+                // Clean-up
+                gIdleCallbacks.deleteFunction(onIdleStartup, pParam);
+                delete pTimer;
+        }
+}
+
 // ============================================================================
 // String/chat censoring functions
 //
@@ -1593,13 +1006,14 @@ void RlvHandler::filterLocation(std::string& strUTF8Text) const
 
         // Filter any mention of the surrounding region names
         LLWorld::region_list_t regions = LLWorld::getInstance()->getRegionList();
+        const std::string& strHiddenRegion = RlvStrings::getString(RLV_STRING_HIDDEN_REGION);
         for (LLWorld::region_list_t::const_iterator itRegion = regions.begin(); itRegion != regions.end(); ++itRegion)
-                rlvStringReplace(strUTF8Text, (*itRegion)->getName(), rlv_handler_t::cstrHiddenRegion);
+                rlvStringReplace(strUTF8Text, (*itRegion)->getName(), strHiddenRegion);
 
         // Filter any mention of the parcel name
         LLViewerParcelMgr* pParcelMgr = LLViewerParcelMgr::getInstance();
         if (pParcelMgr)
-                rlvStringReplace(strUTF8Text, pParcelMgr->getAgentParcelName(), rlv_handler_t::cstrHiddenParcel);
+                rlvStringReplace(strUTF8Text, pParcelMgr->getAgentParcelName(), RlvStrings::getString(RLV_STRING_HIDDEN_PARCEL));
 }
 
 void RlvHandler::filterNames(std::string& strUTF8Text) const
@@ -1638,55 +1052,36 @@ void RlvHandler::filterNames(std::string& strUTF8Text) const
                         {
                                 strName = strFirstName + " " + strLastName;
 
-                                rlvStringReplace(strUTF8Text, strName, getAnonym(strName));
+                                rlvStringReplace(strUTF8Text, strName, RlvStrings::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
+// Checked: 2010-02-27 (RLVa-1.1.1a) | Modified: RLVa-1.2.0a
 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))) )
+        ERlvBehaviour eBhvr = (!rlvIsEmote(strUTF8Text)) ? RLV_BHVR_REDIRCHAT : RLV_BHVR_REDIREMOTE;
+        if (!hasBehaviour(eBhvr))
                 return false;
 
-        if (!fIsEmote)
+        if (RLV_BHVR_REDIRCHAT == eBhvr)
         {
                 std::string strText = strUTF8Text;
-                filterChat(strText, true);
+                filterChat(strText, false);
                 if (strText != "...")
                         return false;   // @sendchat wouldn't filter it so @redirchat won't redirect it either
         }
 
-        bool fSendChannel = hasBehaviour(RLV_BHVR_SENDCHANNEL); S32 nChannel = 0;
-        for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
+        for (rlv_exception_map_t::const_iterator itRedir = m_Exceptions.lower_bound(eBhvr),
+                        endRedir = m_Exceptions.upper_bound(eBhvr); itRedir != endRedir; ++itRedir)
         {
-                for (rlv_command_list_t::const_iterator itCmd = itObj->second.m_Commands.begin(), 
-                                endCmd = itObj->second.m_Commands.end(); itCmd != endCmd; ++itCmd)
-                {
-                        if ( ( ((!fIsEmote) && (RLV_BHVR_REDIRCHAT == itCmd->getBehaviourType())) ||    // Redirect if: (not an emote and @redirchat
-                                   ((fIsEmote) && (RLV_BHVR_REDIREMOTE == itCmd->getBehaviourType())) ) &&      // OR an emote and @rediremote)
-                                 (LLStringUtil::convertToS32(itCmd->getOption(), nChannel)) &&                          // AND the channel is a number
-                                 ( (!fSendChannel) || (isException(RLV_BHVR_SENDCHANNEL, nChannel)) ) )         // AND we're allowed to send to that channel
-                        {
-                                rlvSendChatReply(nChannel, strUTF8Text);
-                        }
-                }
+                S32 nChannel = boost::get<S32>(itRedir->second.varOption);
+                if ( (!hasBehaviour(RLV_BHVR_SENDCHANNEL)) || (isException(RLV_BHVR_SENDCHANNEL, nChannel)) )
+                        rlvSendChatReply(nChannel, strUTF8Text);
         }
+
         return true;
 }
 
@@ -1694,7 +1089,8 @@ bool RlvHandler::redirectChatOrEmote(const std::string& strUTF8Text) const
 // Public service functions (called by the outside world or by extension handlers)
 //
 
-BOOL RlvHandler::isAgentNearby(const LLUUID& uuid) const
+// Checked: 2009-11-24 (RLVa-1.1.0e)
+bool RlvHandler::isAgentNearby(const LLUUID& idAgent) const
 {
         #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
                 for (LLWorld::region_list_t::const_iterator itRegion = LLWorld::getInstance()->mActiveRegionList.begin();
@@ -1704,20 +1100,19 @@ BOOL RlvHandler::isAgentNearby(const LLUUID& uuid) const
                         
                         for (S32 idxAgent = 0, cntAgent = pRegion->mMapAvatars.count(); idxAgent < cntAgent; idxAgent++)
                                 if (pRegion->mMapAvatarIDs.get(idxAgent) == uuid)
-                                        return TRUE;
+                                        return true;
                 }
-        #else                                                                                           // Version: trunk
-                // TODO-RLV: rewrite this to fit trunk, but still need the radius limited to a sane range
+        #else                                                                                           // Version: 1.23.4
                 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;
+                        if (idAgents[idxAgent] == idAgent)
+                                return true;
                 }
         #endif
-        return FALSE;
+        return false;
 }
 
 // ============================================================================
@@ -1733,7 +1128,7 @@ public:
         virtual void done()
         {
                 RLV_INFOS << "Shared folders fetch completed" << LL_ENDL;
-                RlvHandler::m_fFetchComplete = TRUE;
+                RlvHandler::m_fFetchComplete = true;
 
                 gInventory.removeObserver(this);
                 delete this;
@@ -1749,26 +1144,22 @@ void RlvHandler::fetchSharedInventory()
                 return;
 
         // Grab all the folders under the shared root
-        LLInventoryModel::cat_array_t  folders;
+        LLInventoryModel::cat_array_t folders;
         LLInventoryModel::item_array_t items;
         gInventory.collectDescendents(pRlvRoot->getUUID(), folders, items, FALSE);
 
-        /*
-         * Add them to the "to fetch" list
-         */ 
+        // 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
-         */
+        // Now fetch them all in one go
         RlvSharedRootFetcher* fetcher = new RlvSharedRootFetcher;
 
-        RLV_INFOS << "Starting fetch of " << fetchFolders.size() << " shared folders" << LL_ENDL;
+        RLV_INFOS << "Starting fetch of " << fetchFolders.size() << " shared folders" << RLV_ENDL;
         fetcher->fetchDescendents(fetchFolders);
+        m_fFetchStarted = true;
 
         if (fetcher->isEverythingComplete())
                 fetcher->done();
@@ -1796,7 +1187,7 @@ LLViewerInventoryCategory* RlvHandler::getSharedRoot()
 {
         if (gInventory.isInventoryUsable())
         {
-                LLInventoryModel::cat_array_t*  pFolders;
+                LLInventoryModel::cat_array_t* pFolders;
                 LLInventoryModel::item_array_t* pItems;
                 gInventory.getDirectDescendentsOf(gAgent.getInventoryRootID(), pFolders, pItems);
                 if (pFolders)
@@ -1902,15 +1293,15 @@ std::string RlvHandler::getSharedPath(const LLViewerInventoryCategory* pFolder)
 // Composite folders
 //
 
-#ifdef RLV_EXPERIMENTAL_COMPOSITES
-        // Checked:
+#ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        // Checked: 2009-12-18 (RLVa-1.1.0k) | Modified: RLVa-1.1.0i
         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);
+                        std::string::size_type idxStart = cstrFolder.find('['), idxEnd = cstrFolder.find(']', idxStart);
                         if ( ((0 == idxStart) || (1 == idxStart)) && (idxEnd - idxStart > 1) )
                         {
                                 if (pstrName)
@@ -1921,21 +1312,17 @@ std::string RlvHandler::getSharedPath(const LLViewerInventoryCategory* pFolder)
                 return false;
         }
 
-        // Checked:
+        // Checked: 2009-12-18 (RLVa-1.1.0k) | Modified: RLVa-1.1.0i
         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...
+                        // We know it's an item in a folder under the shared root (we need its parent if it's a folded folder)
                         LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID());
-                        if (getAttachPoint(pFolder, true))
-                        {
-                                // ... but it could be named ".(attachpt)" in which case we need its parent
+                        if (isFoldedFolder(pFolder, true, false))       // Don't check if the folder is a composite folder
                                 pFolder = gInventory.getCategory(pFolder->getParentUUID());
-                        }
 
                         if ( (pFolder) && (getCompositeInfo(pFolder, pstrName)) )
                         {
@@ -1946,7 +1333,7 @@ std::string RlvHandler::getSharedPath(const LLViewerInventoryCategory* pFolder)
                 }
                 return false;
         }
-#endif // RLV_EXPERIMENTAL_COMPOSITES
+#endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
 
 #ifdef RLV_EXPERIMENTAL_COMPOSITE_FOLDING
         // Checked:
@@ -1985,367 +1372,124 @@ std::string RlvHandler::getSharedPath(const LLViewerInventoryCategory* pFolder)
         }
 #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDING
 
-#ifdef RLV_EXPERIMENTAL_COMPOSITE_LOCKING
-        // Checked:
+#ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        // Checked: 2009-12-18 (RLVa-1.1.0k) | Modified: RLVa-1.1.0i
         bool RlvHandler::canTakeOffComposite(const LLInventoryCategory* pFolder) const
         {
-                if (!pFolder)           // If there's no folder then there is nothing to take off
+                // Sanity check - if there's no folder or no avatar then there is nothing to take off
+                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                if ( (!pFolder) || (!pAvatar) )
                         return false;
+                // Sanity check - if nothing is locked then we can definitely take it off
+                if ( (!hasBehaviour(RLV_BHVR_REMOUTFIT)) && (!hasLockedAttachment(RLV_LOCK_REMOVE)) )
+                        return true;
 
-                LLInventoryModel::cat_array_t  folders;
+                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);
-
+                        const LLViewerInventoryItem* pItem = items.get(idxItem);
                         switch (pItem->getType())
                         {
+                                case LLAssetType::AT_BODYPART:
                                 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
+                                                        return false;   // If one wearable in the folder is non-removeable then the entire folder should be
                                         }
                                         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
-                                                }
+                                                LLViewerObject* pObj = pAvatar->getWornAttachment(pItem->getUUID());
+                                                if ( (pObj != NULL) && (isLockedAttachment(pObj, RLV_LOCK_REMOVE)) )
+                                                        return false;   // If one attachment in the folder is non-detachable then the entire folder should be
                                         }
                                         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::onForceRemOutfit(const LLUUID& idObj, const std::string& strOption) const
-{
-        EWearableType typeOption = LLWearable::typeNameToType(strOption), type;
-        if ( (WT_INVALID == typeOption) && (!strOption.empty()) )
-                return;
-
-        // Before we had an option and optionless branch, but with the addition of composites and nostrip there's less duplication this way
-        for (int idxType = 0; idxType < WT_COUNT; idxType++)
-        {
-                type = (EWearableType)idxType;
-                if (LLAssetType::AT_CLOTHING != LLWearable::typeToAssetType(type))
-                        continue; // Only strip clothing, not bodyparts
-
-                if ( ((typeOption == type) || (strOption.empty())) && (gAgent.getWearable(type)) && (isStrippable(gAgent.getWearableItem(type))) )
-                {
-                        #ifdef RLV_EXPERIMENTAL_COMPOSITES
-                                // If we're stripping something that's part of a composite folder then we should @detachthis instead
-                                if (isCompositeDescendent(gAgent.getWearableItem(type)))
-                                {
-                                        std::string strCmd = "detachthis:" + LLWearable::typeToTypeName(type) + "=force";
-                                        #ifdef RLV_DEBUG
-                                                RLV_INFOS << "\t- '" << LLWearable::typeToTypeName(type) << "' is composite descendent: @" << strCmd << LL_ENDL;
-                                        #endif // RLV_DEBUG
-                                        processForceCommand(idObj, RlvCommand(strCmd));
-                                }
-                                else
-                        #endif // RLV_EXPERIMENTAL_COMPOSITES
-                                {
-                                        gAgent.removeWearable(type);
-                                }
-                }
-        }
-}
 
-// Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0g
-bool RlvHandler::onForceSit(const LLUUID& idObj, const std::string& strOption) const
-{
-        LLViewerObject* pObject = NULL; LLUUID idTarget(strOption);
-        // Sanity checking - we need to know about the object and it should identify a prim/linkset
-        if ( (idTarget.isNull()) || ((pObject = gObjectList.findObject(idTarget)) == NULL) || (LL_PCODE_VOLUME != pObject->getPCode()) )
-                return false;
-
-        // Don't force sit if:
-        //   1) currently sitting and prevented from standing up
-        //   2) prevented from sitting
-        //   3) @sittp=n restricted (except if @sittp=n was issued by the same prim that's currently force sitting the avie)
-        if ( ( (hasBehaviour(RLV_BHVR_UNSIT)) && (gAgent.getAvatarObject()) && (gAgent.getAvatarObject()->mIsSitting) ) || 
-                 ( (hasBehaviour(RLV_BHVR_SIT)) ) ||
-                 ( (hasBehaviourExcept(RLV_BHVR_SITTP, idObj)) && 
-                   (dist_vec_squared(gAgent.getPositionGlobal(), pObject->getPositionGlobal()) > 1.5f * 1.5f) ))
+        // Checked: 2009-12-18 (RLVa-1.1.0k) | Modified: RLVa-1.1.0i
+        bool RlvHandler::canWearComposite(const LLInventoryCategory* pFolder) const
         {
-                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;
-}
-
-// Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-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;
+                // Sanity check - if there's no folder or no avatar then there is nothing to wear
+                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                if ( (!pFolder) || (!pAvatar) )
+                        return false;
+                // Sanity check - if nothing is locked then we can definitely wear it
+                if ( (!hasBehaviour(RLV_BHVR_ADDOUTFIT)) && (!hasBehaviour(RLV_BHVR_REMOUTFIT)) && (!hasLockedAttachment(RLV_LOCK_ANY)) )
+                        return true;
 
-        LLInventoryModel::cat_array_t  folders;
-        LLInventoryModel::item_array_t items;
-        RlvWearableItemCollector functor(pFolder->getUUID(), fAttach, fMatchAll);
+                LLInventoryModel::cat_array_t folders;
+                LLInventoryModel::item_array_t items;
+                RlvWearableItemCollector functor(pFolder->getUUID(), true, false);
+                gInventory.collectDescendentsIf(pFolder->getUUID(), folders, items, FALSE, functor);
 
-        // Grab a list of all the items we'll be wearing/attaching
-        gInventory.collectDescendentsIf(pFolder->getUUID(), folders, items, FALSE, functor);
+                for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++)
+                {
+                        LLViewerInventoryItem* pItem = items.get(idxItem);
 
-        LLViewerInventoryItem* pItem;
-        for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++)
-        {
-                pItem = items.get(idxItem);
+                        if (RlvForceWear::isWearingItem(pItem))
+                                continue; // Don't examine any items we're already wearing
 
-                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)))
+                        // A wearable layer or attachment point:
+                        //   - can't be "add locked"
+                        //   - can't be worn and "remove locked"
+                        //   - can't be worn and have its item belong to a *different* composite folder that we can't take off
+                        switch (pItem->getType())
+                        {
+                                case LLAssetType::AT_BODYPART:
+                                case LLAssetType::AT_CLOTHING:
+                                        {
+                                                // NOTE: without its asset we don't know what type the wearable is so we need to look at the item's flags instead
+                                                EWearableType wtType = (EWearableType)(pItem->getFlags() & LLInventoryItem::II_FLAGS_WEARABLES_MASK);
+                                                LLViewerInventoryCategory* pFolder;
+                                                if ( (!isWearable(wtType)) ||
+                                                         ( (gAgent.getWearable(wtType)) && (!isRemovable(wtType)) ) ||
+                                                         ( (gRlvHandler.getCompositeInfo(gAgent.getWearableItem(wtType), NULL, &pFolder)) &&
+                                                           (pFolder->getUUID() != pItem->getParentUUID()) && (!gRlvHandler.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
+                                                        return false;
                                                 }
-                                        #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)) ) )
+                                        }
+                                        break;
+                                case LLAssetType::AT_OBJECT:
+                                        {
+                                                // If we made it here then *something* is add/remove locked so we absolutely need to know its attachment point
+                                                LLViewerJointAttachment* pAttachPt = getAttachPoint(pItem, true);
+                                                LLViewerInventoryCategory* pFolder;
+                                                if ( (!pAttachPt) || (isLockedAttachment(pAttachPt, RLV_LOCK_ADD)) ||
+                                                         ( (pAttachPt->getObject()) && (isLockedAttachment(pAttachPt, RLV_LOCK_REMOVE)) ) ||
+                                                         ( (gRlvHandler.getCompositeInfo(pAttachPt->getItemID(), NULL, &pFolder)) &&
+                                                           (pFolder->getUUID() != pItem->getParentUUID()) && (!gRlvHandler.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) &&                                                                                                              // Need a specific attach pt that
-                                                                         ( (!isLockedAttachment(pAttachPt->getObject(), RLV_LOCK_REMOVE)) && // doesn't have locked object
-                                                                           (!isLockedAttachment(pAttachPt, RLV_LOCK_ADD)) ) )                            // and that can be attached to
-                                                                {
-                                                                        RlvAttachmentManager::forceAttach(pItem->getUUID(), getAttachPointIndex(pAttachPt->getName(), true));
-                                                                }
-                                                        }
-                                                        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
+                                                        return false;
                                                 }
-                                        #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);
+                                        }
+                                        break;
+                                default:
+                                        break;
+                        }
                 }
+                return true;
         }
-        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
-                );
-        }
+#endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
 
-        // 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;
-}
+// ============================================================================
+// Event handlers
+//
 
 // (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
+        // Sanity check - getAvatarObject() can't be NULL [see RlvForceWear::isWearingItem()] 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;
 
@@ -2363,7 +1507,7 @@ bool RlvHandler::getWornInfo(const LLInventoryCategory* pFolder, U8& wiFolder, U
                 bool fDirectDescendent = (pFolder->getUUID() == functor.getFoldedParent(pItem->getParentUUID()));
                 U32 &refWorn = (fDirectDescendent) ? cntWorn : cntChildWorn, &refTotal = (fDirectDescendent) ? cntTotal : cntChildTotal;
 
-                if (rlvIsWearingItem(pItem))
+                if (RlvForceWear::isWearingItem(pItem))
                         refWorn++;
                 refTotal++;
         }
@@ -2379,6 +1523,7 @@ bool RlvHandler::getWornInfo(const LLInventoryCategory* pFolder, U8& wiFolder, U
 // Initialization helper functions
 //
 
+// Checked: 2009-11-25 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
 BOOL RlvHandler::setEnabled(BOOL fEnable)
 {
         if (m_fEnabled == fEnable)
@@ -2386,17 +1531,17 @@ BOOL RlvHandler::setEnabled(BOOL 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);
-
+                // Initialize the command lookup table
                 RlvCommand::initLookupTable();
+
+                // Initialize static classes
+                RlvSettings::initClass();
+                RlvStrings::initClass();
+
                 gRlvHandler.m_pAttachMgr = new RlvAttachmentManager();
-                gRlvHandler.addObserver(new RlvExtGetSet());
+                gRlvHandler.addCommandHandler(new RlvExtGetSet());
 
+                // Fetch shared inventory if we're enabled after logon
                 if (LLStartUp::getStartupState() >= STATE_CLEANUP)
                         fetchSharedInventory();
 
@@ -2404,17 +1549,7 @@ BOOL RlvHandler::setEnabled(BOOL fEnable)
         }
         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
@@ -2466,7 +1601,7 @@ void RlvHandler::clearState()
         memset(m_LayersRem, 0, sizeof(S16) * WT_COUNT);
         memset(m_Behaviours, 0, sizeof(S16) * RLV_BHVR_COUNT);
         m_Retained.clear();
-        m_Emitter.clearObservers(); // <- calls delete on all active observers
+        clearCommandHandlers(); // <- calls delete on all registered command handlers
 
         // Clear dynamically allocated memory
         delete m_pGCTimer;
@@ -2481,6 +1616,359 @@ void RlvHandler::clearState()
 // Command handlers (RLV_TYPE_ADD and RLV_TYPE_REMOVE)
 //
 
+#define VERIFY_OPTION(x)                { if (!(x)) { eRet = RLV_RET_FAILED_OPTION; break; } }
+#define VERIFY_OPTION_REF(x)    { if (!(x)) { eRet = RLV_RET_FAILED_OPTION; break; } fRefCount = true; }
+
+// Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+ERlvCmdRet RlvHandler::processAddRemCommand(const LLUUID& idObj, const RlvCommand& rlvCmd)
+{
+        // NOTE: - at this point the command has already been:
+        //            * added to the RlvObject
+        //            * removed from the RlvObject (which still exists at this point even if this is the last restriction)
+        //       - the object's UUID may or may not exist in gObjectList (see handling of @detach=n|y)
+        ERlvBehaviour eBhvr = rlvCmd.getBehaviourType(); ERlvParamType eType = rlvCmd.getParamType();
+
+        ERlvCmdRet eRet = RLV_RET_SUCCESS; bool fRefCount = false, fRefreshHover = false; const std::string& strOption = rlvCmd.getOption();
+        switch (eBhvr)
+        {
+                case RLV_BHVR_DETACH:                           // @detach[:<option>]=n|y
+                        eRet = onAddRemDetach(idObj, rlvCmd, fRefCount);
+                        break;
+                case RLV_BHVR_ADDATTACH:                        // @addattach[:<option>]=n|y
+                case RLV_BHVR_REMATTACH:                        // @addattach[:<option>]=n|y
+                        eRet = onAddRemAttach(idObj, rlvCmd, fRefCount);
+                        break;
+                case RLV_BHVR_ADDOUTFIT:                        // @addoutfit[:<layer>]=n|y                     - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_REMOUTFIT:                        // @remoutfit[:<layer>]=n|y                     - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        {
+                                 // If there's an option it should specify a wearable type name (reference count on no option *and* a valid option)
+                                EWearableType wtType = LLWearable::typeNameToType(strOption);
+                                VERIFY_OPTION_REF( (strOption.empty()) || (WT_INVALID != wtType) );
+
+                                S16* pLayers = (RLV_BHVR_ADDOUTFIT == eBhvr) ? m_LayersAdd : m_LayersRem;
+                                for (int idxType = 0; idxType < WT_COUNT; idxType++)
+                                {
+                                        if ( ((EWearableType)idxType == wtType) || (WT_INVALID == wtType) )
+                                        {
+                                                if (RLV_TYPE_ADD == eType)
+                                                        pLayers[idxType]++;
+                                                else
+                                                        pLayers[idxType]--;
+                                        }
+                                }
+                        }
+                        break;
+                case RLV_BHVR_REDIRCHAT:                        // @redirchat:<channel>=n|y                     - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_REDIREMOTE:                       // @rediremote:<channel>=n|y            - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        {
+                                // There should be an option and it should specify a valid reply channel (if there's an empty option the command is invalid)
+                                S32 nChannel = 0;
+                                VERIFY_OPTION_REF( (LLStringUtil::convertToS32(strOption, nChannel)) && (rlvIsValidReplyChannel(nChannel)) );
+
+                                if (RLV_TYPE_ADD == eType)
+                                        addException(idObj, eBhvr, nChannel);
+                                else
+                                        removeException(idObj, eBhvr, nChannel);
+                        }
+                        break;
+                case RLV_BHVR_SENDCHANNEL:                      // @sendchannel[:<channel>]=n|y         - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        {
+                                // If there's an option then it should be a valid (= positive and non-zero) chat channel (only reference count empty option)
+                                S32 nChannel = 0;
+                                if ( (LLStringUtil::convertToS32(strOption, nChannel)) && (nChannel > 0) )
+                                {
+                                        if (RLV_TYPE_ADD == eType)
+                                                addException(idObj, eBhvr, nChannel);
+                                        else
+                                                removeException(idObj, eBhvr, nChannel);
+                                        break;
+                                }
+                                VERIFY_OPTION_REF(strOption.empty());
+                        }
+                        break;
+                case RLV_BHVR_NOTIFY:                           // @notify:<params>=add|rem                     - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        {
+                                // There should be an option that we can successfully parse (if there's an empty option the command is invalid)
+                                S32 nChannel; std::string strFilter;
+                                VERIFY_OPTION_REF( (!strOption.empty()) && (rlvParseNotifyOption(strOption, nChannel, strFilter)) );
+
+                                if (RLV_TYPE_ADD == eType)
+                                {
+                                        if (!m_pBhvrNotify)
+                                                addBehaviourObserver(m_pBhvrNotify = new RlvBehaviourNotifyObserver());
+                                        m_pBhvrNotify->addNotify(idObj, nChannel, strFilter);
+                                }
+                                else if (m_pBhvrNotify)
+                                {
+                                        m_pBhvrNotify->removeNotify(idObj, nChannel, strFilter);
+                                        if (!m_pBhvrNotify->hasNotify())
+                                        {
+                                                removeBehaviourObserver(m_pBhvrNotify);
+                                                delete m_pBhvrNotify;
+                                                m_pBhvrNotify = NULL;
+                                        }
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SHOWINV:                          // @showinv=n|y                                         - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        {
+                                VERIFY_OPTION_REF(strOption.empty());
+
+                                if (RLV_TYPE_ADD == eType)
+                                {
+                                        // Close all open inventory windows
+                                        LLInventoryView::closeAll();
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SHOWMINIMAP:                      // @showminimap=n|y                                     - Checked: 2009-12-05 (RLVa-1.1.0g) | Modified: RLVa-1.1.0g
+                        {
+                                VERIFY_OPTION_REF(strOption.empty());
+
+                                if (RLV_TYPE_ADD == eType)
+                                {
+                                        // Simulate clicking the Minimap button [see LLToolBar::onClickRadar()]
+                                        #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
+                                                if (gFloaterMap->getVisible())
+                                                        LLFloaterMap::toggle(NULL);
+                                        #else                                                                                           // Version: 1.23.4
+                                                if (LLFloaterMap::instanceVisible())
+                                                        LLFloaterMap::hideInstance();
+                                        #endif
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SHOWWORLDMAP:                     // @showworldmap=n|y                            - Checked: 2009-12-05 (RLVa-1.1.0g) | Modified: RLVa-1.1.0g
+                        {
+                                VERIFY_OPTION_REF(strOption.empty());
+
+                                if (RLV_TYPE_ADD == eType)
+                                {
+                                        // Simulate clicking the Map button [see LLToolBar::onClickMap()]
+                                        if (gFloaterWorldMap->getVisible())
+                                                LLFloaterWorldMap::toggle(NULL);
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SHOWLOC:                          // @showloc=n|y                                         - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        {
+                                VERIFY_OPTION_REF(strOption.empty());
+
+                                if (RLV_TYPE_ADD == eType)
+                                {
+                                        // If this is the first @showloc=n restriction refresh all object text so we can filter it if necessary
+                                        fRefreshHover = (0 == m_Behaviours[RLV_BHVR_SHOWLOC]);
+
+                                        // 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
+                                }
+                                else
+                                {
+                                        // If this is the last @showloc=n restriction refresh all object text in case anything needs restoring
+                                        fRefreshHover = (1 == m_Behaviours[RLV_BHVR_SHOWLOC]);
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SHOWNAMES:                        // @shownames=n|y                                       - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        {
+                                VERIFY_OPTION_REF(strOption.empty());
+
+                                if (RLV_TYPE_ADD == eType)
+                                {
+                                        // If this is the first @shownames=n restriction refresh all object text so we can filter it if necessary
+                                        fRefreshHover = (0 == m_Behaviours[RLV_BHVR_SHOWNAMES]);
+
+                                        // Close the "Active Speakers" panel if it's currently visible
+                                        LLFloaterChat::getInstance()->childSetVisible("active_speakers_panel", false);
+                                }
+                                else
+                                {
+                                        // If this is the last @shownames=n restriction refresh all object text in case anything needs restoring
+                                        fRefreshHover = (1 == m_Behaviours[RLV_BHVR_SHOWNAMES]);
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SHOWHOVERTEXTALL:         // @showhovertextall=n|y                        - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_SHOWHOVERTEXTWORLD:       // @showhovertextworld=n|y                      - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_SHOWHOVERTEXTHUD:         // @showhovertexthud=n|y                        - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        {
+                                VERIFY_OPTION_REF(strOption.empty());
+
+                                // Refresh all object text on the first/last add/rem(LLHUDText::setStringUTF8() decides what needs clearing and what doesn't)
+                                fRefreshHover = ((RLV_TYPE_ADD == eType) && (0 == m_Behaviours[eBhvr])) ||
+                                                    ((RLV_TYPE_REMOVE == eType) && (1 == m_Behaviours[eBhvr]));
+                        }
+                        break;
+                case RLV_BHVR_SHOWHOVERTEXT:            // @showhovertext:<uuid>=n|y            - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        {
+                                // There should be an option and it should specify a valid UUID
+                                LLUUID idException(strOption);
+                                VERIFY_OPTION_REF(idException.notNull());
+
+                                if (RLV_TYPE_ADD == eType)
+                                        addException(idObj, eBhvr, idException);
+                                else
+                                        removeException(idObj, eBhvr, idException);
+
+                                // Clear/restore the object's hover text as needed
+                                LLViewerObject* pObj = gObjectList.findObject(idException);
+                                if ( (pObj) && (pObj->mText.notNull()) && (!pObj->mText->getObjectText().empty()) )
+                                        pObj->mText->setStringUTF8( (RLV_TYPE_ADD == eType) ? "" : pObj->mText->getObjectText());
+                        }
+                        break;
+                case RLV_BHVR_EDIT:                                     // @edit=n|y                                            - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        {
+                                VERIFY_OPTION_REF(strOption.empty());
+
+                                if (RLV_TYPE_ADD == eType)
+                                {
+                                        // 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;
+#ifdef RLV_EXTENSION_CMD_TOUCHXXX
+                case RLV_BHVR_TOUCH:                            // @touch:<uuid>=n                                      - Checked: 2010-01-01 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
+                        {
+                                // There should be an option and it should specify a valid UUID
+                                LLUUID idException(strOption);
+                                VERIFY_OPTION_REF(idException.notNull());
+
+                                if (RLV_TYPE_ADD == eType)
+                                        addException(idObj, eBhvr, idException);
+                                else
+                                        removeException(idObj, eBhvr, idException);
+                        }
+                        break;
+#endif // RLV_EXTENSION_CMD_TOUCHXXX
+                case RLV_BHVR_FLY:                                      // @fly=n|y                                                     - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        {
+                                VERIFY_OPTION_REF(strOption.empty());
+
+                                if (RLV_TYPE_ADD == eType)
+                                        gAgent.setFlying(FALSE);
+                        }
+                        break;
+                case RLV_BHVR_SETENV:                           // @setenv=n|y
+                        eRet = onAddRemSetEnv(idObj, rlvCmd, fRefCount);
+                        break;
+                // The following block is only valid if there's no option
+                case RLV_BHVR_EMOTE:                            // @emote=n|y                                           - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_SENDCHAT:                         // @sendchat=n|y                                        - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_CHATWHISPER:                      // @chatwhisper=n|y                                     - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_CHATNORMAL:                       // @chatnormal=n|y                                      - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_CHATSHOUT:                        // @chatshout=n|y                                       - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_PERMISSIVE:                       // @permissive=n|y                                      - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_TPLM:                                     // @tplm=n|y                                            - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_TPLOC:                            // @tploc=n|y                                           - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_VIEWNOTE:                         // @viewnote=n|y                                        - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_VIEWSCRIPT:                       // @viewscript=n|y                                      - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_VIEWTEXTURE:                      // @viewtexture=n|y                                     - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_ACCEPTPERMISSION:         // @acceptpermission=n|y                        - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_DEFAULTWEAR:                      // @defaultwear=n|y                                     - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+#ifdef RLV_EXTENSION_CMD_ALLOWIDLE
+                case RLV_BHVR_ALLOWIDLE:                        // @allowidle=n|y                                       - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+#endif // RLV_EXTENSION_CMD_ALLOWIDLE
+                case RLV_BHVR_REZ:                                      // @rez=n|y                                                     - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_FARTOUCH:                         // @fartouch=n|y                                        - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+#ifdef RLV_EXTENSION_CMD_INTERACT
+                case RLV_BHVR_INTERACT:                         // @interact=n|y                                        - Checked: 2010-01-01 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
+#endif // RLV_EXTENSION_CMD_INTERACT
+                case RLV_BHVR_UNSIT:                            // @unsit=n|y                                           - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_SIT:                                      // @sit=n|y                                                     - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_SITTP:                            // @sittp=n|y                                           - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_SETDEBUG:                         // @setdebug=n|y                                        - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                        VERIFY_OPTION_REF(strOption.empty());
+                        break;
+                // The following block is only valid if there's no option (= restriction) or if it specifies a valid UUID (= behaviour exception)
+                case RLV_BHVR_RECVCHAT:                         // @recvchat[:<uuid>]=n|y                       - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_RECVEMOTE:                        // @recvemote[:<uuid>]=n|y                      - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_SENDIM:                           // @sendim[:<uuid>]=n|y                         - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_RECVIM:                           // @recvim[:<uuid>]=n|y                         - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_TPLURE:                           // @tplure[:<uuid>]=n|y                         - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+                case RLV_BHVR_ACCEPTTP:                         // @accepttp[:<uuid>]=n|y                       - Checked: 2009-12-05 (RLVa-1.1.0h) | Modified: RLVa-1.1.0h
+#ifdef RLV_EXTENSION_CMD_TOUCHXXX
+                case RLV_BHVR_TOUCHWORLD:                       // @touchworld[:<uuid>=n|y                      - Checked: 2010-01-01 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
+                case RLV_BHVR_TOUCHATTACH:                      // @touchattach[:<uuid>=n|y                     - Checked: 2010-01-01 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
+                case RLV_BHVR_TOUCHHUD:                         // @touchhud[:<uuid>=n|y                        - Checked: 2010-01-01 (RLVa-1.1.0l) | Added: RLVa-1.1.0l
+#endif // RLV_EXTENSION_CMD_TOUCHXXX
+                        {
+                                LLUUID idException(strOption);
+                                if (idException.notNull())              // If there's an option then it should specify a valid UUID
+                                {
+                                        if (RLV_TYPE_ADD == eType)
+                                                addException(idObj, eBhvr, idException);
+                                        else
+                                                removeException(idObj, eBhvr, idException);
+                                        break;
+                                }
+                                VERIFY_OPTION_REF(strOption.empty());
+                        }
+                        break;
+                case RLV_BHVR_UNKNOWN:
+                        // Pass unknown commands on to registered command handlers
+                        return (notifyCommandHandlers(&RlvCommandHandler::onAddRemCommand, idObj, rlvCmd, eRet, false)) ? eRet : RLV_RET_FAILED_UNKNOWN;
+                default:
+                        // Fail with "Invalid param" if none of the above handled it
+                        eRet = RLV_RET_FAILED_PARAM;
+                        break;
+        }
+
+        // If this command represents a behaviour restriction that's been added/removed then we need to do some additional processing
+        if ( (RLV_RET_SUCCESS == eRet) && (fRefCount) )
+        {
+                if (RLV_TYPE_ADD == eType)
+                {
+                        if (rlvCmd.isStrict())
+                                addException(idObj, RLV_BHVR_PERMISSIVE, eBhvr);
+                        m_Behaviours[eBhvr]++;
+                }
+                else
+                {
+                        if (rlvCmd.isStrict())
+                                removeException(idObj, RLV_BHVR_PERMISSIVE, eBhvr);
+                        m_Behaviours[eBhvr]--;
+                }
+
+                // Since canShowHoverText() uses hasBehaviour() refreshing object text needs to wait until after we've reference counted
+                if (fRefreshHover)
+                        LLHUDText::refreshAllObjectText();
+
+                // Since RlvSettings::updateLoginLastLocation() uses hasBehaviour() it needs to be called after we've reference counted
+                #ifdef RLV_EXTENSION_STARTLOCATION
+                        RlvSettings::updateLoginLastLocation();
+                #endif // RLV_EXTENSION_STARTLOCATION
+
+                // Show an - optional - notification on every global behaviour change
+                #ifdef RLV_EXTENSION_NOTIFY_BEHAVIOUR
+                if ( ((RLV_TYPE_ADD == eType) && (1 == m_Behaviours[eBhvr])) || (0 == m_Behaviours[eBhvr]) )
+                        RlvNotifications::notifyBehaviour(eBhvr, eType);
+                #endif // RLV_EXTENSION_NOTIFY_BEHAVIOUR
+        }
+
+        return eRet;
+}
+
 // Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
 ERlvCmdRet RlvHandler::onAddRemAttach(const LLUUID& idObj, const RlvCommand& rlvCmd, bool& fRefCount)
 {
@@ -2511,10 +1999,10 @@ ERlvCmdRet RlvHandler::onAddRemAttach(const LLUUID& idObj, const RlvCommand& rlv
                 LLPipeline::sShowHUDAttachments = TRUE;
 
         fRefCount = rlvCmd.getOption().empty(); // Only reference count global locks
-        return RLV_RET_NOERROR;
+        return RLV_RET_SUCCESS;
 }
 
-// Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
+// Checked: 2010-07-18 (RLVa-1.1.2b) | Modified: RLVa-1.1.2a
 ERlvCmdRet RlvHandler::onAddRemDetach(const LLUUID& idObj, const RlvCommand& rlvCmd, bool& fRefCount)
 {
         S32 idxAttachPt = 0;
@@ -2526,7 +2014,7 @@ ERlvCmdRet RlvHandler::onAddRemDetach(const LLUUID& idObj, const RlvCommand& rlv
                 //   * @detach=y: - if it ever rezzed as an attachment we'll have cached its attach point 
                 //                - if it never rezzed as an attachment there won't be a lock to remove
                 rlv_object_map_t::const_iterator itObj = m_Objects.find(idObj);
-                if (itObj != m_Objects.end())
+                if ( (itObj != m_Objects.end()) && (itObj->second.m_fLookup) && (itObj->second.m_idxAttachPt) )
                         idxAttachPt = itObj->second.m_idxAttachPt;
         }
         else                                                    // @detach:<attachpt>=n|y
@@ -2536,7 +2024,7 @@ ERlvCmdRet RlvHandler::onAddRemDetach(const LLUUID& idObj, const RlvCommand& rlv
 
         // The attach point can be zero for @detach=n|y (i.e. non-attachment) but should always be non-zero for @detach:<attachpt>=n|y
         if (0 == idxAttachPt)
-                return (rlvCmd.getOption().empty()) ? RLV_RET_NOERROR : RLV_RET_FAILED_OPTION;
+                return (rlvCmd.getOption().empty()) ? RLV_RET_SUCCESS : RLV_RET_FAILED_OPTION;
 
         // Actually lock the attachment point (@detach=n locks remove only; @detach:<attachpt>=n locks both remove and add)
         ERlvLockMask eLock = (rlvCmd.getOption().empty()) ? RLV_LOCK_REMOVE : (ERlvLockMask)(RLV_LOCK_ADD | RLV_LOCK_REMOVE);
@@ -2550,67 +2038,726 @@ ERlvCmdRet RlvHandler::onAddRemDetach(const LLUUID& idObj, const RlvCommand& rlv
                 LLPipeline::sShowHUDAttachments = TRUE;
 
         fRefCount = false;      // Don't reference count @detach[:<option>]=n
-        return RLV_RET_NOERROR;
+        return RLV_RET_SUCCESS;
 }
 
-// ============================================================================
-// Command handlers (RLV_TYPE_FORCE)
-//
-
-// Checked: 2009-10-12 (RLVa-1.0.5b) | Modified: RLVa-1.0.5b
-ERlvCmdRet RlvHandler::onForceDetach(const LLUUID& idObj, const RlvCommand& rlvCmd) const
+// Checked: 2009-12-05 (RLVa-1.1.0h) | Added: RLVa-1.1.0h
+ERlvCmdRet RlvHandler::onAddRemSetEnv(const LLUUID& idObj, const RlvCommand& rlvCmd, bool& fRefCount)
 {
-        // TODO-RLVA: this still needs a rewrite to conform to the new event handler system
-        if ( (rlvCmd.getOption().empty()) || (getAttachPointIndex(rlvCmd.getOption(), true)) )
+        // Sanity check - there shouldn't be an option
+        if (!rlvCmd.getOption().empty())
+                return RLV_RET_FAILED_OPTION;
+        if (RlvSettings::getNoSetEnv())
+                return RLV_RET_FAILED_DISABLED;
+
+        if (RLV_TYPE_ADD == rlvCmd.getParamType())
         {
-                onForceRemAttach(idObj, rlvCmd);
+                // 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" << RLV_ENDL; // Safety net in case we set @setenv=n for more than 1 object
+                        delete m_pWLSnapshot;
+                }
+                m_pWLSnapshot = RlvWLSnapshot::takeSnapshot();
         }
         else
         {
-                // Force detach single folder
-                onForceWear(rlvCmd.getOption(), false, false);
+                // Restore WindLight parameters to what they were before @setenv=n was issued
+                RlvWLSnapshot::restoreSnapshot(m_pWLSnapshot);
+                delete m_pWLSnapshot;
+                m_pWLSnapshot = NULL;
         }
+        fRefCount = true;
+        return RLV_RET_SUCCESS;
+}
+
+// ============================================================================
+// Command handlers (RLV_TYPE_FORCE)
+//
+
+// Checked: 2009-12-21 (RLVa-1.1.0j) | Modified: RLVa-1.1.0j
+ERlvCmdRet RlvHandler::processForceCommand(const LLUUID& idObj, const RlvCommand& rlvCmd) const
+{
+        RLV_ASSERT(RLV_TYPE_FORCE == rlvCmd.getParamType());
+
+        ERlvCmdRet eRet = RLV_RET_SUCCESS;
+        switch (rlvCmd.getBehaviourType())
+        {
+                case RLV_BHVR_DETACH:           // @detach[:<option>]=force             - Checked: 2009-12-21 (RLVa-1.1.0k) | Modified: RLVa-1.1.0j
+                        eRet = onForceRemAttach(idObj, rlvCmd);
+                        if (RLV_RET_SUCCESS != eRet)
+                                eRet = onForceWear(rlvCmd.getOption(), false, false);
+                        break;
+                case RLV_BHVR_REMATTACH:        // @remattach[:<option>]=force
+                        eRet = onForceRemAttach(idObj, rlvCmd);
+                        break;
+                case RLV_BHVR_REMOUTFIT:        // @remoutfit[:<option>]=force
+                        eRet = onForceRemOutfit(idObj, rlvCmd);
+                        break;
+                case RLV_BHVR_UNSIT:            // @unsit=force                                 - Checked: 2009-12-21 (RLVa-1.1.0k) | Modified: RLVa-0.2.0g
+                        {
+                                VERIFY_OPTION(rlvCmd.getOption().empty());
+                                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                                if ( (pAvatar) && (pAvatar->mIsSitting) && (!hasBehaviourExcept(RLV_BHVR_UNSIT, idObj)) )
+                                {
+                                        gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+                                        send_agent_update(TRUE, TRUE);  // See behaviour notes on why we have to force an agent update here
+                                }
+                        }
+                        break;
+                case RLV_BHVR_SIT:                      // @sit:<option>=force
+                        eRet = onForceSit(idObj, rlvCmd);
+                        break;
+                case RLV_BHVR_TPTO:                     // @tpto:<option>=force                 - Checked: 2009-07-12 (RLVa-1.0.0k) | Modified: RLVa-1.0.0h
+                        {
+                                eRet = RLV_RET_FAILED_OPTION;
+                                if ( (!rlvCmd.getOption().empty()) && (std::string::npos == rlvCmd.getOption().find_first_not_of("0123456789/.")) )
+                                {
+                                        LLVector3d posGlobal;
 
-        return RLV_RET_NOERROR;
+                                        boost_tokenizer tokens(rlvCmd.getOption(), boost::char_separator<char>("/", "", boost::keep_empty_tokens)); int idx = 0;
+                                        for (boost_tokenizer::const_iterator itToken = tokens.begin(); itToken != tokens.end(); ++itToken)
+                                        {
+                                                if (idx < 3)
+                                                        LLStringUtil::convertToF64(*itToken, posGlobal[idx++]);
+                                        }
+
+                                        if (idx == 3)
+                                        {
+                                                gAgent.teleportViaLocation(posGlobal);
+                                                eRet = RLV_RET_SUCCESS;
+                                        }
+                                }
+                        }
+                        break;
+                case RLV_BHVR_ADDOUTFIT:        // @addoutfit:<option>=force <- synonym of @attach:<option>=force
+                case RLV_BHVR_ATTACH:           // @attach:<option>=force
+                        eRet = onForceWear(rlvCmd.getOption(), true, false);    // Force attach single folder
+                        break;
+                case RLV_BHVR_ATTACHALL:        // @attachall:<option>=force
+                        eRet = onForceWear(rlvCmd.getOption(), true, true);             // Force attach nested folders
+                        break;
+                case RLV_BHVR_DETACHALL:        // @detachall:<option>=force
+                        eRet = onForceWear(rlvCmd.getOption(), false, true);    // Force detach nested folders
+                        break;
+                case RLV_BHVR_ATTACHTHIS:       // @attachthis[:<option>]=force
+                case RLV_BHVR_ATTACHALLTHIS:// @attachallthis[:<option>]=force
+                case RLV_BHVR_DETACHTHIS:       // @detachthis[:<option>]=force
+                case RLV_BHVR_DETACHALLTHIS:// @detachallthis[:<option>]=force
+                        {
+                                ERlvBehaviour eBehaviour = rlvCmd.getBehaviourType(); std::string strReply;
+                                if ( ((eRet = onGetPath(idObj, rlvCmd, strReply)) == RLV_RET_SUCCESS) && (!strReply.empty()) )
+                                {
+                                        LLStringUtil::toLower(strReply);
+                                        eRet = 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:
+                        {
+                                // NOTE: @detachme=force could be seen as a @detach:<attachpt>=force but RLV implements it as a "detach by UUID"
+                                VERIFY_OPTION(rlvCmd.getOption().empty());
+                                LLViewerObject* pObj = NULL; LLVOAvatar* pAvatar = NULL; LLViewerJointAttachment* pAttachPt = NULL;
+                                if ( ((pObj = gObjectList.findObject(idObj)) != NULL) && (pObj->isAttachment()) &&
+                                         ((pAvatar = gAgent.getAvatarObject()) != NULL) &&
+                                         ((pAttachPt = pAvatar->getTargetAttachmentPoint(pObj->getRootEdit())) != NULL) )
+                                {
+                                        // @detachme should respect locks but shouldn't respect things like nostrip so handle it like a manual user detach
+                                        handle_detach_from_avatar(pAttachPt);
+                                }
+                        }
+                        break;
+                case RLV_BHVR_UNKNOWN:
+                        // Pass unknown commands on to registered command handlers
+                        return (notifyCommandHandlers(&RlvCommandHandler::onForceCommand, idObj, rlvCmd, eRet, false)) ? eRet : RLV_RET_FAILED_UNKNOWN;
+                default:
+                        // Fail with "Invalid param" if none of the above handled it
+                        eRet = RLV_RET_FAILED_PARAM;
+                        break;
+        }
+        return eRet;
 }
 
-// Checked: 2009-10-12 (RLVa-1.0.5b) | Added: RLVa-1.0.5b
+// Checked: 2009-11-24 (RLVa-1.1.0k) | Modified: RLVa-1.1.0e
 ERlvCmdRet RlvHandler::onForceRemAttach(const LLUUID& idObj, const RlvCommand& rlvCmd) const
 {
-        S32 idxAttachPt = 0;
-        if (rlvCmd.getOption().empty())
+        RLV_ASSERT(RLV_TYPE_FORCE == rlvCmd.getParamType());
+        RLV_ASSERT( (RLV_BHVR_REMATTACH == rlvCmd.getBehaviourType()) || (RLV_BHVR_DETACH == rlvCmd.getBehaviourType()) );
+
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        if (!pAvatar)
+                return RLV_RET_FAILED;
+
+        S32 idxAttachPt = 0; ERlvAttachGroupType eAttachGroup = RLV_ATTACHGROUP_INVALID;
+        // @remattach:<attachpt>=force - force detach single worn attachment
+        if ((idxAttachPt = getAttachPointIndex(rlvCmd.getOption(), true)) != 0)
         {
-                // Simulate right-click / Take Off > Detach All
-                LLAgent::userRemoveAllAttachments(NULL);
-                return RLV_RET_NOERROR;
+                LLViewerJointAttachment* pAttachPt = get_if_there(pAvatar->mAttachmentPoints, (S32)idxAttachPt, (LLViewerJointAttachment*)NULL);
+                if (pAttachPt)
+                {
+                        RlvForceWear rlvWear;
+                        rlvWear.forceDetach(pAttachPt);
+                        rlvWear.done();
+                }
+                return RLV_RET_SUCCESS;
         }
-        else if ((idxAttachPt = getAttachPointIndex(rlvCmd.getOption(), true)) != 0)
+        // @remattach:<group>=force - force detach worn attachments belonging to <group>
+        // @remattach=force         - force detach all worn attachments
+        else if ( ((eAttachGroup = rlvGetAttachGroupTypeFromString(rlvCmd.getOption())) != RLV_ATTACHGROUP_INVALID) ||
+                      (rlvCmd.getOption().empty()) )
         {
-                // 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)idxAttachPt, (LLViewerJointAttachment*)NULL)) != NULL) &&
-                         (isStrippable(pAttachmentPt->getItemID())) )           // ... and that it's not marked as "nostrip"
+                RlvForceWear rlvWear;
+                for (LLVOAvatar::attachment_map_t::const_iterator itAttach = pAvatar->mAttachmentPoints.begin();
+                                itAttach != pAvatar->mAttachmentPoints.end(); ++itAttach)
                 {
-                        #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()))
+                        LLViewerJointAttachment* pAttachPt = itAttach->second;
+                        if ( (pAttachPt) && (pAttachPt->getObject()) &&
+                                 ((RLV_ATTACHGROUP_INVALID == eAttachGroup) || (rlvGetAttachGroupTypeFromIndex(pAttachPt->getGroup()) == eAttachGroup)) )
+                        {
+                                rlvWear.forceDetach(pAttachPt);
+                        }
+                }
+                rlvWear.done();
+                return RLV_RET_SUCCESS;
+        }
+        return RLV_RET_FAILED_OPTION;
+}
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Modified: RLVa-1.1.0i
+ERlvCmdRet RlvHandler::onForceRemOutfit(const LLUUID& idObj, const RlvCommand& rlvCmd) const
+{
+        EWearableType wtOption = LLWearable::typeNameToType(rlvCmd.getOption()), wtType;
+        if ( (WT_INVALID == wtOption) && (!rlvCmd.getOption().empty()) )
+                return RLV_RET_FAILED_OPTION;
+
+        RlvForceWear rlvWear;
+        for (int idxType = 0; idxType < WT_COUNT; idxType++)
+        {
+                wtType = (EWearableType)idxType;
+                if ( (wtType == wtOption) || (WT_INVALID == wtOption) )
+                        rlvWear.forceRemove(wtType);
+        }
+        rlvWear.done();
+        return RLV_RET_SUCCESS;
+}
+
+// Checked: 2009-12-21 (RLVa-1.1.0j) | Modified: RLVa-1.1.0j
+ERlvCmdRet RlvHandler::onForceSit(const LLUUID& idObj, const RlvCommand& rlvCmd) const
+{
+        LLViewerObject* pObj = NULL; LLUUID idTarget(rlvCmd.getOption());
+        // Sanity checking - we need to know about the object and it should identify a prim/linkset
+        if ( (idTarget.isNull()) || ((pObj = gObjectList.findObject(idTarget)) == NULL) || (LL_PCODE_VOLUME != pObj->getPCode()) )
+                return RLV_RET_FAILED_OPTION;
+
+        if (!canSit(pObj))
+                return RLV_RET_FAILED_LOCK;
+
+        // 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, pObj->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);
+        pObj->getRegion()->sendReliableMessage();
+
+        return RLV_RET_SUCCESS;
+}
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Modified: RLVa-1.1.0i
+ERlvCmdRet RlvHandler::onForceWear(const std::string& strPath, bool fAttach, bool fMatchAll) const
+{
+        LLViewerInventoryCategory* pFolder = getSharedFolder(strPath), *pRlvRoot = getSharedRoot();
+        if ( (!pFolder) || (pFolder->getUUID() == pRlvRoot->getUUID()) )
+                return (pRlvRoot != NULL) ? RLV_RET_FAILED_OPTION : RLV_RET_FAILED_NOSHAREDROOT;
+
+        RlvForceWear rlvWear;
+        rlvWear.forceFolder(pFolder,
+                (fAttach) ? RlvForceWear::ACTION_ATTACH : RlvForceWear::ACTION_DETACH,
+                (fMatchAll) ? (RlvForceWear::eWearFlags)(RlvForceWear::FLAG_DEFAULT | RlvForceWear::FLAG_MATCHALL) : (RlvForceWear::FLAG_DEFAULT));
+        rlvWear.done();
+
+        return RLV_RET_SUCCESS;
+}
+
+// ============================================================================
+// Command handlers (RLV_TYPE_REPLY)
+//
+
+// Checked: 2009-11-26 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+ERlvCmdRet RlvHandler::processReplyCommand(const LLUUID& idObj, const RlvCommand& rlvCmd) const
+{
+        RLV_ASSERT(RLV_TYPE_REPLY == rlvCmd.getParamType());
+
+        // Sanity check - <param> should specify a - valid - reply channel
+        S32 nChannel;
+        if ( (!LLStringUtil::convertToS32(rlvCmd.getParam(), nChannel)) || (!rlvIsValidReplyChannel(nChannel)) )
+                return RLV_RET_FAILED_PARAM;
+
+        ERlvCmdRet eRet = RLV_RET_SUCCESS; std::string strReply;
+        switch (rlvCmd.getBehaviourType())
+        {
+                case RLV_BHVR_VERSION:                  // @version=<channel>                                   - Checked: 2010-03-27 (RLVa-1.2.0b)
+                case RLV_BHVR_VERSIONNEW:               // @versionnew=<channel>                                - Checked: 2010-03-27 (RLVa-1.2.0b) | Added: RLVa-1.2.0b
+                        // NOTE: RLV will respond even if there's an option
+                        strReply = RlvStrings::getVersion(RLV_BHVR_VERSION == rlvCmd.getBehaviourType());
+                        break;
+                case RLV_BHVR_VERSIONNUM:               // @versionnum=<channel>                                - Checked: 2009-11-26 (RLVa-1.1.0f) | Added: RLVa-1.0.4b
+                        // NOTE: RLV will respond even if there's an option
+                        strReply = RlvStrings::getVersionNum();
+                        break;
+                case RLV_BHVR_GETATTACH:                // @getattach[:<layer>]=<channel>
+                        eRet = onGetAttach(idObj, rlvCmd, strReply);
+                        break;
+#ifdef RLV_EXTENSION_CMD_GETXXXNAMES
+                case RLV_BHVR_GETATTACHNAMES:   // @getattachnames[:<grp>]=<channel>
+                case RLV_BHVR_GETADDATTACHNAMES:// @getaddattachnames[:<grp>]=<channel>
+                case RLV_BHVR_GETREMATTACHNAMES:// @getremattachnames[:<grp>]=<channel>
+                        eRet = onGetAttachNames(idObj, rlvCmd, strReply);
+                        break;
+#endif // RLV_EXTENSION_CMD_GETXXXNAMES
+                case RLV_BHVR_GETOUTFIT:                // @getoutfit[:<layer>]=<channel>
+                        eRet = onGetOutfit(idObj, rlvCmd, strReply);
+                        break;
+#ifdef RLV_EXTENSION_CMD_GETXXXNAMES
+                case RLV_BHVR_GETOUTFITNAMES:   // @getoutfitnames=<channel>
+                case RLV_BHVR_GETADDOUTFITNAMES:// @getaddoutfitnames=<channel>
+                case RLV_BHVR_GETREMOUTFITNAMES:// @getremoutfitnames=<channel>
+                        eRet = onGetOutfitNames(idObj, rlvCmd, strReply);
+                        break;
+#endif // RLV_EXTENSION_CMD_GETXXXNAMES
+                case RLV_BHVR_FINDFOLDER:               // @findfolder:<criteria>=<channel>
+#ifdef RLV_EXTENSION_CMD_FINDFOLDERS
+                case RLV_BHVR_FINDFOLDERS:              // @findfolders:<criteria>=<channel>
+#endif // RLV_EXTENSION_CMD_FINDFOLDERS
+                        eRet = onFindFolder(idObj, rlvCmd, strReply);
+                        break;
+                case RLV_BHVR_GETPATH:                  // @getpath[:<option>]=<channel>
+                        eRet = onGetPath(idObj, rlvCmd, strReply);
+                        break;
+                case RLV_BHVR_GETINV:                   // @getinv[:<path>]=<channel>
+                        eRet = onGetInv(idObj, rlvCmd, strReply);
+                        break;
+                case RLV_BHVR_GETINVWORN:               // @getinvworn[:path]=<channel>
+                        eRet = onGetInvWorn(idObj, rlvCmd, strReply);
+                        break;
+                case RLV_BHVR_GETSITID:                 // @getsitid=<channel>                                  - Checked: 2009-11-26 (RLVa-1.1.0f)
+                        {
+                                // NOTE: RLV 1.16.1 returns a NULL UUID if we're not sitting
+                                LLVOAvatar* pAvatar = gAgent.getAvatarObject(); LLUUID idSitObj;
+                                if ( (pAvatar) && (pAvatar->mIsSitting) )
                                 {
-                                        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));
+                                        // LLVOAvatar inherits from 2 classes so make sure we get the right vfptr
+                                        LLViewerObject* pAvatarObj = dynamic_cast<LLViewerObject*>(pAvatar), *pParent;
+                                        // (If there is a parent, we need to upcast it from LLXform to LLViewerObject to get its UUID)
+                                        if ( (pAvatarObj) && ((pParent = static_cast<LLViewerObject*>(pAvatarObj->getRoot())) != pAvatarObj) )
+                                                idSitObj = pParent->getID();
                                 }
-                                else
-                        #endif // RLV_EXPERIMENTAL_COMPOSITES
+                                strReply = idSitObj.asString();
+                        }
+                        break;
+                case RLV_BHVR_GETSTATUS:                // @getstatus[:<option>]=<channel>              - Checked: 2009-11-26 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+                        {
+                                // 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(idObj);
+                                if (itObj != m_Objects.end())
+                                        strReply = itObj->second.getStatusString(rlvCmd.getOption());
+                        }
+                        break;
+                case RLV_BHVR_GETSTATUSALL:             // @getstatusall[:<option>]=<channel>   - Checked: 2009-11-26 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+                        {
+                                // NOTE: specification says response should start with '/' but RLV-1.16.1 returns an empty string when no rules are set
+                                for (rlv_object_map_t::const_iterator itObj = m_Objects.begin(); itObj != m_Objects.end(); ++itObj)
+                                        strReply += itObj->second.getStatusString(rlvCmd.getOption());
+                        }
+                        break;
+                case RLV_BHVR_UNKNOWN:
+                        // Pass unknown commands on to registered command handlers
+                        return (notifyCommandHandlers(&RlvCommandHandler::onReplyCommand, idObj, rlvCmd, eRet, false)) ? eRet : RLV_RET_FAILED_UNKNOWN;
+                default:
+                        // Fail with "Invalid param" if none of the above handled it
+                        return RLV_RET_FAILED_PARAM;
+        }
+
+        // If we made it this far then:
+        //   - the command was handled successfully so we send off the response
+        //   - the command failed but we still send off an (empty) response to keep the issuing script from blocking
+        rlvSendChatReply(nChannel, strReply);
+
+        return eRet;
+}
+
+// Checked: 2009-11-24 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+ERlvCmdRet RlvHandler::onFindFolder(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const
+{
+        RLV_ASSERT(RLV_TYPE_REPLY == rlvCmd.getParamType());
+        RLV_ASSERT( (RLV_BHVR_FINDFOLDER == rlvCmd.getBehaviourType()) || (RLV_BHVR_FINDFOLDERS == rlvCmd.getBehaviourType()) );
+
+        // (Compatibility: RLV 1.16.1 returns the first random folder it finds while we return a blank on no option)
+        if (rlvCmd.getOption().empty())
+                return RLV_RET_FAILED_OPTION;
+
+        LLInventoryModel::cat_array_t folders;
+        if (findSharedFolders(rlvCmd.getOption(), folders))
+        {
+                if (RLV_BHVR_FINDFOLDER == rlvCmd.getBehaviourType())
+                {
+                        // We need to return an "in depth" result so whoever has the most '/' is our lucky winner
+                        // (maxSlashes needs to be initialized to -1 since children of the #RLV folder won't have '/' in their shared path)
+                        int maxSlashes = -1, curSlashes; std::string strFolderName;
+                        for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++)
+                        {
+                                strFolderName = getSharedPath(folders.get(idxFolder));
+
+                                curSlashes = std::count(strFolderName.begin(), strFolderName.end(), '/');
+                                if (curSlashes > maxSlashes)
                                 {
-                                        handle_detach_from_avatar(pAttachmentPt);
+                                        maxSlashes = curSlashes;
+                                        strReply = strFolderName;
                                 }
+                        }
+                }
+                else if (RLV_BHVR_FINDFOLDERS == rlvCmd.getBehaviourType())
+                {
+                        for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++)
+                        {
+                                if (!strReply.empty())
+                                        strReply.push_back(',');
+                                strReply += getSharedPath(folders.get(idxFolder));
+                        }
                 }
-                return RLV_RET_NOERROR;
         }
-        return RLV_RET_FAILED_OPTION;
+        return RLV_RET_SUCCESS;
+}
+
+// Checked: 2009-11-24 (RLVa-1.1.0f) | Modified: RLVa-1.1.0e
+ERlvCmdRet RlvHandler::onGetAttach(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const
+{
+        RLV_ASSERT(RLV_TYPE_REPLY == rlvCmd.getParamType());
+        RLV_ASSERT(RLV_BHVR_GETATTACH == rlvCmd.getBehaviourType());
+
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        if (!pAvatar)
+                return RLV_RET_FAILED;
+
+        // Sanity check - <option> should specify an attachment point or be empty
+        S32 idxAttachPt = getAttachPointIndex(rlvCmd.getOption(), true);
+        if ( (idxAttachPt == 0) && (!rlvCmd.getOption().empty()) )
+                return RLV_RET_FAILED_OPTION;
+
+        // If we're fetching all worn attachments then the reply should start with 0
+        if (0 == idxAttachPt)
+                strReply.push_back('0');
+
+        for (LLVOAvatar::attachment_map_t::const_iterator itAttach = pAvatar->mAttachmentPoints.begin();
+                        itAttach != pAvatar->mAttachmentPoints.end(); ++itAttach)
+        {
+                LLViewerJointAttachment* pAttachPt = itAttach->second;
+                if ( (0 == idxAttachPt) || (itAttach->first == idxAttachPt) )
+                {
+                        bool fWorn = (pAttachPt->getObject() != NULL) &&
+                                ( (!RlvSettings::getHideLockedAttach()) ||
+                                  (RlvForceWear::isForceDetachable(pAttachPt, true, gObjectList.findObject(idObj))) );
+                        strReply.push_back( (fWorn) ? '1' : '0' );
+                }
+        }
+        return RLV_RET_SUCCESS;
+}
+
+// Checked: 2009-10-19 (RLVa-1.1.0f) | Added: RLVa-1.1.0e
+ERlvCmdRet RlvHandler::onGetAttachNames(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const
+{
+        RLV_ASSERT(RLV_TYPE_REPLY == rlvCmd.getParamType());
+        RLV_ASSERT( (RLV_BHVR_GETATTACHNAMES == rlvCmd.getBehaviourType()) || (RLV_BHVR_GETADDATTACHNAMES == rlvCmd.getBehaviourType()) ||
+                        (RLV_BHVR_GETREMATTACHNAMES == rlvCmd.getBehaviourType()) );
+
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        if (!pAvatar)
+                return RLV_RET_FAILED;
+
+        ERlvAttachGroupType eAttachGroup = rlvGetAttachGroupTypeFromString(rlvCmd.getOption());
+        for (LLVOAvatar::attachment_map_t::const_iterator itAttach = pAvatar->mAttachmentPoints.begin();
+                        itAttach != pAvatar->mAttachmentPoints.end(); ++itAttach)
+        {
+                LLViewerJointAttachment* pAttachPt = itAttach->second;
+                if ( (RLV_ATTACHGROUP_INVALID == eAttachGroup) || (rlvGetAttachGroupTypeFromIndex(pAttachPt->getGroup()) == eAttachGroup) )
+                {
+                        bool fAdd = false;
+                        switch (rlvCmd.getBehaviourType())
+                        {
+                                case RLV_BHVR_GETATTACHNAMES:           // Every attachment point that has an attached object (locked or unlocked)
+                                        fAdd = (pAttachPt->getObject() != NULL);
+                                        break;
+                                case RLV_BHVR_GETADDATTACHNAMES:        // Every attachment point that can be worn on (but ignore any locks set by the issuer)
+                                        fAdd = (!isLockedAttachmentExcept(itAttach->first, RLV_LOCK_ADD, gObjectList.findObject(idObj))) &&
+                                                   ( (pAttachPt->getObject() == NULL) ||
+                                                     (!isLockedAttachmentExcept(itAttach->first, RLV_LOCK_REMOVE, gObjectList.findObject(idObj))) );
+                                        break;
+                                case RLV_BHVR_GETREMATTACHNAMES:        // Every attachment point that can be detached (but ignore any locks set by the issuer)
+                                        fAdd = RlvForceWear::isForceDetachable(pAttachPt, true, gObjectList.findObject(idObj));
+                                        break;
+                                default:
+                                        break;
+                        }
+
+                        if (fAdd)
+                        {
+                                if (!strReply.empty())
+                                        strReply.push_back(',');
+                                strReply.append(pAttachPt->getName());
+                        }
+                }
+        }
+        return RLV_RET_SUCCESS;
+}
+
+// Checked: 2009-11-21 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+ERlvCmdRet RlvHandler::onGetInv(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const
+{
+        RLV_ASSERT(RLV_TYPE_REPLY == rlvCmd.getParamType());
+        RLV_ASSERT(RLV_BHVR_GETINV == rlvCmd.getBehaviourType());
+
+        LLViewerInventoryCategory* pFolder = getSharedFolder(rlvCmd.getOption());
+        if (!pFolder)
+                return (getSharedRoot() != NULL) ? RLV_RET_FAILED_OPTION : RLV_RET_FAILED_NOSHAREDROOT;
+
+        LLInventoryModel::cat_array_t* pFolders;
+        LLInventoryModel::item_array_t* pItems;
+        gInventory.getDirectDescendentsOf(pFolder->getUUID(), pFolders, pItems);
+        if (!pFolders)
+                return RLV_RET_FAILED;
+
+        for (S32 idxFolder = 0, cntFolder = pFolders->count(); idxFolder < cntFolder; idxFolder++)
+        {
+                // Return all folders that:
+                //   - aren't hidden
+                //   - aren't a folded folder (only really matters when "Enable Legacy Naming" is enabled - see related blog post)
+                //     (we can skip checking for .<composite> folders since the ones we'll want to hide start with '.' anyway)
+                const std::string& strFolder = pFolders->get(idxFolder)->getName();
+                if ( (!strFolder.empty()) && (RLV_FOLDER_PREFIX_HIDDEN != strFolder[0]) &&
+                         (!isFoldedFolder(pFolders->get(idxFolder).get(), true, false)) )
+                {
+                        if (!strReply.empty())
+                                strReply.push_back(',');
+                        strReply += strFolder;
+                }
+        }
+        return RLV_RET_SUCCESS;
+}
+
+struct rlv_wear_info { U32 cntWorn, cntTotal, cntChildWorn, cntChildTotal; };
+
+// Checked: 2009-11-27 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+ERlvCmdRet RlvHandler::onGetInvWorn(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const
+{
+        // Sanity check - getAvatarObject() can't be NULL [see RlvForceWear::isWearingItem()]
+        if (!gAgent.getAvatarObject())
+                return RLV_RET_FAILED;
+        // Sanity check - folder should exist and not be hidden
+        LLViewerInventoryCategory* pFolder = getSharedFolder(rlvCmd.getOption());
+        if ( (!pFolder) || (pFolder->getName().empty()) || (RLV_FOLDER_PREFIX_HIDDEN == pFolder->getName()[0]) )
+                return (getSharedRoot() != NULL) ? RLV_RET_FAILED_OPTION : RLV_RET_FAILED_NOSHAREDROOT;
+
+        // 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 (RlvForceWear::isWearingItem(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;
+
+        return RLV_RET_SUCCESS;
+}
+
+// Checked: 2009-11-24 (RLVa-1.1.0f) | Modified: RLVa-1.1.0e
+ERlvCmdRet RlvHandler::onGetOutfit(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const
+{
+        RLV_ASSERT(RLV_TYPE_REPLY == rlvCmd.getParamType());
+        RLV_ASSERT(RLV_BHVR_GETOUTFIT == rlvCmd.getBehaviourType());
+
+        // (Compatibility: RLV 1.16.1 will execute @getoutfit=<channel> if <layer> is invalid while we just return failure)
+        EWearableType layerType = LLWearable::typeNameToType(rlvCmd.getOption());
+        if ( (WT_INVALID == layerType) && (!rlvCmd.getOption().empty()) )
+                return RLV_RET_FAILED_OPTION;
+
+        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, WT_ALPHA, WT_TATTOO
+                };
+
+        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], idObj)) &&
+                                    (isStrippable(gAgent.getWearableItem(layerTypes[idx]))) ) );
+                        strReply.push_back( (fWorn) ? '1' : '0' );
+                }
+
+        return RLV_RET_SUCCESS;
+}
+
+// Checked: 2009-11-21 (RLVa-1.1.0f) | Added: RLVa-1.1.0e
+ERlvCmdRet RlvHandler::onGetOutfitNames(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const
+{
+        RLV_ASSERT(RLV_TYPE_REPLY == rlvCmd.getParamType());
+        RLV_ASSERT( (RLV_BHVR_GETOUTFITNAMES == rlvCmd.getBehaviourType()) || (RLV_BHVR_GETADDOUTFITNAMES == rlvCmd.getBehaviourType()) ||
+                        (RLV_BHVR_GETREMOUTFITNAMES == rlvCmd.getBehaviourType()) );
+
+        // Sanity check - all these commands are optionless
+        if (!rlvCmd.getOption().empty())
+                return RLV_RET_FAILED_OPTION;
+
+        for (int idxType = 0; idxType < WT_COUNT; idxType++)
+        {
+                bool fAdd = false; EWearableType wtType = (EWearableType)idxType;
+                switch (rlvCmd.getBehaviourType())
+                {
+                        case RLV_BHVR_GETOUTFITNAMES:           // Every layer that's worn
+                                fAdd = (gAgent.getWearable(wtType) != NULL);
+                                break;
+                        case RLV_BHVR_GETADDOUTFITNAMES:        // Every layer that can be worn on (but ignore any locks set by the issuer)
+                                fAdd = (isWearable(wtType)) && ( (gAgent.getWearable(wtType) == NULL) || (isRemovableExcept(wtType, idObj)) );
+                                break;
+                        case RLV_BHVR_GETREMOUTFITNAMES:        // Every layer that can be removed (but ignore any locks set by the issuer)
+                                fAdd = (gAgent.getWearable(wtType) != NULL) &&
+                                           (LLAssetType::AT_BODYPART != LLWearable::typeToAssetType(wtType)) &&
+                                           (isRemovableExcept(wtType, idObj)) && (isStrippable(gAgent.getWearableItem(wtType)));
+                                break;
+                        default:
+                                break;
+                }
+
+                if (fAdd)
+                {
+                        if (!strReply.empty())
+                                strReply.push_back(',');
+                        strReply.append(LLWearable::typeToTypeName((EWearableType)idxType));
+                }
+        }
+        return RLV_RET_SUCCESS;
+}
+
+// Checked: 2009-11-26 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+ERlvCmdRet RlvHandler::onGetPath(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const
+{
+        // NOTE: @attachthis/attachallthis/detachthis/detachallthis call us directly to simulate @attach:getpath[:<option>]=force
+
+        // Sanity check - no need to go through all this trouble if we don't have a shared root
+        LLViewerInventoryCategory* pRlvRoot = getSharedRoot();
+        if (!pRlvRoot)
+                return RLV_RET_FAILED_NOSHAREDROOT;
+
+        EWearableType wtType = LLWearable::typeNameToType(rlvCmd.getOption()); LLUUID idItem;
+        if (WT_INVALID != wtType)                               // <option> can be a clothing layer
+        {
+                idItem = gAgent.getWearableItem(wtType);
+        }
+        else
+        {
+                LLViewerJointAttachment* pAttachPt = NULL;
+
+                if (rlvCmd.getOption().empty())         // ... or it can be empty (in which case we act on the object that issued the command)
+                {
+                        LLViewerObject* pObj = gObjectList.findObject(idObj);
+                        if ( (pObj) && (pObj->isAttachment()) && (gAgent.getAvatarObject()) )
+                                pAttachPt = gAgent.getAvatarObject()->getTargetAttachmentPoint(pObj);
+                }
+                else                                                            // ... or it can specify an attachment point
+                {
+                        pAttachPt = getAttachPoint(rlvCmd.getOption(), true);
+                }
+
+                // If we found something get its inventory item UUID, otherwise return failure
+                if (!pAttachPt)
+                        return RLV_RET_FAILED_OPTION;
+                idItem = pAttachPt->getItemID();
+        }
+
+        // If what we found is 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 is a folded folder in which case we need its parent)
+                        LLViewerInventoryCategory* pFolder = gInventory.getCategory(pItem->getParentUUID());
+                        strReply = getSharedPath( (!isFoldedFolder(pFolder, true, true)) ? pFolder : gInventory.getCategory(pFolder->getParentUUID()) );
+                }
+        }
+        return RLV_RET_SUCCESS;
 }
 
 // ============================================================================
diff --git a/linden/indra/newview/rlvhandler.h b/linden/indra/newview/rlvhandler.h
index 6821149..94962f9 100644
--- a/linden/indra/newview/rlvhandler.h
+++ b/linden/indra/newview/rlvhandler.h
@@ -1,23 +1,38 @@
+/**
+ *
+ * Copyright (c) 2009-2010, Kitty Barnett
+ *
+ * The source code in this file is provided to you under the terms of the
+ * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * 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.
+ *
+ */
+
 #ifndef RLV_HANDLER_H
 #define RLV_HANDLER_H
 
+#include <stack>
 #include "llagentconstants.h"
-#include "llappviewer.h"
-#include "llformat.h"
-#include "llversionviewer.h"
+#include "llstartup.h"
 #include "llviewerjointattachment.h"
 #include "llviewerobject.h"
 #include "llwearable.h"
 
+#include "rlvcommon.h"
 #include "rlvhelper.h"
-#include "rlvevent.h"
 #include "rlvmultistringsearch.h"
 
 // ============================================================================
 
 typedef std::map<LLUUID, RlvObject> rlv_object_map_t;
 typedef std::multimap<ERlvBehaviour, RlvException> rlv_exception_map_t;
-typedef std::map<S32, LLUUID> rlv_attachlock_map_t;
+typedef std::multimap<S32, LLUUID> rlv_attachlock_map_t;
 
 class RlvHandler
 {
@@ -35,10 +50,12 @@ public:
         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;
+        S32                      getAttachPointIndex(const LLInventoryItem* pItem, bool fStrict) const;
+        S32                      getAttachPointIndex(const LLInventoryCategory* pFolder, bool fStrict) const;
+        S32                      getAttachPointIndexLegacy(const LLInventoryCategory* pFolder) const;
         bool                     hasAttachPointName(const LLInventoryItem* pItem, bool fStrict) const;
 
         // --------------------------------
@@ -62,6 +79,7 @@ public:
 
         // Adds an eLock type lock (held by idRlvObj) for the specified attachment point
         void addAttachmentLock(S32 idxAttachPt, const LLUUID& idRlvObj, ERlvLockMask eLock);
+        static void dumpAttachmentLocks(void*);
         // Returns TRUE if there is at least 1 eLock type locked attachment (RLV_LOCK_ANY = RLV_LOCK_ADD *or* RLV_LOCK_REMOVE)
         bool hasLockedAttachment(ERlvLockMask eLock) const;
         // Returns TRUE if there is at least 1 non-detachable HUD attachment
@@ -72,7 +90,8 @@ public:
         bool isLockedAttachment(LLViewerJointAttachment* pAttachPt, ERlvLockMask eLock) const;
         bool isLockedAttachment(LLViewerObject* pObj, ERlvLockMask eLock) const;
         // Returns TRUE if the specified attachment point is eLock type locked by anything other than pObj (or one of its children)
-        bool isLockedAttachmentExcept(S32 idxAttachPt, ERlvLockMask eLock, LLViewerObject* pObj) const;
+        bool isLockedAttachmentExcept(S32 idxAttachPt, ERlvLockMask eLock, LLViewerObject* pExceptObj) const;
+        bool isLockedAttachmentExcept(LLViewerObject* pObj, ERlvLockMask eLock, LLViewerObject* pExceptObj) const;
         // Adds an eLock type lock (held by idRlvObj) for the specified attachment point
         void removeAttachmentLock(S32 idxAttachPt, const LLUUID& idRlovObj, ERlvLockMask eLock);
 
@@ -93,18 +112,22 @@ public:
         // 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; }
 
+        #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
         // Returns TRUE if the composite folder doesn't contain any "locked" items
         bool canTakeOffComposite(const LLInventoryCategory* pFolder) const;
+        // Returns TRUE if the composite folder doesn't replace any "locked" items
+        bool canWearComposite(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;
+        bool isCompositeFolder(const LLInventoryCategory* pFolder) const { return getCompositeInfo(pFolder, NULL); }
         // Returns TRUE if the inventory item belongs to a composite folder
-        bool isCompositeDescendent(const LLUUID& idItem) const;
+        bool isCompositeDescendent(const LLUUID& idItem) const { return getCompositeInfo(idItem, NULL, NULL); }
         // 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;
+        #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
 
         // --------------------------------
 
@@ -113,29 +136,27 @@ public:
          */
 public:
         // Accessors
-        bool getCanCancelTp() const                     { return m_fCanCancelTp; }                                              // @accepttp and @tpto
-        void setCanCancelTp(bool fAllow)        { m_fCanCancelTp = fAllow; }                                    // @accepttp and @tpto
+        bool getCanCancelTp() const                     { return m_fCanCancelTp; }                                                              // @accepttp and @tpto
+        void setCanCancelTp(bool fAllow)        { m_fCanCancelTp = fAllow; }                                                    // @accepttp and @tpto
 
         // Command specific helper functions
-        bool               canShowHoverText(LLViewerObject* pObj) const;                                        // @showhovertext* command family
-        void               filterChat(std::string& strUTF8Text, bool fFilterEmote) const;       // @sendchat, @recvchat and @redirchat
-        void               filterLocation(std::string& strUTF8Text) const;                                      // @showloc
-        void               filterNames(std::string& strUTF8Text) const;                                         // @shownames
-        const std::string& getAnonym(const std::string& strName) const;                                         // @shownames
-        std::string        getVersionString() const;                                                                            // @version
-        std::string        getVersionNumString() const;                                                                         // @versionnum
-        BOOL               isAgentNearby(const LLUUID& uuid) const;                                                     // @shownames
-        bool               redirectChatOrEmote(const std::string& strUTF8Test) const;           // @redirchat and @rediremote
+        bool canShowHoverText(LLViewerObject* pObj) const;                                                                                      // @showhovertext* command family
+        bool canSit(LLViewerObject* pObj, const LLVector3& posOffset = LLVector3::zero) const;          //
+        bool canTouch(LLViewerObject* pObj, const LLVector3& posOffset = LLVector3::zero) const;        // @touch
+        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
+        bool isAgentNearby(const LLUUID& idAgent) 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);
+        ERlvCmdRet processCommand(const LLUUID& idObj, const std::string& strCommand, bool fFromObj);
+        void       processRetainedCommands(ERlvBehaviour eBhvrFilter = RLV_BHVR_UNKNOWN, ERlvParamType eTypeFilter = RLV_TYPE_UNKNOWN);
 
         // Returns a pointer to the currently executing command (do *not* save this pointer)
-        const RlvCommand* getCurrentCommand() const { return m_pCurCommand; }
+        const RlvCommand* getCurrentCommand() const { return (!m_CurCommandStack.empty()) ? m_CurCommandStack.top() : NULL; }
         // Returns the UUID of the object we're currently executing a command for
-        const LLUUID& getCurrentObject() const          { return m_idCurObject; }
+        const LLUUID& getCurrentObject() const          { return (!m_CurObjectStack.empty()) ? m_CurObjectStack.top() : LLUUID::null; }
 
         // Initialization
         static BOOL canDisable();
@@ -155,16 +176,13 @@ public:
         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;
+        bool isFoldedFolder(const LLInventoryCategory* pFolder, bool fAttach, bool fCheckComposite) 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)
@@ -175,43 +193,55 @@ protected:
         // --------------------------------
 
         /*
-         * Event handling (forwards to registered observers if we don't handle the command)
+         * Event handling
          */
 public:
-        BOOL addObserver(RlvObserver* pObserver)        { return m_Emitter.addObserver(pObserver); }
-        BOOL removeObserver(RlvObserver* pObserver)     { return m_Emitter.remObserver(pObserver); }
         void addBehaviourObserver(RlvBehaviourObserver* pBhvrObserver);
+        void addCommandHandler(RlvCommandHandler* pHandler);
         void removeBehaviourObserver(RlvBehaviourObserver* pBhvrObserver);
+        void removeCommandHandler(RlvCommandHandler* pHandler);
+protected:
+        void clearCommandHandlers();
         void notifyBehaviourObservers(const RlvCommand& rlvCmd, bool fInternal);
+        bool notifyCommandHandlers(rlvCommandHandler f, const LLUUID& idObj, const RlvCommand& rlvCmd, ERlvCmdRet& eRet, bool fNotifyAll) const;
 
         // Externally invoked event handlers
+public:
         void onAttach(LLViewerJointAttachment* pAttachPt);                                              // LLVOAvatar::attachObject()
         void onDetach(LLViewerJointAttachment* pAttachPt);                                              // LLVOAvatar::detachObject()
         bool onGC();                                                                                                                    // RlvGCTimer::tick()
         void onSavedAssetIntoInventory(const LLUUID& idItem) { if (m_pAttachMgr) m_pAttachMgr->onSavedAssetIntoInventory(idItem); }
         void onWearAttachment(const LLUUID& idItem)                      { if (m_pAttachMgr) m_pAttachMgr->onWearAttachment(idItem); }
+        static void onIdleStartup(void* pParam);
+
+        /*
+         * Command processing
+         */
 protected:
-        BOOL processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd);
-        BOOL processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvCmd);
-        BOOL processClearCommand(const LLUUID idObj, const RlvCommand& rlvCmd);
-        BOOL processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const;
-        BOOL processForceCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const;
+        ERlvCmdRet processCommand(const LLUUID& idObj, const RlvCommand& rlvCmd, bool fFromObj);
+        ERlvCmdRet processClearCommand(const LLUUID& idObj, const RlvCommand& rlvCmd);
+        ERlvCmdRet processReplyCommand(const LLUUID& idObj, const RlvCommand& rlvCmd) const;
+        ERlvCmdRet processForceCommand(const LLUUID& idObj, const RlvCommand& rlvCmd) const;
 
-        // Command handlers (exist for no other reason than to keep the length of the processXXX functions down)
+        // Command handlers (RLV_TYPE_ADD and RLV_TYPE_CLEAR)
+        ERlvCmdRet processAddRemCommand(const LLUUID& idObj, const RlvCommand& rlvCmd);
         ERlvCmdRet onAddRemAttach(const LLUUID& idObj, const RlvCommand& rlvCmd, bool& fRefCount);
         ERlvCmdRet onAddRemDetach(const LLUUID& idObj, const RlvCommand& rlvCmd, bool& fRefCount);
-        ERlvCmdRet onAddRemOutfit(const LLUUID& idObj, const RlvCommand& rlvCmd, bool& fRefCount);
-        ERlvCmdRet onForceDetach(const LLUUID& idObj, const RlvCommand& rlvCmd) const;
+        ERlvCmdRet onAddRemSetEnv(const LLUUID& idObj, const RlvCommand& rlvCmd, bool& fRefCount);
+        // Command handlers (RLV_TYPE_FORCE)
         ERlvCmdRet onForceRemAttach(const LLUUID& idObj, const RlvCommand& rlvCmd) const;
         ERlvCmdRet onForceRemOutfit(const LLUUID& idObj, const RlvCommand& rlvCmd) const;
-        ERlvCmdRet onGetAttach(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply);
-        ERlvCmdRet onGetOutfit(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply);
-        // Old style command handlers (need to be updated to return ERlvCmdRet)
-        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;
+        ERlvCmdRet onForceSit(const LLUUID& idObj, const RlvCommand& rlvCmd) const;
+        ERlvCmdRet onForceWear(const std::string& strPath, bool fAttach, bool fMatchAll) const;
+        // Command handlers (RLV_TYPE_REPLY)
+        ERlvCmdRet onFindFolder(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const;
+        ERlvCmdRet onGetAttach(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const;
+        ERlvCmdRet onGetAttachNames(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const;
+        ERlvCmdRet onGetInv(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const;
+        ERlvCmdRet onGetInvWorn(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const;
+        ERlvCmdRet onGetOutfit(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const;
+        ERlvCmdRet onGetOutfitNames(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const;
+        ERlvCmdRet onGetPath(const LLUUID& idObj, const RlvCommand& rlvCmd, std::string& strReply) const;
 
         // --------------------------------
 
@@ -219,18 +249,7 @@ protected:
          * 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 (idObj -> RlvObject)
         rlv_exception_map_t   m_Exceptions;                             // Map of currently active restriction exceptions (ERlvBehaviour -> RlvException)
@@ -245,16 +264,16 @@ protected:
         RlvWLSnapshot*        m_pWLSnapshot;
         RlvAttachmentManager* m_pAttachMgr;
 
-        RlvCommand*           m_pCurCommand;                    // Convenience (see @tpto)
-        LLUUID                m_idCurObject;                    // Convenience (see @tpto)
+        std::stack<const RlvCommand*> m_CurCommandStack;// Convenience (see @tpto)
+        std::stack<LLUUID>    m_CurObjectStack;                 // Convenience (see @tpto)
 
-        mutable RlvEventEmitter<RlvObserver>     m_Emitter;
         mutable std::list<RlvBehaviourObserver*> m_BhvrObservers;
+        mutable std::list<RlvCommandHandler*>    m_CommandHandlers;
         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 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;
@@ -302,46 +321,108 @@ inline bool RlvHandler::canShowHoverText(LLViewerObject *pObj) const
                            (isException(RLV_BHVR_SHOWHOVERTEXT, pObj->getID(), RLV_CHECK_PERMISSIVE)) ) );
 }
 
-// Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
-inline S32 RlvHandler::getAttachPointIndex(std::string strText, bool fExact) const
+// Checked: 2009-12-21 (RLVa-1.1.0k) | Added: RLVa-1.1.0j
+inline bool RlvHandler::canSit(LLViewerObject* pObj, const LLVector3& posOffset /*= LLVector3::zero*/) 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);
+        // The user can sit on the specified object if:
+        //   - not prevented from sitting
+        //   - not prevented from standing up or not currently sitting
+        //   - [regular sit] not @sittp=n or @fartouch=n restricted or if they clicked on a point within 1.5m of the avie's current position
+        //   - [force sit] not @sittp=n restricted by a *different* object than the one that issued the command or the object is within 1.5m
+        return
+                ( (pObj) && (LL_PCODE_VOLUME == pObj->getPCode()) ) &&
+                (!hasBehaviour(RLV_BHVR_SIT)) &&
+                ( (!hasBehaviour(RLV_BHVR_UNSIT)) || ((gAgent.getAvatarObject()) && (!gAgent.getAvatarObject()->mIsSitting)) ) &&
+                ( ((NULL == getCurrentCommand() || (RLV_BHVR_SIT != getCurrentCommand()->getBehaviourType()))
+                        ? ((!hasBehaviour(RLV_BHVR_SITTP)) && (!hasBehaviour(RLV_BHVR_FARTOUCH)))       // [regular sit]
+                        : (!hasBehaviourExcept(RLV_BHVR_SITTP, getCurrentObject()))) ||                         // [force sit]
+                  (dist_vec_squared(gAgent.getPositionGlobal(), pObj->getPositionGlobal() + LLVector3d(posOffset)) < 1.5f * 1.5f) );
 }
 
-// Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
-inline S32 RlvHandler::getAttachPointIndex(LLViewerObject* pObj) const
+// Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
+inline bool RlvHandler::canTouch(LLViewerObject* pObj, const LLVector3& posOffset /*=LLVector3::zero*/) const
 {
-        return (pObj) ? ATTACHMENT_ID_FROM_STATE(pObj->getState()) : 0;
+#ifdef RLV_EXTENSION_CMD_TOUCHXXX
+        bool fCanTouch = (pObj) &&
+                ( (!hasBehaviour(RLV_BHVR_TOUCH)) || (!isException(RLV_BHVR_TOUCH, pObj->getRootEdit()->getID(), RLV_CHECK_PERMISSIVE)) );
+
+        if (fCanTouch)
+        {
+                if ( (!pObj->isAttachment()) || (!pObj->permYouOwner()) )
+                {
+                        // Rezzed prim or attachment worn by another avie
+                        fCanTouch =
+                                ( (!hasBehaviour(RLV_BHVR_TOUCHWORLD)) ||
+                                  (isException(RLV_BHVR_TOUCHWORLD, pObj->getRootEdit()->getID(), RLV_CHECK_PERMISSIVE)) ) &&
+                                ( (!hasBehaviour(RLV_BHVR_FARTOUCH)) ||
+                                  (dist_vec_squared(gAgent.getPositionGlobal(), pObj->getPositionGlobal() + LLVector3d(posOffset)) <= 1.5f * 1.5f) );
+                }
+                else if (pObj->isHUDAttachment())
+                {
+                        // HUD attachment
+                        fCanTouch = (!hasBehaviour(RLV_BHVR_TOUCHHUD)) ||
+                                (isException(RLV_BHVR_TOUCHHUD, pObj->getRootEdit()->getID(), RLV_CHECK_PERMISSIVE));
+                }
+                else
+                {
+                        // Regular attachment worn by this avie
+                        fCanTouch =
+                                ( (!hasBehaviour(RLV_BHVR_TOUCHATTACH)) ||
+                                  (isException(RLV_BHVR_TOUCHATTACH, pObj->getRootEdit()->getID(), RLV_CHECK_PERMISSIVE)) );
+                }
+        }
+        return fCanTouch;
+#else
+        return (pObj) &&
+          (
+                ((pObj->isAttachment()) && (pObj->permYouOwner())) ||
+                ( (!hasBehaviour(RLV_BHVR_FARTOUCH)) ||
+                  (dist_vec_squared(gAgent.getPositionGlobal(), pObj->getPositionGlobal() + LLVector3d(posOffset)) <= 1.5f * 1.5f) )
+          );
+#endif // RLV_EXTENSION_CMD_TOUCHXXX
+}
+
+// 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
+inline LLViewerJointAttachment* RlvHandler::getAttachPoint(const LLInventoryCategory* pFolder, bool fStrict) const
+{
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        return (pAvatar) ? get_if_there(pAvatar->mAttachmentPoints, getAttachPointIndex(pFolder, fStrict), (LLViewerJointAttachment*)NULL) : NULL;
 }
 
-// Checked: 2009-06-02 (RLVa-0.2.0g)
-inline std::string RlvHandler::getSharedPath(const LLUUID& idFolder) const
+// Checked: 2009-07-29 (RLVa-1.0.1b) | Modified: RLVa-1.0.1b
+inline LLViewerJointAttachment* RlvHandler::getAttachPoint(const LLInventoryItem* pItem, bool fStrict) const
 {
-        return getSharedPath(gInventory.getCategory(idFolder)); // getSharedPath() has a NULL pointer check so this is safe
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        return (pAvatar) ? get_if_there(pAvatar->mAttachmentPoints, getAttachPointIndex(pItem, fStrict), (LLViewerJointAttachment*)NULL) : NULL;
 }
 
-// Checked: 2009-06-07 (RLVa-0.2.1c)
-inline std::string RlvHandler::getVersionString()  const
+// Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+inline S32 RlvHandler::getAttachPointIndex(std::string strText, bool fExact) 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);
+        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-10-04 (RLVa-1.0.4b) | Added: RLVa-1.0.4b
-inline std::string RlvHandler::getVersionNumString()  const
+// Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
+inline S32 RlvHandler::getAttachPointIndex(LLViewerObject* pObj) const
 {
-        return llformat("%d%02d%02d%02d", RLV_VERSION_MAJOR, RLV_VERSION_MINOR, RLV_VERSION_PATCH, RLV_VERSION_BUILD);
+        return (pObj) ? ATTACHMENT_ID_FROM_STATE(pObj->getState()) : 0;
 }
 
 // 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
+        return (0 != getAttachPointIndex(pItem, fStrict)); // getAttachPoint() has a NULL pointer check so this is safe
 }
 
 // Checked:
@@ -363,39 +444,23 @@ inline bool RlvHandler::hasLockedAttachment(ERlvLockMask eLock) const
         return ( (eLock & RLV_LOCK_REMOVE) && (!m_AttachRem.empty()) ) || ( (eLock & RLV_LOCK_ADD) && (!m_AttachAdd.empty()) );
 }
 
-#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
-
-inline bool RlvHandler::isPermissive(ERlvBehaviour eBhvr) const
-{
-        return (RlvCommand::hasStrictVariant(eBhvr)) 
-                ? !((hasBehaviour(RLV_BHVR_PERMISSIVE)) || (isException(RLV_BHVR_PERMISSIVE, eBhvr, RLV_CHECK_PERMISSIVE)))
-                : true;
-}
-
-// Checked: 2009-07-29 (RLVa-1.0.1b) | Added: RLVa-1.0.1b
-inline bool RlvHandler::isFoldedFolder(const LLInventoryCategory* pFolder, bool fAttach) const
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Added: RLVa-1.1.0i
+inline bool RlvHandler::isFoldedFolder(const LLInventoryCategory* pFolder, bool fAttach, bool fCheckComposite) 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)) &&
+                ( (0 != gRlvHandler.getAttachPointIndex(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
+                // .[Composite] folder (if composite folders are enabled and we're asked to look for them)
+                #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                || ( (fCheckComposite) && (RlvSettings::getEnableComposites()) &&
+                     (RLV_FOLDER_PREFIX_HIDDEN == pFolder->getName().at(0)) && (isCompositeFolder(pFolder)) )
+                #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
           );
 }
 
@@ -406,6 +471,12 @@ inline bool RlvHandler::isLockedAttachment(S32 idxAttachPt, ERlvLockMask eLock)
                    ( (eLock & RLV_LOCK_ADD) && (m_AttachAdd.find(idxAttachPt) != m_AttachAdd.end()) );
 }
 
+// Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
+inline bool RlvHandler::isLockedAttachment(const LLInventoryItem* pItem, ERlvLockMask eLock) const
+{
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        return (pItem) && (pAvatar) && (isLockedAttachment(pAvatar->getWornAttachment(pItem->getUUID()), eLock));
+}
 
 // Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
 inline bool RlvHandler::isLockedAttachment(LLViewerJointAttachment *pAttachPt, ERlvLockMask eLock) const
@@ -422,6 +493,19 @@ inline bool RlvHandler::isLockedAttachment(LLViewerObject* pObj, ERlvLockMask eL
         return (pObj != NULL) && (pObj->isAttachment()) && (isLockedAttachment(getAttachPointIndex(pObj), eLock));
 }
 
+// Checked: 2009-11-24 (RLVa-1.1.0e) | Added: RLVa-1.1.0e
+inline bool RlvHandler::isLockedAttachmentExcept(LLViewerObject* pObj, ERlvLockMask eLock, LLViewerObject* pExceptObj) const
+{
+        return (pObj != NULL) && (pObj->isAttachment()) && (isLockedAttachmentExcept(getAttachPointIndex(pObj), eLock, pExceptObj));
+}
+
+inline bool RlvHandler::isPermissive(ERlvBehaviour eBhvr) const
+{
+        return (RlvCommand::hasStrictVariant(eBhvr))
+                ? !((hasBehaviour(RLV_BHVR_PERMISSIVE)) || (isException(RLV_BHVR_PERMISSIVE, eBhvr, RLV_CHECK_PERMISSIVE)))
+                : true;
+}
+
 // Checked: 2009-05-23 (RLVa-0.2.0d) | Added: RLVa-0.2.0d
 inline bool RlvHandler::isRemovableExcept(EWearableType type, const LLUUID& idObj) const
 {
@@ -431,8 +515,7 @@ inline bool RlvHandler::isRemovableExcept(EWearableType type, const LLUUID& idOb
 }
 
 #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
+        inline bool RlvHandler::isStrippable(const LLUUID& idItem) const
         {
                 return true;
         }
@@ -452,13 +535,15 @@ inline void RlvHandler::removeException(const LLUUID& idObj, ERlvBehaviour eBhvr
         }
 }
 
-// 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)
+// Checked: 2009-11-25 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
+inline ERlvCmdRet RlvHandler::processCommand(const LLUUID& idObj, const std::string& strCommand, bool fFromObj)
 {
-        #ifdef RLV_DEBUG
-                RLV_INFOS << "[" << idObj << "]: " << strCmd << " (retaining)" << LL_ENDL;
-        #endif // RLV_DEBUG
-        m_Retained.push_back(RlvRetainedCommand(strObj, idObj, strCmd));
+        if (STATE_STARTED != LLStartUp::getStartupState())
+        {
+                m_Retained.push_back(RlvRetainedCommand(idObj, RlvCommand(strCommand)));
+                return RLV_RET_RETAINED;
+        }
+        return processCommand(idObj, RlvCommand(strCommand), fFromObj);
 }
 
 // ============================================================================
diff --git a/linden/indra/newview/rlvhelper.cpp b/linden/indra/newview/rlvhelper.cpp
index f509a43..9ef74ac 100644
--- a/linden/indra/newview/rlvhelper.cpp
+++ b/linden/indra/newview/rlvhelper.cpp
@@ -1,27 +1,31 @@
 #include "llviewerprecompiledheaders.h"
-#include "llagent.h"
 #include "llfloaterwindlight.h"
+#include "llgesturemgr.h"
+#include "llinventoryview.h"
+#include "llinventorybridge.h"
 #include "llviewerobject.h"
+#include "llviewerobjectlist.h"
+#include "llviewerregion.h"
 #include "llviewerstats.h"
 #include "llviewerwindow.h"
 #include "llvoavatar.h"
+#include "llwearablelist.h"
 #include "llwlparammanager.h"
 
 #include "rlvhelper.h"
-#include "rlvevent.h"
 #include "rlvhandler.h"
 
-// ============================================================================
-// Static variable initialization
-//
-
-RlvCommand::RlvBhvrTable RlvCommand::m_BhvrMap;
+// Defined in llinventorybridge.cpp
+void wear_attachments_on_avatar(const LLInventoryModel::item_array_t& items, BOOL remove);
+void wear_inventory_category_on_avatar_loop(LLWearable* wearable, void*);
 
 // ============================================================================
 // RlvCommmand
 //
 
-// Checked: 2009-09-10 (RLVa-1.0.3a) | Modified: RLVa-1.0.3a
+RlvCommand::RlvBhvrTable RlvCommand::m_BhvrMap;
+
+// Checked: 2009-12-27 (RLVa-1.1.0k) | Modified: RLVa-1.1.0k
 RlvCommand::RlvCommand(const std::string& strCommand)
         : m_eBehaviour(RLV_BHVR_UNKNOWN), m_fStrict(false), m_eParamType(RLV_TYPE_UNKNOWN)
 {
@@ -32,12 +36,12 @@ RlvCommand::RlvCommand(const std::string& strCommand)
                         m_eParamType = RLV_TYPE_ADD;
                 else if ( ("y" == m_strParam) || ("rem" == m_strParam) )
                         m_eParamType = RLV_TYPE_REMOVE;
+                else if (m_strBehaviour == "clear")                                             // clear is the odd one out so just make it its own type
+                        m_eParamType = RLV_TYPE_CLEAR;
                 else if ("force" == m_strParam)
                         m_eParamType = RLV_TYPE_FORCE;
                 else if (LLStringUtil::convertToS32(m_strParam, nTemp)) // Assume it's a reply command if we can convert <param> to an S32
                         m_eParamType = RLV_TYPE_REPLY;
-                else if (m_strBehaviour == "clear")                                             // clear is the odd one out so just make it its own type
-                        m_eParamType = RLV_TYPE_CLEAR;
                 else
                 {
                         m_eParamType = RLV_TYPE_UNKNOWN;
@@ -51,13 +55,7 @@ RlvCommand::RlvCommand(const std::string& strCommand)
                 return;
         }
 
-        // Check if this is the "strict" (aka "secure") variation of a behaviour
-        std::string::size_type idxStrict = m_strBehaviour.find("_sec");
-        m_fStrict = (std::string::npos != idxStrict) && (idxStrict + 4 == m_strBehaviour.length());
-
-        RlvBhvrTable::const_iterator itBhvr = m_BhvrMap.find( (!m_fStrict) ? m_strBehaviour : m_strBehaviour.substr(0, idxStrict));
-        if ( (itBhvr != m_BhvrMap.end()) && ((!m_fStrict) || (hasStrictVariant(itBhvr->second))) )
-                m_eBehaviour = itBhvr->second;
+        m_eBehaviour = getBehaviourFromString(m_strBehaviour, &m_fStrict);
 }
 
 
@@ -95,6 +93,20 @@ bool RlvCommand::parseCommand(const std::string& strCommand, std::string& strBeh
         return true;
 }
 
+// Checked: 2009-12-05 (RLVa-1.1.0h) | Added: RLVa-1.1.0h
+ERlvBehaviour RlvCommand::getBehaviourFromString(const std::string& strBhvr, bool* pfStrict /*=NULL*/)
+{
+        std::string::size_type idxStrict = strBhvr.find("_sec");
+        bool fStrict = (std::string::npos != idxStrict) && (idxStrict + 4 == strBhvr.length());
+        if (pfStrict)
+                *pfStrict = fStrict;
+
+        RlvBhvrTable::const_iterator itBhvr = m_BhvrMap.find( (!fStrict) ? strBhvr : strBhvr.substr(0, idxStrict));
+        if ( (itBhvr != m_BhvrMap.end()) && ((!fStrict) || (hasStrictVariant(itBhvr->second))) )
+                return itBhvr->second;
+        return RLV_BHVR_UNKNOWN;
+}
+
 void RlvCommand::initLookupTable()
 {
         static bool fInitialized = false;
@@ -103,14 +115,16 @@ void RlvCommand::initLookupTable()
                 // NOTE: keep this matched with the enumeration at all times
                 std::string arBehaviours[RLV_BHVR_COUNT] =
                         {
-                                "version", "detach", "sendchat", "emote", "chatshout", "chatnormal", "chatwhisper", "redirchat", "rediremote",
-                                "sendim", "recvchat", "recvemote", "recvim", "tplm", "tploc", "tplure", "sittp", "edit", "rez",
-                                "addoutfit", "remoutfit", "getoutfit", "addattach", "remattach", "getattach", "showinv", "viewnote", "unsit", "sit", 
-                                "sendchannel", "getstatus", "getstatusall", "getinv", "getinvworn", "findfolder", "findfolders", 
-                                "attach", "attachall", "detachall", "getpath", "attachthis", "attachallthis", "detachthis", "detachallthis", 
-                                "fartouch", "showworldmap", "showminimap", "showloc", "tpto", "accepttp", "acceptpermission", "shownames", "fly", 
-                                "getsitid", "setdebug", "setenv", "detachme", "showhovertextall",  "showhovertextworld", "showhovertexthud", 
-                                "showhovertext", "notify", "defaultwear", "versionnum", "permissive", "viewscript", "viewtexture"
+                                "detach", "attach", "addattach", "remattach", "addoutfit", "remoutfit", "emote", "sendchat", "recvchat", "recvemote",
+                                "redirchat", "rediremote", "chatwhisper", "chatnormal", "chatshout", "sendchannel", "sendim", "recvim", "permissive",
+                                "notify", "showinv", "showminimap", "showworldmap", "showloc", "shownames", "showhovertext", "showhovertexthud",
+                                "showhovertextworld", "showhovertextall", "tplm", "tploc", "tplure", "viewnote", "viewscript", "viewtexture",
+                                "acceptpermission", "accepttp", "defaultwear", "allowidle", "edit", "rez", "fartouch", "interact", "touch",
+                                "touchattach", "touchhud", "touchworld", "fly", "unsit", "sit", "sittp", "setdebug", "setenv", "detachme", "detachthis",
+                                "detachall", "detachallthis", "attachthis", "attachall", "attachallthis", "tpto", "version", "versionnew", "versionnum",
+                                "getattach", "getattachnames", "getaddattachnames", "getremattachnames", "getoutfit", "getoutfitnames",
+                                "getaddoutfitnames", "getremoutfitnames", "findfolder", "findfolders", "getpath", "getinv", "getinvworn", "getsitid",
+                                "getstatus", "getstatusall"
                         };
 
                 for (int idxBvhr = 0; idxBvhr < RLV_BHVR_COUNT; idxBvhr++)
@@ -133,9 +147,7 @@ RlvObject::RlvObject(const LLUUID& idObj) : m_UUID(idObj), m_nLookupMisses(0)
 
 bool RlvObject::addCommand(const RlvCommand& rlvCmd)
 {
-        // Sanity checking
-        if (RLV_TYPE_ADD != rlvCmd.getParamType())
-                return false;
+        RLV_ASSERT(RLV_TYPE_ADD == rlvCmd.getParamType());
 
         // Don't add duplicate commands for this object (ie @detach=n followed by another @detach=n later on)
         for (rlv_command_list_t::iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
@@ -155,9 +167,7 @@ bool RlvObject::addCommand(const RlvCommand& rlvCmd)
 
 bool RlvObject::removeCommand(const RlvCommand& rlvCmd)
 {
-        // Sanity checking
-        if (RLV_TYPE_REMOVE != rlvCmd.getParamType())
-                return false;
+        RLV_ASSERT(RLV_TYPE_REMOVE == rlvCmd.getParamType());
 
         for (rlv_command_list_t::iterator itCmd = m_Commands.begin(); itCmd != m_Commands.end(); ++itCmd)
         {
@@ -188,7 +198,7 @@ bool RlvObject::hasBehaviour(ERlvBehaviour eBehaviour, const std::string& strOpt
         return false;
 }
 
-// Checked: 2009-06-07 (RLVa-0.2.1c)
+// Checked: 2009-11-27 (RLVa-1.1.0f) | Modified: RLVa-1.1.0f
 std::string RlvObject::getStatusString(const std::string& strMatch) const
 {
         std::string strStatus, strCmd;
@@ -198,8 +208,7 @@ std::string RlvObject::getStatusString(const std::string& strMatch) const
                 strCmd = itCmd->asString();
                 if ( (strMatch.empty()) || (std::string::npos != strCmd.find(strMatch)) )
                 {
-                        if (!strStatus.empty())
-                                strStatus.push_back('/');
+                        strStatus.push_back('/');
                         strStatus += strCmd;
                 }
         }
@@ -212,7 +221,7 @@ std::string RlvObject::getStatusString(const std::string& strMatch) const
 //
 
 // Checked: 2009-10-12 (RLVa-1.0.5b) | Modified: RLVa-1.0.5b
-void RlvAttachmentManager::forceAttach(const LLUUID& idItem, S32 idxAttachPt)
+void RlvAttachmentManager::attach(const LLUUID& idItem, S32 idxAttachPt)
 {
         #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
                 LLAttachmentRezAction* rez_action = new LLAttachmentRezAction();
@@ -224,18 +233,15 @@ void RlvAttachmentManager::forceAttach(const LLUUID& idItem, S32 idxAttachPt)
                 LLSD payload;
                 payload["item_id"] = idItem;
                 payload["attachment_point"] = idxAttachPt;
-
-                LLNotifications::instance().forceResponse(
-                        LLNotification::Params("ReplaceAttachment").payload(payload), 0/*YES*/);
+                LLNotifications::instance().forceResponse(LLNotification::Params("ReplaceAttachment").payload(payload), 0/*YES*/);
         #endif
 }
 
-// Checked: 2009-10-12 (RLVa-1.0.5b) | Modified: RLVa-1.0.5b
-void RlvAttachmentManager::forceDetach(LLViewerJointAttachment* pAttachPt)
+// Checked: 2009-11-24 (RLVa-1.1.0k) | Added: RLVa-1.1.0e
+void RlvAttachmentManager::detach(LLViewerJointAttachment* pAttachPt)
 {
-        // Copy/paste from handle_detach_from_avatar()
-        LLViewerObject* attached_object = pAttachPt->getObject();
-        if (attached_object)
+        // [See handle_detach_from_avatar()]
+        if ( (pAttachPt) && (pAttachPt->getObject()) )
         {
                 gMessageSystem->newMessage("ObjectDetach");
                 gMessageSystem->nextBlockFast(_PREHASH_AgentData);
@@ -243,7 +249,7 @@ void RlvAttachmentManager::forceDetach(LLViewerJointAttachment* pAttachPt)
                 gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 
                 gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-                gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, attached_object->getLocalID());
+                gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, pAttachPt->getObject()->getLocalID());
                 gMessageSystem->sendReliable( gAgent.getRegionHost() );
         }
 }
@@ -278,7 +284,7 @@ void RlvAttachmentManager::onAttach(LLViewerJointAttachment* pAttachPt)
                                 // If it was empty we need to force detach the new attachment; if it wasn't we need to reattach the old one
                                 if (itAttachPrev->second.isNull())
                                 {
-                                        forceDetach(pAttachPt);
+                                        detach(pAttachPt);
                                         m_PendingDetach.insert(std::pair<S32, LLUUID>(idxAttachPt, pAttachPt->getItemID()));
                                 }
                                 else if (m_PendingAttach.find(idxAttachPt) == m_PendingAttach.end()) // (only if we're not reattaching something else there)
@@ -321,7 +327,7 @@ void RlvAttachmentManager::onSavedAssetIntoInventory(const LLUUID& idItem)
         {
                 if ( (!itAttach->second.fAssetSaved) && (idItem == itAttach->second.idItem) )
                 {
-                        forceAttach(itAttach->second.idItem, itAttach->first);
+                        attach(itAttach->second.idItem, itAttach->first);
                         itAttach->second.tsAttach = LLFrameTimer::getElapsedSeconds();
                 }
         }
@@ -368,7 +374,7 @@ BOOL RlvAttachmentManager::onTimer()
 
                 if (fAttach)
                 {
-                        forceAttach(itAttach->second.idItem, itAttach->first);
+                        attach(itAttach->second.idItem, itAttach->first);
                         itAttach->second.tsAttach = tsCurrent;
                 }
 
@@ -421,7 +427,7 @@ const LLUUID& RlvWearableItemCollector::getFoldedParent(const LLUUID& idFolder)
         return (m_Folding.end() == itFolder) ? idFolder : itFolder->second;
 }
 
-// Checked: 2009-07-29 (RLVa-1.0.1b) | Modified: RLVa-1.0.1b
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Modified: RLVa-1.1.0i
 bool RlvWearableItemCollector::onCollectFolder(const LLInventoryCategory* pFolder)
 {
         const LLUUID& idParent = pFolder->getParentUUID();
@@ -437,25 +443,35 @@ bool RlvWearableItemCollector::onCollectFolder(const LLInventoryCategory* pFolde
                         return false;
         #endif // RLV_EXTENSION_FLAG_NOSTRIP
 
-        if (gRlvHandler.isFoldedFolder(pFolder, m_fAttach))                                                     // Check for folder that should get folded under its parent
+        if (gRlvHandler.isFoldedFolder(pFolder, m_fAttach, false))                                      // 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());
+                #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                if ( (!RlvSettings::getEnableComposites()) ||                                                   // ... if we're not checking composite folders
+                         (!gRlvHandler.isCompositeFolder(pFolder)) ||                                           // ... or if it's not a composite folder
+                     ((m_fAttach) && (gRlvHandler.canWearComposite(pFolder))) ||                // ... or if we're attaching and can attach it OR
+                         (!m_fAttach) && (gRlvHandler.canTakeOffComposite(pFolder)) )           // ... or if we're detaching and can detach it
+                #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                {
+                        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... 
+        #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        else if ( (RlvSettings::getEnableComposites()) &&
+                          (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_fAttach) && (gRlvHandler.canWearComposite(pFolder))) ||             // ... are attaching and can attach OR
+                            (!m_fAttach) && (gRlvHandler.canTakeOffComposite(pFolder)) ) )      // ... are detaching and can detach
         {
                 m_Wearable.push_front(pFolder->getUUID());
                 m_Folding.insert(std::pair<LLUUID, LLUUID>(pFolder->getUUID(), idParent));
         }
-        #endif // RLV_EXPERIMENTAL_COMPOSITES
+        #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
 
         return false;
 }
@@ -486,13 +502,13 @@ bool RlvWearableItemCollector::onCollectItem(const LLInventoryItem* pItem)
                 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*
+                                   ( (!m_fAttach) || (gRlvHandler.hasAttachPointName(pItem, true)) || (RlvSettings::getEnableSharedWear()) );
                         break;
-                #ifdef RLV_EXPERIMENTAL_FORCEWEAR_GESTURES
+                #ifdef RLV_EXTENSION_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
+                #endif // RLV_EXTENSION_FORCEWEAR_GESTURES
                 default:
                         break;
         }
@@ -507,6 +523,431 @@ bool RlvWearableItemCollector::operator()(LLInventoryCategory* pFolder, LLInvent
 }
 
 // ============================================================================
+// RlvForceWear
+//
+
+// Checked: 2010-02-17 (RLVa-1.1.0o) | Modified: RLVa-1.1.0o
+void RlvForceWear::forceFolder(const LLViewerInventoryCategory* pFolder, eWearAction eAction, eWearFlags eFlags)
+{
+        // [See LLWearableBridge::wearOnAvatar(): don't wear anything until initial wearables are loaded, can destroy clothing items]
+        if (!gAgent.areWearablesLoaded())
+        {
+                LLNotifications::instance().add("CanNotChangeAppearanceUntilLoaded");
+                return;
+        }
+        // Sanity check - getAvatarObject() can't be NULL [see RlvForceWear::isWearingItem()]
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        if (!pAvatar)
+                return;
+
+        LLInventoryModel::cat_array_t folders;
+        LLInventoryModel::item_array_t items;
+        RlvWearableItemCollector functor(pFolder->getUUID(), (ACTION_ATTACH == eAction), (FLAG_MATCHALL & eFlags));
+
+        // Grab a list of all the items we'll be wearing/attaching
+        gInventory.collectDescendentsIf(pFolder->getUUID(), folders, items, FALSE, functor);
+
+        for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++)
+        {
+                LLViewerInventoryItem* pItem = items.get(idxItem);
+
+                // If it's wearable it should be worn on detach
+                if ( (ACTION_DETACH == eAction) && (isWearableItem(pItem)) && (!isWearingItem(pItem)) )
+                        continue;
+
+                //  NOTES: * if there are composite items then RlvWearableItemCollector made sure they can be worn (or taken off depending)
+                //         * some scripts issue @remattach=force,attach:worn-items=force so we need to attach items even if they're currently worn
+                switch (pItem->getType())
+                {
+                        case LLAssetType::AT_BODYPART:
+                                RLV_ASSERT(ACTION_ATTACH == eAction);   // RlvWearableItemCollector shouldn't be supplying us with body parts on detach
+                        case LLAssetType::AT_CLOTHING:
+                                if (ACTION_ATTACH == eAction)
+                                {
+                                        // The check for whether we're replacing a currently worn composite item happens in onWearableArrived()
+                                        if (std::find(m_addWearables.begin(), m_addWearables.end(), pItem) == m_addWearables.end())
+                                                m_addWearables.push_back(pItem);
+                                }
+                                else
+                                {
+                                        LLWearable* pWearable = gAgent.getWearableFromWearableItem(pItem->getUUID());
+                                        if ( (pWearable) && (isForceRemovable(pWearable->getType(), false)) )
+                                        {
+                                                if (std::find(m_remWearables.begin(), m_remWearables.end(), pWearable->getType()) == m_remWearables.end())
+                                                        m_remWearables.push_back(pWearable->getType());
+                                        }
+                                }
+                                break;
+
+                        case LLAssetType::AT_OBJECT:
+                                if (ACTION_ATTACH == eAction)
+                                {
+                                        LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(pItem, true);
+                                        if ( ( (pAttachPt) &&                                                                                                                            // Need a specific attach pt that
+                                                   (!gRlvHandler.isLockedAttachment(pAttachPt->getObject(), RLV_LOCK_REMOVE)) && // doesn't have a locked object
+                                                   (!gRlvHandler.isLockedAttachment(pAttachPt, RLV_LOCK_ADD)) ) ||               // and that can be attached to
+                                                 (RlvSettings::getEnableSharedWear()) )
+                                        {
+                                                if (std::find(m_addAttachments.begin(), m_addAttachments.end(), pItem) == m_addAttachments.end())
+                                                {
+                                                        #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                                                        // We still need to check whether we're about to replace a currently worn composite item
+                                                        // (which we're not if we're just reattaching an attachment we're already wearing)
+                                                        LLViewerInventoryCategory* pCompositeFolder = NULL;
+                                                        if ( (pAttachPt->getObject()) && (RlvSettings::getEnableComposites()) &&
+                                                                 (pAttachPt->getItemID() != pItem->getUUID()) &&
+                                                                 (gRlvHandler.getCompositeInfo(pAttachPt->getItemID(), NULL, &pCompositeFolder)) )
+                                                        {
+                                                                // If we can't take off the composite folder this item would replace then don't allow it to get attached
+                                                                if (gRlvHandler.canTakeOffComposite(pCompositeFolder))
+                                                                {
+                                                                        forceFolder(pCompositeFolder, ACTION_DETACH, FLAG_DEFAULT);
+                                                                        m_addAttachments.push_back(pItem);
+                                                                }
+                                                        }
+                                                        else
+                                                        #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                                                        {
+                                                                m_addAttachments.push_back(pItem);
+                                                        }
+                                                }
+                                        }
+                                }
+                                else
+                                {
+                                        LLViewerJointAttachment* pAttachPt = pAvatar->getWornAttachmentPoint(pItem->getUUID());
+                                        if ( (pAttachPt) && (isForceDetachable(pAttachPt, false)) )
+                                        {
+                                                if (std::find(m_remAttachments.begin(), m_remAttachments.end(), pAttachPt) == m_remAttachments.end())
+                                                        m_remAttachments.push_back(pAttachPt);
+                                        }
+                                }
+                                break;
+
+                        #ifdef RLV_EXTENSION_FORCEWEAR_GESTURES
+                        case LLAssetType::AT_GESTURE:
+                                if (ACTION_ATTACH == eAction)
+                                {
+                                        if (std::find(m_addGestures.begin(), m_addGestures.end(), pItem) == m_addGestures.end())
+                                                m_addGestures.push_back(pItem);
+                                }
+                                else
+                                {
+                                        if (std::find(m_remGestures.begin(), m_remGestures.end(), pItem) == m_remGestures.end())
+                                                m_remGestures.push_back(pItem);
+                                }
+                                break;
+                        #endif // RLV_EXTENSION_FORCEWEAR_GESTURES
+
+                        default:
+                                break;
+                }
+        }
+}
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Added: RLVa-1.1.0i
+bool RlvForceWear::isForceDetachable(LLViewerJointAttachment* pAttachPt, bool fCheckComposite /*=true*/, LLViewerObject* pExceptObj /*=NULL*/)
+{
+        // Attachment point can be detached by an RLV command if:
+        //   - something is worn on the attachment point
+        //   - what's worn isn't "remove locked" by anything (or anything except the object specified by pExceptObj)
+        //   - what's worn is strippable
+        //   - composite folders are disabled *or* what's worn isn't part of a composite folder that has at least one item locked
+        #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        LLViewerInventoryCategory* pFolder = NULL;
+        #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        return
+          (
+                (pAttachPt) && (pAttachPt->getObject()) &&
+                ( (!pExceptObj) ? (!gRlvHandler.isLockedAttachment(pAttachPt->getObject(), RLV_LOCK_REMOVE))
+                                : (!gRlvHandler.isLockedAttachmentExcept(pAttachPt->getObject(), RLV_LOCK_REMOVE, pExceptObj)) )
+                #ifdef RLV_EXTENSION_FLAG_NOSTRIP
+                && (gRlvHandler.isStrippable(pAttachPt->getItemID()))
+                #endif // RLV_EXTENSION_FLAG_NOSTRIP
+                #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                && ( (!fCheckComposite) || (!RlvSettings::getEnableComposites()) ||
+                     (!gRlvHandler.getCompositeInfo(pAttachPt->getItemID(), NULL, &pFolder)) || (gRlvHandler.canTakeOffComposite(pFolder)) )
+                #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+          );
+}
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Added: RLVa-1.1.0i
+void RlvForceWear::forceDetach(LLViewerJointAttachment* pAttachPt)
+{
+        // Sanity check - no need to process duplicate removes
+        if ( (!pAttachPt) || (std::find(m_remAttachments.begin(), m_remAttachments.end(), pAttachPt) != m_remAttachments.end()) )
+                return;
+
+        if (isForceDetachable(pAttachPt))
+        {
+                #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                        LLViewerInventoryCategory* pFolder = NULL;
+                        if ( (RlvSettings::getEnableComposites()) &&
+                                 (gRlvHandler.getCompositeInfo(pAttachPt->getItemID(), NULL, &pFolder)) )
+                        {
+                                // Attachment belongs to a composite folder so detach the entire folder (if we can take it off)
+                                if (gRlvHandler.canTakeOffComposite(pFolder))
+                                        forceFolder(pFolder, ACTION_DETACH, FLAG_DEFAULT);
+                        }
+                        else
+                #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                        {
+                                m_remAttachments.push_back(pAttachPt);
+                        }
+        }
+}
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Added: RLVa-1.1.0i
+bool RlvForceWear::isForceRemovable(EWearableType wtType, bool fCheckComposite /*=true*/, const LLUUID& idExcept /*=LLUUID::null*/)
+{
+        // Wearable type can be removed by an RLV command if:
+        //   - something is worn on that layer
+        //   - its asset type is AT_CLOTHING
+        //   - what's worn isn't "remove locked" by anything (or anything except the object specified by idExcept)
+        //   - what's worn is strippable
+        //   - composite folders are disabled *or* what's worn isn't part of a composite folder that has at least one item locked
+        LLWearable* pWearable = gAgent.getWearable(wtType);
+        #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        LLViewerInventoryCategory* pFolder = NULL;
+        #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        return
+          (
+                (pWearable) &&
+                (LLAssetType::AT_CLOTHING == LLWearable::typeToAssetType(wtType)) &&
+                ( (idExcept.notNull()) ? (gRlvHandler.isRemovable(wtType))
+                                       : (gRlvHandler.isRemovableExcept(wtType, idExcept)) )
+                #ifdef RLV_EXTENSION_FLAG_NOSTRIP
+                && (gRlvHandler.isStrippable(gAgent.getWearableItem(wtType)))
+                #endif // RLV_EXTENSION_FLAG_NOSTRIP
+                #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                && ( (!fCheckComposite) || (!RlvSettings::getEnableComposites()) ||
+                     (!gRlvHandler.getCompositeInfo(gAgent.getWearableItem(wtType), NULL, &pFolder)) || (gRlvHandler.canTakeOffComposite(pFolder)) )
+                #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+          );
+}
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Added: RLVa-1.1.0i
+void RlvForceWear::forceRemove(EWearableType wtType)
+{
+        // Sanity check - no need to process duplicate removes
+        if ( (WT_INVALID == wtType) || (std::find(m_remWearables.begin(), m_remWearables.end(), wtType) != m_remWearables.end()) )
+                return;
+
+        if (isForceRemovable(wtType))
+        {
+                #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                        LLViewerInventoryCategory* pFolder = NULL;
+                        if ( (RlvSettings::getEnableComposites()) &&
+                                 (gRlvHandler.getCompositeInfo(gAgent.getWearableItem(wtType), NULL, &pFolder)) )
+                        {
+                                // Wearable belongs to a composite folder so detach the entire folder (if we can take it off)
+                                if (gRlvHandler.canTakeOffComposite(pFolder))
+                                        forceFolder(pFolder, ACTION_DETACH, FLAG_DEFAULT);
+                        }
+                        else
+                #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+                        {
+                                m_remWearables.push_back(wtType);
+                        }
+        }
+}
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Added: RLVa-1.1.0i
+void RlvForceWear::processAdd()
+{
+        // Process attachments
+        if (m_addAttachments.size())
+        {
+                // Workaround for RezMultipleAttachmentsFromInv bug (see http://jira.secondlife.com/browse/SVC-5383)
+                #ifndef RLV_WORKAROUND_REZMULTIPLEATTACH
+                        wear_attachments_on_avatar(m_addAttachments, FALSE);
+                #else
+                        for (S32 idxItem = 0, cntItem = m_addAttachments.count(); idxItem < cntItem; idxItem++)
+                        {
+                                LLViewerInventoryItem* pItem = m_addAttachments.get(idxItem);
+
+                                S32 idxAttachPt = gRlvHandler.getAttachPointIndex(pItem, true);
+                                if (0 != idxAttachPt)
+                                {
+                                        #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 = idxAttachPt;
+
+                                                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"] = idxAttachPt;
+
+                                                LLNotifications::instance().forceResponse(LLNotification::Params("ReplaceAttachment").payload(payload), 0/*YES*/);
+                                        #endif
+                                }
+                        }
+                #endif // RLV_WORKAROUND_REZMULTIPLEATTACH
+
+                m_addAttachments.clear();
+        }
+
+        // Process wearables
+        if (m_addWearables.size())
+        {
+                // [See wear_inventory_category_on_avatar_step2()]
+                LLWearableHoldingPattern* pWearData = new LLWearableHoldingPattern(TRUE);
+
+                // We need to populate 'pWearData->mFoundList' before doing anything else because (some of) the assets might already be available
+                for (S32 idxItem = 0, cntItem = m_addWearables.count(); idxItem < cntItem; idxItem++)
+                {
+                        LLViewerInventoryItem* pItem = m_addWearables.get(idxItem);
+                        if ( (pItem) && ((LLAssetType::AT_BODYPART == pItem->getType()) || (LLAssetType::AT_CLOTHING == pItem->getType())) )
+                        {
+                                LLFoundData* pFound = new LLFoundData(pItem->getUUID(), pItem->getAssetUUID(), pItem->getName(), pItem->getType());
+                                pWearData->mFoundList.push_front(pFound);
+                        }
+                }
+
+                if (!pWearData->mFoundList.size())
+                {
+                        delete pWearData;
+                        return;
+                }
+
+                // If all the assets are available locally then "pWearData" will be freed *before* the last "gWearableList.getAsset()" call returns
+                bool fContinue = true; LLWearableHoldingPattern::found_list_t::const_iterator itWearable = pWearData->mFoundList.begin();
+                while ( (fContinue) && (itWearable != pWearData->mFoundList.end()) )
+                {
+                        const LLFoundData* pFound = *itWearable;
+                        ++itWearable;
+                        fContinue = (itWearable != pWearData->mFoundList.end());
+                        gWearableList.getAsset(pFound->mAssetID, pFound->mName, pFound->mAssetType, onWearableArrived, (void*)pWearData);
+                }
+
+                m_addWearables.clear();
+        }
+
+        // Process gestures
+        if (m_addGestures.size())
+        {
+                gGestureManager.activateGestures(m_addGestures);
+                for (S32 idxGesture = 0, cntGesture = m_addGestures.count(); idxGesture < cntGesture; idxGesture++)
+                        gInventory.updateItem(m_addGestures.get(idxGesture));
+                gInventory.notifyObservers();
+
+                m_addGestures.clear();
+        }
+}
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Added: RLVa-1.1.0i
+void RlvForceWear::processRem()
+{
+        // Process attachments
+        if (m_remAttachments.size())
+        {
+                // [See LLAgent::userRemoveAllAttachments()]
+                gMessageSystem->newMessage("ObjectDetach");
+                gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+                gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+                gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+
+                for (std::list<LLViewerJointAttachment*>::const_iterator itAttachPt = m_remAttachments.begin();
+                                itAttachPt != m_remAttachments.end(); ++itAttachPt)
+                {
+                        LLViewerJointAttachment* pAttachPt = *itAttachPt;
+                        if (pAttachPt->getObject())
+                        {
+                                gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
+                                gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, pAttachPt->getObject()->getLocalID());
+                        }
+                }
+
+                gMessageSystem->sendReliable(gAgent.getRegionHost());
+
+                m_remAttachments.clear();
+        }
+
+        // Process wearables
+        if (m_remWearables.size())
+        {
+                for (std::list<EWearableType>::const_iterator itWearable = m_remWearables.begin(); itWearable != m_remWearables.end(); ++itWearable)
+                        gAgent.removeWearable(*itWearable);
+
+                m_remWearables.clear();
+        }
+
+        // Process gestures
+        if (m_remGestures.size())
+        {
+                for (S32 idxGesture = 0, cntGesture = m_remGestures.count(); idxGesture < cntGesture; idxGesture++)
+                {
+                        LLViewerInventoryItem* pItem = m_remGestures.get(idxGesture);
+                        gGestureManager.deactivateGesture(pItem->getUUID());
+                        gInventory.updateItem(pItem);
+                        gInventory.notifyObservers();
+                }
+
+                m_remGestures.clear();
+        }
+}
+
+// Checked: 2010-02-17 (RLVa-1.1.0o) | Modified: RLVa-1.1.0o
+void RlvForceWear::onWearableArrived(LLWearable* pWearable, void* pParam)
+{
+        #ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+        // If this wearable will end up replacing a currently worn one that belongs to a composite folder then we need to detach the composite
+        LLViewerInventoryCategory* pFolder = NULL;
+        if ( (RlvSettings::getEnableComposites()) && (pWearable) && (gAgent.getWearable(pWearable->getType())) )
+        {
+                // If we're just rewearing the same item we're already wearing then we're not replacing a composite folder
+                LLWearableHoldingPattern* pWearData = (LLWearableHoldingPattern*)pParam; LLUUID idItem;
+                for (LLWearableHoldingPattern::found_list_t::const_iterator itWearable = pWearData->mFoundList.begin();
+                                itWearable != pWearData->mFoundList.end(); ++itWearable)
+                {
+                        LLFoundData* pFound = *itWearable;
+                        if (pWearable->getID() == pFound->mAssetID)
+                        {
+                                idItem = pFound->mItemID;
+                                break;
+                        }
+                }
+                if ( (idItem.notNull()) && (idItem != gAgent.getWearableItem(pWearable->getType())) &&
+                         (gRlvHandler.getCompositeInfo(gAgent.getWearableItem(pWearable->getType()), NULL, &pFolder)) )
+                {
+                        RlvForceWear rlvWear;
+                        rlvWear.forceFolder(pFolder, ACTION_DETACH, FLAG_DEFAULT);
+                        rlvWear.done();
+                }
+        }
+        #endif // RLV_EXPERIMENTAL_COMPOSITEFOLDERS
+
+        wear_inventory_category_on_avatar_loop(pWearable, pParam);
+}
+
+// ============================================================================
+// RlvBehaviourNotifyObserver
+//
+
+void RlvBehaviourNotifyObserver::changed(const RlvCommand& rlvCmd, bool fInternal)
+{
+        if (fInternal)
+                return;
+
+        std::string strCmd = rlvCmd.asString(), strNotify; ERlvParamType eCmdType = rlvCmd.getParamType();
+        if ( (RLV_TYPE_ADD == eCmdType) || (RLV_TYPE_REMOVE == eCmdType) )
+                strNotify = llformat("/%s=%s", strCmd.c_str(), rlvCmd.getParam().c_str());
+        else if (RLV_TYPE_CLEAR == eCmdType)
+                strNotify = llformat("/%s", strCmd.c_str());
+        else
+                return;
+
+        for (std::multimap<LLUUID, notifyData>::const_iterator itNotify = m_Notifications.begin();
+                        itNotify != m_Notifications.end(); ++itNotify)
+        {
+                if ( (itNotify->second.strFilter.empty()) || (std::string::npos != strCmd.find(itNotify->second.strFilter)) )
+                        rlvSendChatReply(itNotify->second.nChannel, strNotify);
+        }
+}
+
+// ============================================================================
 // RlvWLSnapshot
 //
 
@@ -546,38 +987,6 @@ RlvWLSnapshot* RlvWLSnapshot::takeSnapshot()
 }
 
 // =========================================================================
-// RlvSettings
-//
-
-BOOL RlvSettings::fShowNameTags = FALSE;
-
-BOOL RlvSettings::getEnableWear()
-{
-        return 
-                rlvGetSettingBOOL(RLV_SETTING_ENABLEWEAR, TRUE) &&       // "Enable Wear" is toggled on and...
-                (!gRlvHandler.hasBehaviour(RLV_BHVR_DEFAULTWEAR)) && // not restricted and...
-                (!gRlvHandler.hasBehaviour(RLV_BHVR_ADDATTACH));         // we have attach points we can attach to [see RlvHandler::onAddRemAttach()]
-}
-
-#ifdef RLV_EXTENSION_STARTLOCATION
-        // Checked: 2009-07-08 (RLVa-1.0.0e) | Modified: RLVa-0.2.1d
-        void RlvSettings::updateLoginLastLocation()
-        {
-                if (gSavedPerAccountSettings.controlExists(RLV_SETTING_LOGINLASTLOCATION))
-                {
-                        BOOL fValue = (gRlvHandler.hasBehaviour(RLV_BHVR_TPLOC)) ||
-                                                  ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) &&
-                                                    (gAgent.getAvatarObject()) && (!gAgent.getAvatarObject()->mIsSitting) );
-                        if (gSavedPerAccountSettings.getBOOL(RLV_SETTING_LOGINLASTLOCATION) != fValue)
-                        {
-                                gSavedPerAccountSettings.setBOOL(RLV_SETTING_LOGINLASTLOCATION, fValue);
-                                gSavedPerAccountSettings.saveToFile(gSavedSettings.getString("PerAccountSettingsFile"), TRUE);
-                        }
-                }
-        }
-#endif // RLV_EXTENSION_STARTLOCATION
-
-// =========================================================================
 // Various helper classes/timers/functors
 //
 
@@ -618,39 +1027,40 @@ void RlvCurrentlyWorn::fetchWorn()
         f.fetchItems(idItems);
 }
 
-// Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0f
-bool RlvSelectHasLockedAttach::apply(LLSelectNode* pNode)
-{
-        return (pNode->getObject()) ? gRlvHandler.isLockedAttachment(pNode->getObject(), m_eLock) : false;
-}
-
-// Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-0.2.0f
-bool RlvSelectIsOwnedByOrGroupOwned::apply(LLSelectNode* pNode)
+void RlvGiveToRLVAgentOffer::done()
 {
-        return (pNode->mPermissions->isGroupOwned()) || (pNode->mPermissions->getOwner() == m_idAgent);
-}
+        LLViewerInventoryCategory* pRlvRoot = gRlvHandler.getSharedRoot();
+        LLViewerInventoryCategory* pFolder = (mCompleteFolders.size()) ? gInventory.getCategory(mCompleteFolders[0]) : NULL;
+        if ( (pRlvRoot) && (pFolder) )
+        {
+                std::string strName = pFolder->getName();
+                if (strName.find(RLV_PUTINV_PREFIX) == 0)
+                {
+                        LLInventoryModel::update_list_t update;
+                        LLInventoryModel::LLCategoryUpdate updOldParent(pFolder->getParentUUID(), -1);
+                        update.push_back(updOldParent);
+                        LLInventoryModel::LLCategoryUpdate updNewParent(pRlvRoot->getUUID(), 1);
+                        update.push_back(updNewParent);
+                        gInventory.accountForUpdate(update);
+
+                        LLPointer<LLViewerInventoryCategory> pNewFolder = new LLViewerInventoryCategory(pFolder);
+                        pNewFolder->setParent(pRlvRoot->getUUID());
+                        pNewFolder->updateParentOnServer(FALSE);
+                        pNewFolder->rename(strName.erase(0, strName.find(RLV_FOLDER_PREFIX_PUTINV)));
+                        pNewFolder->updateServer(FALSE);
+                        gInventory.updateCategory(pNewFolder);
+                }
+        }
 
-// 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);
+        gInventory.removeObserver(this);
+        gInventory.notifyObservers();
+        delete this;
 }
 
 // ============================================================================
 // Various helper functions
 //
 
-// Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-BOOL rlvAttachToEnabler(void* pParam)
-{
-        // Disable an option on the "Attach to (HUD)" submenu if:
-        //   - the attachment point is locked non-detachable with an object attached
-        //   - the attachment point is locked non-attachable
-        return (pParam != NULL) && 
-                (!gRlvHandler.isLockedAttachment(((LLViewerJointAttachment*)pParam)->getObject(), RLV_LOCK_REMOVE)) &&
-                (!gRlvHandler.isLockedAttachment((LLViewerJointAttachment*)pParam, RLV_LOCK_ADD));
-}
-
 // Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-0.2.0g
 bool rlvCanDeleteOrReturn()
 {
@@ -677,13 +1087,6 @@ bool rlvCanDeleteOrReturn()
         return fIsAllowed;
 }
 
-// Checked: 2009-10-04 (RLVa-1.0.4b) | Modified: RLVa-1.0.4b
-BOOL rlvEnableWearEnabler(void* pParam)
-{
-        // Visually disables the "Enable Wear" option when restricted from toggling it
-        return (!gRlvHandler.hasBehaviour(RLV_BHVR_DEFAULTWEAR));
-}
-
 // Checked: 2009-05-26 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
 S32 rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType::EType type)
 {
@@ -712,12 +1115,12 @@ S32 rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType
 
                 #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", 
+                        args["[MESSAGE]"] = llformat("RestrainedLove 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", 
+                        args["MESSAGE"] = llformat("RestrainedLove Support will be %s after you restart",
                                 (rlv_handler_t::isEnabled()) ? "disabled" : "enabled" );
                         LLNotifications::instance().add("GenericAlert", args);
                 #endif
diff --git a/linden/indra/newview/rlvhelper.h b/linden/indra/newview/rlvhelper.h
index 25d8174..1204146 100644
--- a/linden/indra/newview/rlvhelper.h
+++ b/linden/indra/newview/rlvhelper.h
@@ -1,13 +1,15 @@
 #ifndef RLV_HELPER_H
 #define RLV_HELPER_H
 
+#include "llagent.h"
 #include "llboost.h"
+#include "llgesturemgr.h"
 #include "llinventorymodel.h"
-#include "llselectmgr.h"
-#include "llviewercontrol.h"
-#include "llviewerobjectlist.h"
+#include "llviewerinventory.h"
+#include "llvoavatar.h"
 #include "llwlparamset.h"
 #include "rlvdefines.h"
+#include "rlvcommon.h"
 
 #ifdef LL_WINDOWS
         #pragma warning (push)
@@ -40,7 +42,7 @@ public:
         bool               isStrict() const                     { return m_fStrict; }
         bool               isValid() const          { return m_fValid; }
 
-        static ERlvBehaviour      getBehaviourFromString(const std::string& strBhvr);
+        static ERlvBehaviour      getBehaviourFromString(const std::string& strBhvr, bool* pfStrict = NULL);
         static const std::string& getStringFromBehaviour(ERlvBehaviour eBhvr);
         static bool               hasStrictVariant(ERlvBehaviour eBhvr);
 
@@ -122,8 +124,9 @@ public:
          * Member functions
          */
 public:
-        static void forceAttach(const LLUUID& idItem, S32 idxAttachPt);
-        static void forceDetach(LLViewerJointAttachment* pAttachPt);
+        // NOTE: the following two do *not* respect attachment locks so use with care
+        static void attach(const LLUUID& idItem, S32 idxAttachPt);
+        static void detach(LLViewerJointAttachment* pAttachPt);
 protected:
         void startTimer() { if (!m_pTimer) m_pTimer = new RlvAttachmentManagerTimer(this); }
 
@@ -212,8 +215,12 @@ public:
                 std::string strFolderName = pFolder->getName();
                 LLStringUtil::toLower(strFolderName);
 
-                if ( (strFolderName.empty()) || (RLV_FOLDER_PREFIX_HIDDEN == strFolderName[0]) )
+                // NOTE: hidden or "give to #RLV" folders can never be a match
+                if ( (strFolderName.empty()) ||
+                         (RLV_FOLDER_PREFIX_HIDDEN == strFolderName[0]) || (RLV_FOLDER_PREFIX_PUTINV == strFolderName[0]) )
+                {
                         return false;
+                }
 
                 for (std::list<std::string>::const_iterator itCrit = m_Criteria.begin(); itCrit != m_Criteria.end(); ++itCrit)
                         if (std::string::npos == strFolderName.find(*itCrit))   // Return false on the first mismatch
@@ -257,17 +264,97 @@ protected:
 };
 
 // ============================================================================
+// RlvForceWear
+//
+
+class RlvForceWear
+{
+public:
+        // Folders
+        enum eWearAction { ACTION_ATTACH, ACTION_DETACH };
+        enum eWearFlags { FLAG_NONE = 0x00, FLAG_MATCHALL = 0x01, FLAG_DEFAULT = FLAG_NONE };
+        void forceFolder(const LLViewerInventoryCategory* pFolder, eWearAction eAction, eWearFlags eFlags);
+
+        // Attachments
+        static bool isForceDetachable(LLViewerJointAttachment* pAttachPt, bool fCheckComposite = true, LLViewerObject* pExceptObj = NULL);
+        void forceDetach(LLViewerJointAttachment* ptAttachPt);
+
+        // Wearables
+        static bool isForceRemovable(EWearableType wtType, bool fCheckComposite = true, const LLUUID& idExcept = LLUUID::null);
+        void forceRemove(EWearableType wtType);
+
+        // General purpose
+        static bool isWearableItem(const LLInventoryItem* pItem);
+        static bool isWearingItem(const LLInventoryItem* pItem);
+
+public:
+        void done()     { processRem(); processAdd(); }
+protected:
+        void processAdd();
+        void processRem();
+        static void     onWearableArrived(LLWearable* pWearable, void* pParam);
+
+protected:
+        LLInventoryModel::item_array_t m_addAttachments, m_addWearables, m_addGestures, m_remGestures;
+        std::list<LLViewerJointAttachment*> m_remAttachments;
+        std::list<EWearableType> m_remWearables;
+};
+
+// ============================================================================
+// RlvBehaviourNotifyObserver
+//
+
+class RlvBehaviourNotifyObserver : public RlvBehaviourObserver
+{
+public:
+        virtual ~RlvBehaviourNotifyObserver() { }
+        virtual void changed(const RlvCommand& rlvCmd, bool fInternal);
+
+        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;
+};
+
+// ============================================================================
 // RlvRetainedCommand
 //
 
 struct RlvRetainedCommand
 {
 public:
-        std::string strObject;
         LLUUID      idObject;
-        std::string strCmd;
+        RlvCommand  rlvCmd;
 
-        RlvRetainedCommand(const std::string obj, const LLUUID& uuid, const std::string& cmd) : strObject(obj), idObject(uuid), strCmd(cmd) {}
+        RlvRetainedCommand(const LLUUID& uuid, const RlvCommand& cmd) : idObject(uuid), rlvCmd(cmd) {}
 private:
         RlvRetainedCommand();
 };
@@ -309,43 +396,6 @@ private:
 };
 
 // ============================================================================
-// RlvSettings
-//
-
-inline BOOL rlvGetSettingBOOL(const std::string& strSetting, BOOL fDefault)
-{
-        return (gSavedSettings.controlExists(strSetting)) ? gSavedSettings.getBOOL(strSetting) : fDefault;
-}
-inline BOOL rlvGetPerUserSettingsBOOL(const std::string& strSetting, BOOL fDefault)
-{
-        return (gSavedPerAccountSettings.controlExists(strSetting)) ? gSavedPerAccountSettings.getBOOL(strSetting) : fDefault;
-}
-
-class RlvSettings
-{
-public:
-        static BOOL getDebug()                                  { return rlvGetSettingBOOL(RLV_SETTING_DEBUG, FALSE); }
-        static BOOL getForbidGiveToRLV()                { return rlvGetSettingBOOL(RLV_SETTING_FORBIDGIVETORLV, TRUE); }
-
-        static BOOL getEnableWear();
-        static BOOL getHideLockedLayers()               { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDLAYER, FALSE); }               
-        static BOOL getHideLockedAttach()               { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDATTACH, FALSE); }
-        static BOOL getHideLockedInventory()    { return rlvGetSettingBOOL(RLV_SETTING_HIDELOCKEDINVENTORY, FALSE); }
-        static BOOL getShowNameTags()                   { return fShowNameTags; }
-
-        #ifdef RLV_EXTENSION_STARTLOCATION
-                static BOOL getLoginLastLocation()      { return rlvGetPerUserSettingsBOOL(RLV_SETTING_LOGINLASTLOCATION, TRUE); }
-                static void updateLoginLastLocation();
-        #endif // RLV_EXTENSION_STARTLOCATION
-
-        static BOOL fShowNameTags;
-};
-
-// ============================================================================
-// State keeping classes/structure
-//
-
-// ============================================================================
 // Various helper classes/timers/functors
 //
 
@@ -367,39 +417,21 @@ public:
         void fetchItem(const LLUUID& idItem);
 };
 
-struct RlvSelectHasLockedAttach : public LLSelectedNodeFunctor
-{
-        RlvSelectHasLockedAttach(ERlvLockMask eLock) : m_eLock(eLock) {}
-        virtual bool apply(LLSelectNode* pNode);
-protected:
-        ERlvLockMask m_eLock;
-};
-
-struct RlvSelectIsOwnedByOrGroupOwned : public LLSelectedNodeFunctor
+class RlvGiveToRLVAgentOffer : public LLInventoryFetchDescendentsObserver
 {
-        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;
+public:
+        RlvGiveToRLVAgentOffer() {}
+        virtual void done();
 };
 
 // ============================================================================
 // Various helper functions
 //
 
-BOOL rlvAttachToEnabler(void* pParam);
 bool rlvCanDeleteOrReturn();
-BOOL rlvEnableWearEnabler(void* pParam);
 S32  rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType::EType type);
 bool rlvIsEmote(const std::string& strUTF8Text);
 bool rlvIsValidReplyChannel(S32 nChannel);
-bool rlvIsWearingItem(const LLInventoryItem* pItem);
 
 void rlvSendBusyMessage(const LLUUID& idTo, const std::string& strMsg, const LLUUID& idSession = LLUUID::null);
 bool rlvSendChatReply(const std::string& strChannel, const std::string& strReply);
@@ -439,16 +471,6 @@ inline bool RlvCommand::operator ==(const RlvCommand& rhs) const
                 ( (RLV_TYPE_UNKNOWN != m_eParamType) ? (m_eParamType == rhs.m_eParamType) : (m_strParam == rhs.m_strParam) );
 }
 
-inline void RlvCurrentlyWorn::fetchItem(const LLUUID& idItem)
-{ 
-        if (idItem.notNull()) 
-        {
-                LLInventoryFetchObserver::item_ref_t idItems; 
-                idItems.push_back(idItem);
-                fetchItems(idItems);
-        }
-}
-
 inline bool RlvCommand::hasStrictVariant(ERlvBehaviour eBhvr)
 {
         switch (eBhvr)
@@ -465,6 +487,32 @@ inline bool RlvCommand::hasStrictVariant(ERlvBehaviour eBhvr)
         }
 }
 
+inline void RlvCurrentlyWorn::fetchItem(const LLUUID& idItem)
+{
+        if (idItem.notNull())
+        {
+                LLInventoryFetchObserver::item_ref_t idItems;
+                idItems.push_back(idItem);
+                fetchItems(idItems);
+        }
+}
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Added: RLVa-1.1.0i
+inline bool RlvForceWear::isWearableItem(const LLInventoryItem* pItem)
+{
+        return (LLAssetType::AT_OBJECT == pItem->getType()) || (LLAssetType::AT_GESTURE == pItem->getType()) ||
+                (LLAssetType::AT_BODYPART == pItem->getType()) || (LLAssetType::AT_CLOTHING == pItem->getType());
+}
+
+// Checked: 2009-12-18 (RLVa-1.1.0k) | Modified: RLVa-1.1.0i
+inline bool RlvForceWear::isWearingItem(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()));
+}
+
 // ============================================================================
 // Inlined helper functions
 //
diff --git a/linden/indra/newview/rlvmultistringsearch.cpp b/linden/indra/newview/rlvmultistringsearch.cpp
index 0aa9889..f8bb1c1 100644
--- a/linden/indra/newview/rlvmultistringsearch.cpp
+++ b/linden/indra/newview/rlvmultistringsearch.cpp
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright (c) 2009-2010, Kitty Barnett
+ *
+ * The source code in this file is provided to you under the terms of the
+ * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * 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.
+ *
+ */
+
 #include "llviewerprecompiledheaders.h"
 
 #include "rlvmultistringsearch.h"
diff --git a/linden/indra/newview/rlvmultistringsearch.h b/linden/indra/newview/rlvmultistringsearch.h
index 43b0172..120117d 100644
--- a/linden/indra/newview/rlvmultistringsearch.h
+++ b/linden/indra/newview/rlvmultistringsearch.h
@@ -1,3 +1,19 @@
+/**
+ *
+ * Copyright (c) 2009-2010, Kitty Barnett
+ *
+ * The source code in this file is provided to you under the terms of the
+ * GNU General Public License, version 2.0, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. Terms of the GPL can be found in doc/GPL-license.txt
+ * in this distribution, or online at http://www.gnu.org/licenses/gpl-2.0.txt
+ *
+ * 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.
+ *
+ */
+
 #ifndef RLV_MULTISTRINGSEARCH_H
 #define RLV_MULTISTRINGSEARCH_H
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
index 50721ab..82a65b8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -5,7 +5,7 @@
              embedded_items="false" enabled="true" follows="left|top|right|bottom"
              font="Monospace" height="376" ignore_tab="false" left="4"
              max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
-             word_wrap="true" show_line_numbers="true" spell_check="true">
+             word_wrap="true" show_line_numbers="true">
                 Loading...
         </text_editor>
         <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
index db36df5..13956e2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.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="true"
-                min_width="500" min_height="250" width="500" height="250" name="teleporthistory"
+                min_width="600" min_height="250" width="600" height="250" name="teleporthistory"
                 rect_control="FloaterTeleportHistoryRect" title="Teleport History">
         <tab_container label="TPlistTabs" bottom="40" height="185" left="5" follows="left|top|right|bottom" mouse_opaque="false" name="tplisttabs"
              tab_min_width="50" tab_position="top" width="480" right="-10" bg_opaque_color="0,0,0,0.0">
@@ -39,6 +39,10 @@
                 height="20" label="Show On Map" label_selected="Show On Map"
                 left_delta="100" mouse_opaque="true" name="show_on_map"
                 tool_tip="Center map on this location" width="125" />
+        <button bottom_delta="0" enabled="true" follows="left|bottom" font="SansSerif" halign="center"
+                height="20" label="Clear History"
+                left_delta="135" mouse_opaque="true" name="clear_history"
+                tool_tip="Clear Saved Teleport History" width="125" />
         <button bottom_delta="0" enabled="false" follows="bottom|right" font="SansSerif"
                 height="20" label="Copy SLURL to clipboard" left="-190" name="copy_slurl"
                 tool_tip="Copies current location as SLURL to be used on the web."
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 0cb4a59..3e0a5fa 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
@@ -321,6 +321,12 @@
        mouse_opaque="true" name="prim_count" v_pad="0" width="143">
     Primitives: [COUNT]
   </text>
+  <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="link_num" v_pad="0" width="143">
+    Link number: [NUMBER]
+  </text>
 
 <!-- Sub-tabs -->
 
@@ -1085,7 +1091,7 @@
         Glow:
       </text>
                         <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" left="180" max_val="1"
+                             increment="0.05" initial_val="0" left="180" max_val="1"
                              min_val="0" mouse_opaque="true" name="glow" width="58" />
                         <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Full bright" left="180" mouse_opaque="true"
@@ -1202,13 +1208,13 @@
                              mouse_opaque="true" name="tex scale" v_pad="0" width="160">
         Repeats Per Face:
       </text>
-      <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+      <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                              initial_val="0" label="Horizontal (U):" label_width="90" left="20"
                              max_val="10000" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
                         <check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
                              name="checkbox flip s" width="70" />
-                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                              initial_val="0" label="Vertical (V):" label_width="90" left="20"
                              max_val="10000" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
                         <check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
@@ -1247,11 +1253,11 @@
                              mouse_opaque="true" name="tex offset" v_pad="0" width="160">
         Offset:
       </text>
-                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                              initial_val="0" label="Horizontal (U):" label_width="90" left="20"
                              max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" label="Vertical (V):" label_width="90"
+                             increment="0.05" initial_val="0" label="Vertical (V):" label_width="90"
                              left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
                              width="160" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
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 66d78bd..c85dd47 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
@@ -1467,8 +1467,8 @@
 
         <menu_item_check name="Show Debug Messages"
                          label="Show Debug Messages">
-          <on_click function="ToggleControl" userdata="RestrainedLifeDebug" />
-          <on_check control="RestrainedLifeDebug" />
+          <on_click function="ToggleControl" userdata="RestrainedLoveDebug" />
+          <on_check control="RestrainedLoveDebug" />
         </menu_item_check>
 
         <menu_item_separator />
@@ -1515,8 +1515,8 @@
 
       <menu_item_check name="Forbid Give to #RLV" label="Forbid Give to #RLV">
         <on_click function="ToggleControl"
-                  userdata="RestrainedLifeForbidGiveToRLV" />
-        <on_check control="RestrainedLifeForbidGiveToRLV" />
+                  userdata="RestrainedLoveForbidGiveToRLV" />
+        <on_check control="RestrainedLoveForbidGiveToRLV" />
       </menu_item_check>
 
       <menu_item_check name="Show Name Tags" label="Show Name Tags">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index d7b078c..333e362 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6009,8 +6009,12 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
      index="1"
      name="Decline"
      text="Decline"/>
+    <button 
+      index="2" 
+      name="Profile" 
+      text="Profile"/>
     <button
-     index="2"
+     index="3"
      name="Ignore"
      text="Ignore"/>
   </form>
@@ -6033,7 +6037,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
      name="Decline"
      text="Decline"/>
     <button
-     index="2"
+    index="2"
+    name="Profile"
+    text="Profile"/>
+    <button
+     index="3"
      name="Ignore"
      text="Ignore"/>
   </form>
diff --git a/linden/indra/newview/skins/default/xui/en-us/rlva_strings.xml b/linden/indra/newview/skins/default/xui/en-us/rlva_strings.xml
new file mode 100755
index 0000000..f82a568
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/rlva_strings.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<rlva_strings>
+
+  <strings>
+    <!-- Primarily used when @showloc restricted -->
+    <string name="hidden_generic">(Hidden)</string>
+    <string name="hidden_parcel">(Hidden parcel)</string>
+    <string name="hidden_region">(Hidden region)</string>
+
+    <!-- Received/sent IMs will be replaced by the matching string when @recvim/sendim restricted -->
+    <string name="blocked_recvim">*** IM blocked by your viewer</string>
+    <string name="blocked_sendim">*** IM blocked by sender's viewer</string>
+
+    <!-- Shown as notifications -->
+    <string name="blocked_viewxxx">Unable to open [TYPE] due to RLV restrictions</string>
+
+    <!-- Sent as "Busy" messages to the remote party -->
+    <string name="blocked_recvim_remote">
+      The Resident you messaged is prevented from reading your instant messages at the moment, please try again later.
+    </string>
+    <string name="blocked_tplure_remote">
+      The Resident you invited is prevented from accepting teleport offers. Please try again later.
+    </string>
+  </strings>
+
+  <!-- Generic names used to replace resident names when @shownames restricted -->
+  <anonyms>
+    <anonym>A resident</anonym>
+    <anonym>This resident</anonym>
+    <anonym>That resident</anonym>
+    <anonym>An individual</anonym>
+    <anonym>This individual</anonym>
+    <anonym>That individual</anonym>
+    <anonym>A person</anonym>
+    <anonym>This person</anonym>
+    <anonym>That person</anonym>
+    <anonym>A stranger</anonym>
+    <anonym>This stranger</anonym>
+    <anonym>That stranger</anonym>
+    <anonym>A being</anonym>
+    <anonym>This being</anonym>
+    <anonym>That being</anonym>
+    <anonym>An agent</anonym>
+    <anonym>This agent</anonym>
+    <anonym>That agent</anonym>
+    <anonym>A soul</anonym>
+    <anonym>This soul</anonym>
+    <anonym>That soul</anonym>
+    <anonym>Somebody</anonym>
+    <anonym>Some people</anonym>
+    <anonym>Someone</anonym>
+    <anonym>Mysterious one</anonym>
+    <anonym>An unknown being</anonym>
+    <anonym>Unidentified one</anonym>
+    <anonym>An unknown person</anonym>
+  </anonyms>
+
+  <behaviour-notifications>
+    <!--
+    <notification behaviour="defaultwear" type="add">Text goes here</notification>
+    <notification behaviour="defaultwear" type="rem">Text goes here</notification>
+    -->
+  </behaviour-notifications>
+
+</rlva_strings>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 7563268..ff59aec 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -517,8 +517,12 @@ class WindowsManifest(ViewerManifest):
 
         # We use the Unicode version of NSIS, available from
         # http://www.scratchpaper.com/
-        NSIS_path = 'C:\\Program Files\\NSIS\\Unicode\\makensis.exe'
-        self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
+        try:
+            NSIS_path = 'C:\\Program Files\\NSIS\\Unicode\\makensis.exe'
+            self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
+        except:
+            NSIS_path = 'C:\\Program Files (x86)\\NSIS\\Unicode\\makensis.exe'
+            self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
         # self.remove(self.dst_path_of(tempfile))
         # If we're on a build machine, sign the code using our Authenticode certificate. JC
         sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
@@ -841,7 +845,7 @@ class LinuxManifest(ViewerManifest):
             self.path("wrapper.sh","imprudence")
             self.path("handle_secondlifeprotocol.sh")
             self.path("register_secondlifeprotocol.sh")
-            self.path("getvoice.sh")
+            self.path("getvoice.sh")
             self.end_prefix("linux_tools")
 
         self.gather_documents()
@@ -970,7 +974,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libgstvideo-0.10.so.0")
 
             # Gstreamer plugin dependencies
-            self.path("libfaad.so.0")
+            self.path("libfaad.so.0")
             self.path("libogg.so.0")
             self.path("libtheora.so.0")
             self.path("libvorbis.so.0")
@@ -1120,7 +1124,7 @@ class Linux_x86_64Manifest(LinuxManifest):
                 self.path("libgstdecodebin2.so")
                 self.path("libgstdecodebin.so")
                 self.path("libgstesd.so")
-                self.path("libgstfaad.so")
+                self.path("libgstfaad.so")
                 self.path("libgstffmpeg.so")
                 self.path("libgstffmpegcolorspace.so")
                 self.path("libgstgnomevfs.so")
@@ -1158,14 +1162,14 @@ class Linux_x86_64Manifest(LinuxManifest):
                 self.path("libortp.so")
                 self.path("libvivoxsdk.so")
                 self.end_prefix("lib32")
-                
-            # 32bit libs needed for voice
-            if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
-                self.path("libalut.so")
-                self.path("libidn.so.11")
-                self.path("libopenal.so.1")
-                # self.path("libortp.so")
-                self.path("libuuid.so.1")
+
+        # 32bit libs needed for voice
+        if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
+            self.path("libalut.so")
+            self.path("libidn.so.11")
+            self.path("libopenal.so.1")
+            # self.path("libortp.so")
+            self.path("libuuid.so.1")
             self.end_prefix("lib32")
 
 if __name__ == "__main__":
diff --git a/linden/install.xml b/linden/install.xml
index 4985b69..2a5ecf8 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -179,30 +179,30 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>cb6e2d7c09bbacefd0a1f98fd20fa5b6</string>
+            <string>506d8203676998eab8ccbaaf7bc7415f</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/extras/imprudence-artwork-20100911.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/extras/imprudence-artwork-20101017.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>cb6e2d7c09bbacefd0a1f98fd20fa5b6</string>
+            <string>506d8203676998eab8ccbaaf7bc7415f</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/extras/imprudence-artwork-20100911.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/extras/imprudence-artwork-20101017.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>cb6e2d7c09bbacefd0a1f98fd20fa5b6</string>
+            <string>506d8203676998eab8ccbaaf7bc7415f</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/extras/imprudence-artwork-20100911.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/extras/imprudence-artwork-20101017.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>cb6e2d7c09bbacefd0a1f98fd20fa5b6</string>
+            <string>506d8203676998eab8ccbaaf7bc7415f</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/extras/imprudence-artwork-20100911.tar.bz2</uri>
+            <uri>http://imprudenceviewer.org/download/extras/imprudence-artwork-20101017.tar.bz2</uri>
           </map>
         </map>
       </map>