69 files changed, 2765 insertions, 1908 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index a0bb951..afcecfc 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -216,7 +216,6 @@ else (STANDALONE)
      glib-2.0
      gstreamer-0.10
      gtk-2.0
-      llfreetype2
      pango-1.0
      )
 endif (STANDALONE)
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index bf08879..2435e4d 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -46,6 +46,6 @@ const char * const IMP_VIEWER_NAME = "Imprudence";
 const S32 IMP_VERSION_MAJOR = 1;
 const S32 IMP_VERSION_MINOR = 2;
 const S32 IMP_VERSION_PATCH = 0;
-const char * const IMP_VERSION_TEST = "beta 2";
+const char * const IMP_VERSION_TEST = "";
 #endif
diff --git a/linden/indra/llmath/llcalc.cpp b/linden/indra/llmath/llcalc.cpp
index 526a116..74f9544 100644
--- a/linden/indra/llmath/llcalc.cpp
+++ b/linden/indra/llmath/llcalc.cpp
@@ -11,8 +11,14 @@
 #include "llcalc.h"
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 103600
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_error_handling.hpp>
+#else
 #include <boost/spirit/core.hpp>
 #include <boost/spirit/error_handling.hpp>
+#endif
 #include "llcalcparser.h"
 #include "llmath.h"
diff --git a/linden/indra/llmath/llcalcparser.cpp b/linden/indra/llmath/llcalcparser.cpp
index 1546c09..df2bc09 100644
--- a/linden/indra/llmath/llcalcparser.cpp
+++ b/linden/indra/llmath/llcalcparser.cpp
@@ -11,6 +11,13 @@
 #include "llcalcparser.h"
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 103600
+using namespace boost::spirit::classic;
+#else
+using namespace boost::spirit;
+#endif
 F32 LLCalcParser::lookup(const std::string::iterator& start, const std::string::iterator& end) const
 {
        LLCalc::calc_map_t::iterator iter;
@@ -28,7 +35,7 @@ F32 LLCalcParser::lookup(const std::string::iterator& start, const std::string::
        else
        {
                // This should never happen!
-                boost::spirit::throw_(end, std::string("Missing constants table"));
+                throw_(end, std::string("Missing constants table"));
        }
        
        if (mVariables)
@@ -40,6 +47,6 @@ F32 LLCalcParser::lookup(const std::string::iterator& start, const std::string::
                }
        }
        
-        boost::spirit::throw_(end, std::string("Unknown symbol " + name));
+        throw_(end, std::string("Unknown symbol " + name));
        return 0.f;
 }
diff --git a/linden/indra/llmath/llcalcparser.h b/linden/indra/llmath/llcalcparser.h
index c405b62..d8acc1f 100644
--- a/linden/indra/llmath/llcalcparser.h
+++ b/linden/indra/llmath/llcalcparser.h
@@ -10,24 +10,37 @@
 #ifndef LL_CALCPARSER_H
 #define LL_CALCPARSER_H
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 103600
+#include <boost/spirit/include/classic_attribute.hpp>
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_error_handling.hpp>
+#include <boost/spirit/include/classic_position_iterator.hpp>
+#include <boost/spirit/include/phoenix1_binders.hpp>
+#include <boost/spirit/include/classic_symbols.hpp>
+using namespace boost::spirit::classic;
+#else
 #include <boost/spirit/attribute.hpp>
 #include <boost/spirit/core.hpp>
 #include <boost/spirit/error_handling.hpp>
 #include <boost/spirit/iterator/position_iterator.hpp>
 #include <boost/spirit/phoenix/binders.hpp>
-//#include <boost/spirit/symbols/symbols.hpp>
+#include <boost/spirit/symbols/symbols.hpp>
+using namespace boost::spirit;
+#endif
 #include <map>
 #include <string>
 #include "llcalc.h"
 #include "llmath.h"
-struct LLCalcParser : boost::spirit::grammar<LLCalcParser>
+struct LLCalcParser : grammar<LLCalcParser>
 {
        LLCalcParser(F32& result, LLCalc::calc_map_t* constants, LLCalc::calc_map_t* vars) :
                mResult(result), mConstants(constants), mVariables(vars) {};
        
-        struct value_closure : boost::spirit::closure<value_closure, F32>
+        struct value_closure : closure<value_closure, F32>
        {
                member1 value;
        };
@@ -36,21 +49,20 @@ struct LLCalcParser : boost::spirit::grammar<LLCalcParser>
        struct definition
        {
                // Rule declarations
-                boost::spirit::rule<ScannerT> statement, identifier;
+                rule<ScannerT> statement, identifier;
-                boost::spirit::rule<ScannerT, value_closure::context_t> expression, term,
+                rule<ScannerT, value_closure::context_t> expression, term,
                        power, 
                        unary_expr, 
                        factor, 
-                        /*unary_func, 
+                        unary_func, 
-                        /binary_func,*/ 
+                        binary_func,
                        group;
                // start() should return the starting symbol
-                boost::spirit::rule<ScannerT> const& start() const { return statement; }
+                rule<ScannerT> const& start() const { return statement; }
                
                definition(LLCalcParser const& self)
                {
-                        using namespace boost::spirit;
                        using namespace phoenix;
                        
                        assertion<std::string> assert_domain("Domain error");
@@ -64,30 +76,30 @@ struct LLCalcParser : boost::spirit::grammar<LLCalcParser>
                        group =
                                '(' >> expression[group.value = arg1] >> assert_syntax(ch_p(')'))
                        ;
-                        
-                        /*unary_func =
+                        unary_func =
-                                ((str_p("SIN") >> '(' >> expression[unary_func.value = bind(&sin)(DEG_TO_RAD * arg1)]) |
+                                ((str_p("SIN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_sin)(self,arg1)]) |
-                                 (str_p("COS") >> '(' >> expression[unary_func.value = bind(&cos)(DEG_TO_RAD * arg1)]) |
+                                 (str_p("COS") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_cos)(self,arg1)]) |
-                                 (str_p("TAN") >> '(' >> expression[unary_func.value = bind(&tan)(DEG_TO_RAD * arg1)]) |
+                                 (str_p("TAN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_tan)(self,arg1)]) |
-                                 (str_p("ASIN") >> '(' >> expression[unary_func.value = (bind(&asin)(arg1)) * RAD_TO_DEG]) |
+                                 (str_p("ASIN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_asin)(self,arg1)]) |
-                                 (str_p("ACOS") >> '(' >> expression[unary_func.value = bind(&acos)(arg1) * RAD_TO_DEG]) |
+                                 (str_p("ACOS") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_acos)(self,arg1)]) |
-                                 (str_p("ATAN") >> '(' >> expression[unary_func.value = bind(&atan)(arg1) * RAD_TO_DEG]) |
+                                 (str_p("ATAN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_atan)(self,arg1)]) |
-                                 (str_p("SQRT") >> '(' >> expression[unary_func.value = bind(&sqrt)(arg1)]) |
+                                 (str_p("SQRT") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_sqrt)(self,arg1)]) |
-                                 (str_p("LOG") >> '(' >> expression[unary_func.value = bind(&log)(arg1)]) |
+                                 (str_p("LOG") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_log)(self,arg1)]) |
-                                 (str_p("EXP") >> '(' >> expression[unary_func.value = bind(&exp)(arg1)]) |
+                                 (str_p("EXP") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_exp)(self,arg1)]) |
-                                 (str_p("ABS") >> '(' >> expression[unary_func.value = bind(&fabs)(arg1)])
+                                 (str_p("ABS") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_fabs)(self,arg1)])
                                ) >> assert_syntax(ch_p(')'))
                        ;
                        
                        binary_func =
                                ((str_p("ATAN2") >> '(' >> expression[binary_func.value = arg1] >> ',' >>
-                                  expression[binary_func.value = bind(&atan2)(binary_func.value, arg1) * RAD_TO_DEG]) |
+                                  expression[binary_func.value = bind(&LLCalcParser::_atan2)(self, binary_func.value, arg1)]) |
                                 (str_p("MIN") >> '(' >> expression[binary_func.value = arg1] >> ',' >> 
                                  expression[binary_func.value = bind(&LLCalcParser::min)(self, binary_func.value, arg1)]) |
                                 (str_p("MAX") >> '(' >> expression[binary_func.value = arg1] >> ',' >> 
                                  expression[binary_func.value = bind(&LLCalcParser::max)(self, binary_func.value, arg1)])
                                ) >> assert_syntax(ch_p(')'))
-                        ;*/
+                        ;
                        
                        // *TODO: Localisation of the decimal point?
                        // Problem, LLLineEditor::postvalidateFloat accepts a comma when appropriate
@@ -96,8 +108,8 @@ struct LLCalcParser : boost::spirit::grammar<LLCalcParser>
                        factor =
                                (ureal_p[factor.value = arg1] |
                                 group[factor.value = arg1] |
-                                 /*unary_func[factor.value = arg1] |
+                                 unary_func[factor.value = arg1] |
-                                 binary_func[factor.value = arg1] |*/
+                                 binary_func[factor.value = arg1] |
                                 // Lookup throws an Unknown Symbol error if it is unknown, while this works fine,
                                 // would be "neater" to handle symbol lookup from here with an assertive parser.
 //                               constants_p[factor.value = arg1]|
@@ -144,6 +156,22 @@ private:
        F32 max(const F32& a, const F32& b) const { return llmax(a, b); }
        
        bool checkNaN(const F32& a) const { return !llisnan(a); }
+        
+        //FIX* non ambigious function fix making SIN() work for calc -Cryogenic Blitz
+        F32 _sin(const F32& a) const { return sin(DEG_TO_RAD * a); }
+        F32 _cos(const F32& a) const { return cos(DEG_TO_RAD * a); }
+        F32 _tan(const F32& a) const { return tan(DEG_TO_RAD * a); }
+        F32 _asin(const F32& a) const { return asin(a * RAD_TO_DEG); }
+        F32 _acos(const F32& a) const { return acos(a * RAD_TO_DEG); }
+        F32 _atan(const F32& a) const { return atan(a * RAD_TO_DEG); }
+        F32 _sqrt(const F32& a) const { return sqrt(a); }
+        F32 _log(const F32& a) const { return log(a); }
+        F32 _exp(const F32& a) const { return exp(a); }
+        F32 _fabs(const F32& a) const { return fabs(a) * RAD_TO_DEG; }
+        F32 _atan2(const F32& a,const F32& b) const { return atan2(a,b); }
        LLCalc::calc_map_t* mConstants;
        LLCalc::calc_map_t* mVariables;
diff --git a/linden/indra/llmedia/llmediaimplllmozlib.cpp b/linden/indra/llmedia/llmediaimplllmozlib.cpp
index 7222d19..5b4b02e 100644
--- a/linden/indra/llmedia/llmediaimplllmozlib.cpp
+++ b/linden/indra/llmedia/llmediaimplllmozlib.cpp
@@ -50,9 +50,9 @@
        #include "GL/gl.h"
 #endif
-#if defined(LL_LINUX) || defined(WIN32)
- #include <locale.h>
+#include <locale.h>
-#endif // defined(LL_LINUX) || defined(WIN32)
 #include <iostream>
@@ -90,23 +90,23 @@ LLMediaImplLLMozLib::LLMediaImplLLMozLib() :
 // (static) super-initialization - called once at application startup
 bool LLMediaImplLLMozLib::startup( LLMediaManagerData* init_data )
 {
-#if defined(LL_LINUX) || defined(WIN32)
        // Yuck, Mozilla's GTK callbacks play with the locale - push/pop
        // the locale to protect it, as exotic/non-C locales
        // causes our code lots of general critical weirdness
        // and crashness. (SL-35450)
        static std::string saved_locale;
        saved_locale = setlocale(LC_ALL, NULL);
-#endif // defined(LL_LINUX) || defined(WIN32)
        bool result = LLMozLib::getInstance()->init( init_data->getBrowserApplicationDir(),
                                                                                        init_data->getBrowserComponentDir(),
                                                                                          init_data->getBrowserProfileDir(),
                                                                                                init_data->getBrowserParentWindow() );
-#if defined(LL_LINUX) || defined(WIN32)
        setlocale(LC_ALL, saved_locale.c_str() );
-#endif // defined(LL_LINUX) || defined(WIN32)
        return result;
 }
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index 9245803..dd33128 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -38,8 +38,7 @@
 #if !defined(LL_LINUX) || defined(LL_STANDALONE)
 # include <ft2build.h>
 #else
-// I had to do some work to avoid the system-installed FreeType headers... --ryan.
+# include "ft2build.h"
-# include "llfreetype2/freetype/ft2build.h"
 #endif
 // For some reason, this won't work if it's not wrapped in the ifdef
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 0e2ddf2..1668587 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -450,6 +450,7 @@ set(viewer_SOURCE_FILES
    llworldmapview.cpp
    llxmlrpctransaction.cpp
    noise.cpp
+    panelradar.cpp
    pipeline.cpp
    primbackup.cpp
    rlvhandler.cpp
@@ -872,6 +873,7 @@ set(viewer_HEADER_FILES
    llxmlrpctransaction.h
    macmain.h
    noise.h
+    panelradar.h
    pipeline.h
    primbackup.h
    randgauss.h
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 14a0102..2657d6f 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 CFBundleName = "Imprudence";
-CFBundleShortVersionString = "Imprudence version 1.2.0 beta 2";
+CFBundleShortVersionString = "Imprudence version 1.2.0";
-CFBundleGetInfoString = "Imprudence version 1.2.0 beta 2";
+CFBundleGetInfoString = "Imprudence version 1.2.0";
diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist
index e44dcbe..42164c6 100644
--- a/linden/indra/newview/Info-Imprudence.plist
+++ b/linden/indra/newview/Info-Imprudence.plist
@@ -32,7 +32,7 @@
                </dict>
        </array>
        <key>CFBundleVersion</key>
-        <string>1.2.0 beta 2</string>
+        <string>1.2.0</string>
        <key>CSResourcesFileMapped</key>
        <true/>
 </dict>
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 18c80eb..9087d9f 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -3213,27 +3213,16 @@
      <key>Value</key>
      <integer>1</integer>
    </map>
-    <key>DoubleClickAutoPilot</key>
+    <key>DoubleClickAction</key>
    <map>
      <key>Comment</key>
-      <string>Enable double-click auto pilot</string>
+      <string>What to do when you double-click. Either "None" or "Go".</string>
      <key>Persist</key>
      <integer>1</integer>
      <key>Type</key>
-      <string>Boolean</string>
+      <string>String</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>DoubleClickTeleport</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable double-click teleport</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
      <key>Value</key>
-      <integer>1</integer>
+      <string>None</string>
    </map>
    <key>DragAndDropToolTipDelay</key>
    <map>
@@ -4791,6 +4780,17 @@
      <key>Value</key>
      <integer>1024</integer>
    </map>
+    <key>GoAction</key>
+    <map>
+      <key>Comment</key>
+      <string>How to move for "Go Here" or double-click move. Either "Autopilot" or "Teleport".</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>Autopilot</string>
+    </map>
    <key>GridCrossSections</key>
    <map>
      <key>Comment</key>
@@ -8979,6 +8979,17 @@
      <key>Value</key>
      <integer>0</integer>
    </map>
+    <key>ShowMiniMapRadar</key>
+    <map>
+      <key>Comment</key>
+      <string>Reveal the minimap radar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
    <key>ShowMovementControls</key>
    <map>
      <key>Comment</key>
@@ -10911,7 +10922,7 @@
      <key>Type</key>
      <string>F32</string>
      <key>Value</key>
-      <real>1.0</real>
+      <real>1.002</real>
    </map>
    <key>UISndAlert</key>
    <map>
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index b3321fc..800264d 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -7893,7 +7893,7 @@ void LLAgent::userRemoveAllAttachments( void* userdata )
                return;
        }
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.0c
+// [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
@@ -7911,7 +7911,7 @@ void LLAgent::userRemoveAllAttachments( void* userdata )
                {
                        if (rlv_handler_t::isEnabled())
                        {
-                                if (!gRlvHandler.isDetachable(curiter->first))
+                                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)
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 74fb563..52c4b8d 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -4067,7 +4067,7 @@ void LLAppViewer::handleLoginComplete()
        writeDebugInfo();
 // [RLVa:KB] - Alternate: Snowglobe-1.0 | Checked: 2009-08-05 (RLVa-1.0.1e) | Modified: RLVa-1.0.1e
-        // TODO-RLVa: find some way to initialize the lookup table when we need them *and* support toggling RLVa at runtime
+        // NOTE: this function isn't called in Imprudence so any changes need to go in idle_startup() instead
        gRlvHandler.initLookupTables();
        if (rlv_handler_t::isEnabled())
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 85057ee..b7ef884 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -42,46 +42,20 @@
 #include "llregionhandle.h"
 #include "llresizebar.h"
 #include "lluictrlfactory.h"
-// radar
-#include "llchat.h"
 #include "llfirstuse.h"
-#include "llfloateravatarinfo.h"
+#include "panelradar.h"
-#include "llfloaterchat.h"
-#include "llfloaterfriends.h"
-#include "llfloatergroupinvite.h"
-#include "llfloatergroups.h"
-#include "llfloaterreporter.h"
-#include "llimview.h"
-#include "llmutelist.h"
-#include "llparcel.h"
-#include "llregionposition.h"
-#include "roles_constants.h"
-#include "llscrolllistctrl.h"
-#include "lltracker.h"
-#include "llviewerobjectlist.h"
-#include "llviewermenu.h"
-#include "llviewermessage.h"
-#include "llviewerparcelmgr.h"
-#include "llviewerregion.h"
-#include "llviewerwindow.h"
-#include "llvoavatar.h"
-#include "llworld.h"
 LLFloaterMap::LLFloaterMap(const LLSD& key)
        :
        LLFloater(std::string("minimap")),
        mPanelMap(NULL),
-        mUpdate(TRUE),
+        mPanelRadar(NULL)
-        mSelectedAvatar(LLUUID::null)
 {
        LLCallbackMap::map_t factory_map;
        factory_map["mini_mapview"] = LLCallbackMap(createPanelMiniMap, this);
+        factory_map["RadarPanel"] = LLCallbackMap(createPanelRadar, this);
        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_mini_map.xml", &factory_map, FALSE);
-        mChatAvatars.clear();
-        mTypingAvatars.clear();
 }
@@ -93,6 +67,15 @@ void* LLFloaterMap::createPanelMiniMap(void* data)
        return self->mPanelMap;
 }
+// static
+void* LLFloaterMap::createPanelRadar(void* data)
+{
+        LLFloaterMap* self = (LLFloaterMap*)data;
+        self->mPanelRadar = new PanelRadar();
+        return self->mPanelRadar;
+}
 BOOL LLFloaterMap::postBuild()
 {
        // Send the drag handle to the back, but make sure close stays on top
@@ -100,30 +83,15 @@ BOOL LLFloaterMap::postBuild()
        sendChildToFront(getChild<LLButton>("llfloater_minimize_btn"));
        sendChildToFront(getChild<LLButton>("llfloater_close_btn"));
        setIsChrome(TRUE);
-        
-        mRadarList = getChild<LLScrollListCtrl>("RadarList");
-        childSetCommitCallback("RadarList", onList, this);
-        mRadarList->setDoubleClickCallback(onClickIM);
-        childSetFocusChangedCallback("near_me_range", onRangeChange, this);
-        childSetAction("im_btn", onClickIM, this);
-        childSetAction("profile_btn", onClickProfile, this);
-        childSetAction("offer_teleport_btn", onClickOfferTeleport, this);
-        childSetAction("track_btn", onClickTrack, this);
-        childSetAction("invite_btn", onClickInvite, this);
-        childSetAction("add_btn", onClickAddFriend, this);
-        childSetAction("freeze_btn", onClickFreeze, this);
-        childSetAction("eject_btn", onClickEject, this);
-        childSetAction("mute_btn", onClickMute, this);
-        childSetAction("unmute_btn", onClickUnmute, this);
-        childSetAction("ar_btn", onClickAR, this);
-        childSetAction("estate_eject_btn", onClickEjectFromEstate, this);
-        setDefaultBtn("im_btn");
-        populateRadar();
+        childSetAction("toggle_radar", onToggleRadar, this);
+        if (!gSavedSettings.getBOOL("ShowMiniMapRadar"))
+        {
+                // Collapse radar if it's not showing.
+                adjustLayout( false );
+        }
+        
        return TRUE;
 }
@@ -139,6 +107,9 @@ void LLFloaterMap::onOpen()
        gFloaterView->adjustToFitScreen(this, FALSE);
        gSavedSettings.setBOOL("ShowMiniMap", TRUE);
+        bool showing_radar = gSavedSettings.getBOOL("ShowMiniMapRadar");
+        setRadarVisible( showing_radar );
 }
@@ -190,828 +161,101 @@ void LLFloaterMap::open()
 }
 // [/RLVa:KB]
-// TODO: make this detachable
-// TODO: make this expand/collapse
-/*
-* Imprudence Radar
-* @brief inworld radar integrated with the minimap
-* by McCabe Maxsted
-* Estate tab portion by Dale Glass
-*/
-//static
-bool LLFloaterMap::isImpDev(LLUUID agent_id)
-{
-        // We use strings here as avatar keys change across grids. 
-        // Feel free to add/remove yourself.
-        std::string agent_name = getSelectedName(agent_id);
-        if (agent_name == "McCabe Maxsted" || 
-                agent_name == "Jacek Antonelli" ||
-                agent_name == "Armin Weatherwax")
-        {
-                return true;
-        }
-        return false;
-}
-//static
-void LLFloaterMap::updateRadar()
-{
-        LLFloaterMap::getInstance()->populateRadar();
-}
-void LLFloaterMap::populateRadar()
-{
-        if (!mUpdate || !LLFloaterMap::getInstance()->getVisible())
-        {
-                return;
-        }
-        if (visibleItemsSelected())
-        {
-                mSelectedAvatar = mRadarList->getFirstSelected()->getUUID();
-        }
-        else
-        {
-                mSelectedAvatar.setNull();
-        }
-        S32 scroll_pos = mRadarList->getScrollPos();
-        // clear count
-        std::stringstream avatar_count; 
-        avatar_count.str("");
-        // find what avatars you can see
-        F32 range = gSavedSettings.getF32("NearMeRange");
-        LLVector3d current_pos = gAgent.getPositionGlobal();
-        std::vector<LLUUID> avatar_ids;
-        std::vector<LLVector3d> positions;
-        LLWorld::getInstance()->getAvatars(&avatar_ids, &positions);
-        LLSD element;
-        mRadarList->deleteAllItems();
-        if (!avatar_ids.empty())
-        {
-                for (U32 i=0; i<avatar_ids.size(); i++)
-                {
-                        if (avatar_ids[i] == gAgent.getID() ||
-                                avatar_ids[i].isNull())
-                        {
-                                continue;
-                        }
-                        // Add to list only if we get their name
-                        std::string fullname = getSelectedName(avatar_ids[i]);
-                        if (!fullname.empty())
-                        {
-                                bool notify_chat = gSavedSettings.getBOOL("MiniMapNotifyChatRange");
-                                bool notify_sim = gSavedSettings.getBOOL("MiniMapNotifySimRange");
-        // [RLVa:KB] - Alternate: Imprudence-1.2.0
-                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
-                                {
-                                        fullname = gRlvHandler.getAnonym(fullname);
-                                        notify_chat = false;
-                                        notify_sim = false;
-                                }
-        // [/RLVa:KB]
-                                // check if they're in certain ranges and notify user if we've enabled that
-                                LLVector3d temp = positions[i] - current_pos;
-                                F32 distance = llround((F32)temp.magVec(), 0.1f);
-                                /*char dist[32];
-                                sprintf(dist, "%.1f", distance);
-                                std::string dist_string = dist;*/
-                                std::string dist_string = llformat("%.1f", distance);
-                                if (notify_chat)
-                                {
-                                        if (distance < 20.0f)
-                                        {
-                                                if (!isInChatList(avatar_ids[i]))
-                                                {
-                                                        addToChatList(avatar_ids[i], dist_string);
-                                                }
-                                        }
-                                        else
-                                        {
-                                                if (isInChatList(avatar_ids[i]))
-                                                {
-                                                        removeFromChatList(avatar_ids[i]);
-                                                }
-                                        }
-                                        updateChatList(avatar_ids);
-                                }
-                                else if (!mChatAvatars.empty())
-                                {
-                                        mChatAvatars.clear();
-                                }
-                                if (notify_sim)
-                                {
-                                        if (!isInChatList(avatar_ids[i]) && !getInSimAvList(avatar_ids[i]))
-                                        {
-                                                LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]);
-                                                if (av_obj != NULL && av_obj->isAvatar())
-                                                {
-                                                        LLVOAvatar* avatarp = (LLVOAvatar*)av_obj;
-                                                        if (avatarp != NULL)
-                                                        {
-                                                                if (avatarp->getRegion() == gAgent.getRegion())
-                                                                {
-                                                                        addToSimAvList(avatar_ids[i], dist_string);
-                                                                }
-                                                        }
-                                                }
-                                        }
-                                        updateSimAvList(avatar_ids);
-                                }
-                                else if (!mSimAvatars.empty())
-                                {
-                                        mSimAvatars.clear();
-                                }
-                                // only display avatars in range
-                                if (distance <= range)
-                                {
-                                        // append typing string
-                                        std::string typing = "";
-                                        if (isTyping(avatar_ids[i]))
-                                        {
-                                                typing = getString("is_typing")+ " ";
-                                        }
-                                        std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("is_muted") : "";
-                                        element["id"] = avatar_ids[i];
-                                        element["columns"][0]["column"] = "avatar_name";
-                                        element["columns"][0]["type"] = "text";
-                                        element["columns"][0]["value"] = typing + fullname + " " + mute_text;
-                                        element["columns"][1]["column"] = "avatar_distance";
-                                        element["columns"][1]["type"] = "text";
-                                        element["columns"][1]["value"] = dist_string+"m";
-                                        mRadarList->addElement(element, ADD_BOTTOM);
-                                }
-                        }
-                }
-                mRadarList->sortItems();
-                mRadarList->setScrollPos(scroll_pos);
-                if (mSelectedAvatar.notNull())
-                {
-                        mRadarList->selectByID(mSelectedAvatar);
-                }
-                avatar_count << (int)avatar_ids.size();
-        }
-        else
-        {
-                mTypingAvatars.clear();
-                mRadarList->addCommentText(getString("no_one_near"), ADD_TOP);
-                avatar_count << "0";
-        }
-        childSetText("lblAvatarCount", avatar_count.str());
-        toggleButtons();
-        //llinfos << "mSelectedAvatar: " << mSelectedAvatar.asString() << llendl;
-}
-void LLFloaterMap::updateChatList(std::vector<LLUUID> agent_ids)
-{
-        std::set<LLUUID>::iterator it;
-        std::vector<LLUUID>::iterator result;
-        for (it = mChatAvatars.begin(); it != mChatAvatars.end(); )
-        {
-                result = find(agent_ids.begin(), agent_ids.end(), *it);
-                if (result == agent_ids.end())
-                {
-                        mChatAvatars.erase(it++);
-                }
-                else
-                {
-                        it++;
-                }
-        }
-}
-bool LLFloaterMap::isInChatList(LLUUID agent_id)
-{
-        if (mChatAvatars.count(agent_id) > 0)
-        {
-                return true;
-        }
-        return false;
-}
-void LLFloaterMap::addToChatList(LLUUID agent_id, std::string distance)
-{
-        mChatAvatars.insert(agent_id);
-        LLChat chat;
-        LLUIString notify = getString("entering_chat_range");
-        notify.setArg("[NAME]", getSelectedName(agent_id));
-        notify.setArg("[DISTANCE]", distance);
-        chat.mText = notify;
-        chat.mSourceType = CHAT_SOURCE_SYSTEM;
-        LLFloaterChat::addChat(chat, FALSE, FALSE);     
-}
-void LLFloaterMap::removeFromChatList(LLUUID agent_id)
-{
-        // Do we want to add a notice?
-        mChatAvatars.erase(agent_id);
-}
-bool LLFloaterMap::isTyping(LLUUID agent_id)
-{
-        if (mTypingAvatars.count(agent_id) > 0)
-        {
-                return true;
-        }
-        return false;
-}
-void LLFloaterMap::updateTypingList(LLUUID agent_id, bool remove)
-{
-        if (remove)
-        {
-                if (isTyping(agent_id))
-                {
-                        mTypingAvatars.erase(agent_id); 
-                }
-        }
-        else
-        {
-                mTypingAvatars.insert(agent_id);
-        }
-}
-void LLFloaterMap::updateSimAvList(std::vector<LLUUID> agent_ids)
-{
-        std::set<LLUUID>::iterator it;
-        std::vector<LLUUID>::iterator result;
-        for (it = mSimAvatars.begin(); it != mSimAvatars.end(); )
-        {
-                result = find(agent_ids.begin(), agent_ids.end(), *it);
-                if (result == agent_ids.end())
-                {
-                        mSimAvatars.erase(it++);
-                }
-                else
-                {
-                        it++;
-                }
-        }
-}
-void LLFloaterMap::addToSimAvList(LLUUID agent_id, std::string distance)
-{
-        mSimAvatars.insert(agent_id);
-        LLChat chat;
-        LLUIString notify = getString("entering_sim_range");
-        notify.setArg("[NAME]", getSelectedName(agent_id));
-        notify.setArg("[DISTANCE]", distance);
-        chat.mText = notify;
-        chat.mSourceType = CHAT_SOURCE_SYSTEM;
-        LLFloaterChat::addChat(chat, FALSE, FALSE);     
-}
-bool LLFloaterMap::getInSimAvList(LLUUID agent_id)
-{
-        if (mSimAvatars.count(agent_id) > 0)
-        {
-                return true;
-        }
-        return false;
-}
-void LLFloaterMap::toggleButtons()
-{
-        BOOL enable = FALSE;
-        BOOL enable_unmute = FALSE;
-        BOOL enable_track = FALSE;
-        BOOL enable_estate = FALSE;
-        BOOL enable_friend = FALSE;
-        if (childHasFocus("RadarPanel"))
-        {
-                enable = mSelectedAvatar.notNull() ? visibleItemsSelected() : FALSE;
-                enable_unmute = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE;
-                enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
-                enable_estate = isKickable(mSelectedAvatar);
-                enable_friend = !is_agent_friend(mSelectedAvatar);
-        }
-        else
-        {
-                mRadarList->deselect();
-        }
-        childSetEnabled("im_btn", enable);
-        childSetEnabled("profile_btn", enable);
-        childSetEnabled("offer_teleport_btn", enable);
-        childSetEnabled("track_btn", enable_track);
-        childSetEnabled("invite_btn", enable);
-        childSetEnabled("add_btn", enable);
-        childSetEnabled("freeze_btn", enable_estate);
-        childSetEnabled("eject_btn", enable_estate);
-        childSetEnabled("mute_btn", enable);
-        childSetEnabled("ar_btn", enable);
-        childSetEnabled("estate_eject_btn", enable_estate);
-        if (enable_unmute)
-        {
-                childSetVisible("mute_btn", false);
-                childSetEnabled("unmute_btn", true);
-                childSetVisible("unmute_btn", true);
-        }
-        else
-        {
-                childSetVisible("mute_btn", true);
-                childSetVisible("unmute_btn", false);
-        }
-// [RLVa:KB] - Imprudence-1.2.0
-        // Bit clumsy, but this way the RLV stuff is in its own separate block and keeps the code above clean - Kitty
-        if ( (rlv_handler_t::isEnabled()) && (mSelectedAvatar.notNull()) )
-        {
-                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
-                {
-                        childSetEnabled("im_btn", FALSE);
-                        childSetEnabled("profile_btn", FALSE);
-                        childSetEnabled("invite_btn", FALSE);
-                        childSetEnabled("add_btn", FALSE);
-                        childSetEnabled("mute_btn", FALSE);
-                        childSetEnabled("unmute_btn", FALSE);
-                }
-                // Even though the avie is in the same sim (so they already know where we are) the tp would just get blocked by different code
-                // so it's actually less confusing to the user if we just disable the teleport button here so they'll at least have a visual cue
-                BOOL rlv_enable_tp = (!gRlvHandler.hasBehaviour(RLV_BHVR_TPLURE)) || (gRlvHandler.isException(RLV_BHVR_TPLURE, mSelectedAvatar));
-                if ( (rlv_enable_tp) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
-                {
-                        const LLRelationship* pBuddyInfo = LLAvatarTracker::instance().getBuddyInfo(mSelectedAvatar);
-                        if ( ((!pBuddyInfo) || (!pBuddyInfo->isOnline()) || (!pBuddyInfo->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION))) )
-                                rlv_enable_tp = FALSE;
-                }
-                childSetEnabled("offer_teleport_btn", rlv_enable_tp);
-        }
-// [/RLVa:KB]
-}
-BOOL LLFloaterMap::isKickable(const LLUUID &agent_id)
-{
-        if (agent_id.notNull())
-        {
-                LLViewerObject* av_obj = gObjectList.findObject(agent_id);
-                if (av_obj != NULL && av_obj->isAvatar())
-                {
-                        LLVOAvatar* avatar = (LLVOAvatar*)av_obj;
-                        LLViewerRegion* region = avatar->getRegion();
-                        if (region)
-                        {
-                                const LLVector3& pos = avatar->getPositionRegion();
-                                const LLVector3d& pos_global = avatar->getPositionGlobal();
-                                if (LLWorld::getInstance()->positionRegionValidGlobal(pos_global))
-                                {
-                                        LLParcel* parcel = LLViewerParcelMgr::getInstance()->selectParcelAt(pos_global)->getParcel();
-                                        LLViewerParcelMgr::getInstance()->deselectLand();
-                                        
-                                        BOOL new_value = (region != NULL);
-                                                                
-                                        if (new_value)
-                                        {
-                                                new_value = region->isOwnedSelf(pos);
-                                                if (!new_value || region->isOwnedGroup(pos))
-                                                {
-                                                        new_value = LLViewerParcelMgr::getInstance()->isParcelOwnedByAgent(parcel,GP_LAND_ADMIN);
-                                                }
-                                        }
-                                        return new_value;
-                                }
-                        }
-                }
-        }
-        return FALSE;   
-}
-// static
-void LLFloaterMap::onList(LLUICtrl* ctrl, void* user_data)
-{
-        LLFloaterMap* self = (LLFloaterMap*)user_data;
-        if (self)
-        {
-                self->toggleButtons();
-        }
-}
-BOOL LLFloaterMap::visibleItemsSelected() const
-{
-        if (mRadarList->getFirstSelectedIndex() >= 0)
-        {
-                return TRUE;
-        }
-        return FALSE;
-}
-// static
-void LLFloaterMap::onRangeChange(LLFocusableElement* focus, void* user_data)
-{
-        LLFloaterMap* self = (LLFloaterMap*)user_data;
-        if (self)
-        {
-                self->mUpdate = !(self->childHasFocus("near_me_range"));
-        }
-}
-// static
-LLUUID LLFloaterMap::getSelected()
-{
-        return LLFloaterMap::getInstance()->mSelectedAvatar;
-}
-//
-// Avatar tab
-//
-// static
-void LLFloaterMap::onClickIM(void* user_data)
-{
-        LLFloaterMap* self = (LLFloaterMap*) user_data;
-        LLScrollListItem *item = self->mRadarList->getFirstSelected();
-        if (item != NULL)
-        {
-                LLUUID agent_id = item->getUUID();
-                gIMMgr->setFloaterOpen(TRUE);
-                gIMMgr->addSession(getSelectedName(agent_id), IM_NOTHING_SPECIAL, agent_id);
-        }
-}
-// static
-void LLFloaterMap::onClickProfile(void* user_data)
-{
-        LLFloaterMap* self = (LLFloaterMap*) user_data;
-        LLScrollListItem *item = self->mRadarList->getFirstSelected();
-        if (item != NULL)
-        {
-                LLUUID agent_id = item->getUUID();
-                LLFloaterAvatarInfo::show(agent_id);
-        }
-}
-// static
+PanelRadar* LLFloaterMap::getRadar()
-void LLFloaterMap::onClickOfferTeleport(void* user_data)
 {
-        LLFloaterMap* self = (LLFloaterMap*) user_data;
+        return mPanelRadar;
-        LLScrollListItem *item = self->mRadarList->getFirstSelected();
-        if (item != NULL)
-        {
-                LLUUID agent_id = item->getUUID();
-                handle_lure(agent_id);
-        }
 }
-// static
-void LLFloaterMap::onClickTrack(void* user_data)
-{
-        LLFloaterMap* self = (LLFloaterMap*) user_data;
-        LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus();
-        
-        if (LLTracker::TRACKING_AVATAR == tracking_status)
-        {
-                LLTracker::stopTracking(NULL);
-        }
-        else
-        {
-                LLScrollListItem *item = self->mRadarList->getFirstSelected();
-                if (item != NULL)
-                {
-                        LLUUID agent_id = item->getUUID();
-                        LLTracker::trackAvatar(agent_id, getSelectedName(agent_id));
-                }
-        }
-}
-// static
-void LLFloaterMap::onClickInvite(void* user_data)
-{
-        LLFloaterMap* self = (LLFloaterMap*) user_data;
-        LLScrollListItem *item = self->mRadarList->getFirstSelected();
-        if (item != NULL)
-        {
-                LLUUID agent_id = item->getUUID();
-                LLFloaterGroupPicker* widget;
-                widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
-                if (widget)
-                {
-                        widget->center();
-                        widget->setPowersMask(GP_MEMBER_INVITE);
-                        widget->setSelectCallback(callback_invite_to_group, (void *)&agent_id);
-                }
-        }
-}
-// static
-void LLFloaterMap::callback_invite_to_group(LLUUID group_id, void *user_data)
-{
-        std::vector<LLUUID> agent_ids;
-        agent_ids.push_back(*(LLUUID *)user_data);
-        
-        LLFloaterGroupInvite::showForGroup(group_id, &agent_ids);
-}
 // static
-void LLFloaterMap::onClickAddFriend(void* user_data)
+void LLFloaterMap::onToggleRadar(void *user_data)
 {
        LLFloaterMap* self = (LLFloaterMap*) user_data;
-        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        self->toggleRadarVisible();
-        if (item != NULL)
-        {
-                LLUUID agent_id = item->getUUID();
-                LLPanelFriends::requestFriendshipDialog(agent_id, getSelectedName(agent_id));
-        }
 }
-//
-// Estate tab
-//
-//static 
+void LLFloaterMap::toggleRadarVisible()
-std::string LLFloaterMap::getSelectedName(const LLUUID &agent_id)
 {
-        std::string agent_name;
+        bool show_radar = gSavedSettings.getBOOL("ShowMiniMapRadar");
-        if(gCacheName->getFullName(agent_id, agent_name) && agent_name != " ")
+        show_radar = !show_radar;
-        {
+        setRadarVisible( show_radar );
-                return agent_name;
-        }
-        return LLStringUtil::null;
 }
-//static 
-void LLFloaterMap::callbackFreeze(S32 option, void *user_data)
-{
-        LLFloaterMap *self = (LLFloaterMap*)user_data;
-        if ( option == 0 )
-        {
-                sendFreeze(self->mSelectedAvatar, true);
-        }
-        else if ( option == 1 )
-        {
-                sendFreeze(self->mSelectedAvatar, false);
-        }
-}
-//static 
+void LLFloaterMap::setRadarVisible( bool show_radar )
-void LLFloaterMap::callbackEject(S32 option, void *user_data)
 {
-        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        bool old_show_radar = gSavedSettings.getBOOL("ShowMiniMapRadar");
- 
-        if ( option == 0 )
-        {
-                sendEject(self->mSelectedAvatar, false);
-        }
-        else if ( option == 1 )
-        {
-                sendEject(self->mSelectedAvatar, true);
-        }
-}
-//static 
+        gSavedSettings.setBOOL("ShowMiniMapRadar", show_radar);
-void LLFloaterMap::callbackEjectFromEstate(S32 option, void *user_data)
+        setRadarButtonState( show_radar );
-{
+        mPanelRadar->setVisible( show_radar );
-        LLFloaterMap *self = (LLFloaterMap*)user_data;
-        if ( option == 0 )
+        // Adjust the minimap window's size if visibility is changing
+        if (show_radar != old_show_radar)
        {
-                cmdEstateEject(self->mSelectedAvatar);
+                adjustLayout( show_radar );
-        } 
-        else if ( option == 1 )
-        {
-                cmdEstateBan(self->mSelectedAvatar);
        }
 }
-void LLFloaterMap::onClickFreeze(void *user_data)
-{
-        LLFloaterMap *self = (LLFloaterMap*)user_data;
-        LLStringUtil::format_map_t args;
-        LLSD payload;
-        args["[AVATAR_NAME]"] = getSelectedName(self->mSelectedAvatar);
-        gViewerWindow->alertXml("FreezeAvatarFullname", args, callbackFreeze, user_data);
-}
-//static
+void LLFloaterMap::setRadarButtonState( bool showing_radar )
-void LLFloaterMap::onClickEject(void *user_data)
 {
-        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        LLButton* toggle = getChild<LLButton>("toggle_radar");
-        LLStringUtil::format_map_t args;
+        if (toggle)
-        LLSD payload;
-        args["AVATAR_NAME"] = getSelectedName(self->mSelectedAvatar);
-        gViewerWindow->alertXml("EjectAvatarFullName", args, callbackEject, user_data);
-}
-//static
-void LLFloaterMap::onClickMute(void *user_data)
-{
-        LLFloaterMap *self = (LLFloaterMap*)user_data;
-        LLScrollListItem *item = self->mRadarList->getFirstSelected();
-        if (item != NULL)
        {
-                LLUUID agent_id = item->getUUID();
+                toggle->setToggleState(showing_radar);
-                std::string agent_name = getSelectedName(agent_id);
+                if (showing_radar)
-                if (LLMuteList::getInstance()->isMuted(agent_id))
                {
-                        //LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        // Expanded, so show image to offer to collapse upwards.
-                        //LLMuteList::getInstance()->remove(mute);      
+                        toggle->setImageOverlay("arrow_up.tga");
-                        //LLFloaterMute::getInstance()->selectMute(agent_id);
                }
                else
                {
-                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        // Collapsed, so show image to offer to expand downwards.
-                        LLMuteList::getInstance()->add(mute);
+                        toggle->setImageOverlay("arrow_down.tga");
                }
        }
 }
-//static
-void LLFloaterMap::onClickUnmute(void *user_data)
-{
-        LLFloaterMap *self = (LLFloaterMap*)user_data;
-        LLScrollListItem *item = self->mRadarList->getFirstSelected();
-        if (item != NULL)
-        {
-                LLUUID agent_id = item->getUUID();
-                std::string agent_name = getSelectedName(agent_id);
-                if (LLMuteList::getInstance()->isMuted(agent_id))
-                {
-                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
-                        LLMuteList::getInstance()->remove(mute);        
-                        //LLFloaterMute::getInstance()->selectMute(agent_id);
-                }
-                else
-                {
-                        //LLMute mute(agent_id, agent_name, LLMute::AGENT);
-                        //LLMuteList::getInstance()->add(mute);
-                }
-        }
-}
-//static
-void LLFloaterMap::onClickEjectFromEstate(void *user_data)
-{
-        LLFloaterMap *self = (LLFloaterMap*)user_data;
-        LLStringUtil::format_map_t args;
-        LLSD payload;
-        args["EVIL_USER"] = getSelectedName(self->mSelectedAvatar);
-        gViewerWindow->alertXml("EstateKickUser", args, callbackEjectFromEstate, user_data);
-}
-//static
+void LLFloaterMap::adjustLayout( bool expand )
-void LLFloaterMap::onClickAR(void *user_data)
 {
-        LLFloaterMap *self = (LLFloaterMap*)user_data;
+        S32 radar_height = mPanelRadar->getRect().getHeight();
-        LLUUID agent_id = self->mSelectedAvatar;
+        S32 height = getRect().getHeight();
-                
+        LLRect map_rect = mPanelMap->getRect();
-        if (agent_id.notNull())
+        S32 map_bottom = map_rect.mBottom;
-        {
-                        LLFloaterReporter::showFromObject(agent_id);
-        }
-}
-// static 
+        S32 min_width, min_height;
-void LLFloaterMap::cmdEstateEject(const LLUUID &avatar)
+        getResizeLimits( &min_width, &min_height );
-{ 
-        sendEstateMessage("teleporthomeuser", avatar); 
-}
-// static 
+        S32 adjust = radar_height;
-void LLFloaterMap::cmdEstateBan(const LLUUID &avatar)
+        if (!expand)
-{
-        sendEstateMessage("teleporthomeuser", avatar); // Kick first, just to be sure
-        sendEstateBan(avatar);
-}
-// static 
-void LLFloaterMap::sendFreeze(const LLUUID& avatar_id, bool freeze)
-{
-        U32 flags = 0x0;
-        if (!freeze)
        {
-                // unfreeze
+                adjust = -adjust;
-                flags |= 0x1;
        }
+        
+        height += adjust;
+        min_height += adjust;
+        map_bottom += adjust;
-        LLMessageSystem* msg = gMessageSystem;
+        map_rect.set( map_rect.mLeft,  map_rect.mTop,
-        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
+                      map_rect.mRight, map_bottom );
+        mPanelMap->setRect(map_rect);
-        if (avatar)
+        setResizeLimits( min_width, min_height );
-        {
+        reshape( getRect().getWidth(), height, false );
-                msg->newMessage("FreezeUser");
-                msg->nextBlock("AgentData");
-                msg->addUUID("AgentID", gAgent.getID());
-                msg->addUUID("SessionID", gAgent.getSessionID());
-                msg->nextBlock("Data");
-                msg->addUUID("TargetID", avatar_id );
-                msg->addU32("Flags", flags );
-                msg->sendReliable( avatar->getRegion()->getHost() );
-        }
-}
-// static 
+        LLRect temp_rect = getRect();
-void LLFloaterMap::sendEject(const LLUUID& avatar_id, bool ban)
+        temp_rect.translate( 0, -adjust );
-{       
+        setRect( temp_rect );
-        LLMessageSystem* msg = gMessageSystem;
-        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
-        if (avatar)
+        LLButton* toggle = getChild<LLButton>("toggle_radar");
+        if (toggle)
        {
-                U32 flags = 0x0;
+                temp_rect = toggle->getRect();
-                if ( ban )
+                temp_rect.translate( 0, adjust );
-                {
+                toggle->setRect( temp_rect );
-                        // eject and add to ban list
-                        flags |= 0x1;
-                }
-                msg->newMessage("EjectUser");
-                msg->nextBlock("AgentData");
-                msg->addUUID("AgentID", gAgent.getID() );
-                msg->addUUID("SessionID", gAgent.getSessionID() );
-                msg->nextBlock("Data");
-                msg->addUUID("TargetID", avatar_id );
-                msg->addU32("Flags", flags );
-                msg->sendReliable( avatar->getRegion()->getHost() );
        }
 }
-// static 
-void LLFloaterMap::sendEstateMessage(const char* request, const LLUUID &target)
-{
-        LLMessageSystem* msg = gMessageSystem;
-        LLUUID invoice;
-        // This seems to provide an ID so that the sim can say which request it's
-        // replying to. I think this can be ignored for now.
-        invoice.generate();
-        llinfos << "Sending estate request '" << request << "'" << llendl;
-        msg->newMessage("EstateOwnerMessage");
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-        msg->nextBlock("MethodData");
-        msg->addString("Method", request);
-        msg->addUUID("Invoice", invoice);
-        // Agent id
-        msg->nextBlock("ParamList");
-        msg->addString("Parameter", gAgent.getID().asString().c_str());
-        // Target
-        msg->nextBlock("ParamList");
-        msg->addString("Parameter", target.asString().c_str());
-        msg->sendReliable(gAgent.getRegion()->getHost());
-}
-// static 
-void LLFloaterMap::sendEstateBan(const LLUUID& agent)
-{
-        LLUUID invoice;
-        U32 flags = ESTATE_ACCESS_BANNED_AGENT_ADD;
-        invoice.generate();
-        LLMessageSystem* msg = gMessageSystem;
-        msg->newMessage("EstateOwnerMessage");
-        msg->nextBlockFast(_PREHASH_AgentData);
-        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-        msg->nextBlock("MethodData");
-        msg->addString("Method", "estateaccessdelta");
-        msg->addUUID("Invoice", invoice);
-        char buf[MAX_STRING];           /* Flawfinder: ignore*/
-        gAgent.getID().toString(buf);
-        msg->nextBlock("ParamList");
-        msg->addString("Parameter", buf);
-        snprintf(buf, MAX_STRING, "%u", flags);                 /* Flawfinder: ignore */
-        msg->nextBlock("ParamList");
-        msg->addString("Parameter", buf);
-        agent.toString(buf);
-        msg->nextBlock("ParamList");
-        msg->addString("Parameter", buf);
-        gAgent.sendReliableMessage();
-}
diff --git a/linden/indra/newview/llfloatermap.h b/linden/indra/newview/llfloatermap.h
index c457b9f..5b0497f 100644
--- a/linden/indra/newview/llfloatermap.h
+++ b/linden/indra/newview/llfloatermap.h
@@ -34,7 +34,7 @@
 #define LL_LLFLOATERMAP_H
 #include "llfloater.h"
-#include "llscrolllistctrl.h"
+#include "panelradar.h"
 class LLNetMap;
@@ -47,85 +47,32 @@ public:
        virtual ~LLFloaterMap();
        static void* createPanelMiniMap(void* data);
+        static void* createPanelRadar(void* data);
-        static void updateRadar();
-        static LLUUID getSelected();
-        // returns true if agent_id belongs to a developer listed in llfloatermap.cpp
-        static bool isImpDev(LLUUID agent_id);
-        bool isTyping(LLUUID agent_id);
-        void updateTypingList(LLUUID agent_id, bool remove);
        BOOL postBuild();
-        /*virtual*/ void        draw();
+        /*virtual*/ void draw();
-        /*virtual*/ void        onOpen();
+        /*virtual*/ void onOpen();
-        /*virtual*/ void        onClose(bool app_quitting);
+        /*virtual*/ void onClose(bool app_quitting);
-        /*virtual*/ BOOL        canClose();
+        /*virtual*/ BOOL canClose();
 // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-05 (RLVa-1.0.0c)
-        /*virtual*/ void    open();
+        /*virtual*/ void open();
 // [/RLVa:KB]
+  PanelRadar* getRadar();
 private:
        LLFloaterMap(const LLSD& key = LLSD());
-        LLNetMap*                               mPanelMap;
+        LLNetMap* mPanelMap;
-        LLScrollListCtrl*               mRadarList;
+  PanelRadar* mPanelRadar;
-        LLUUID                                  mSelectedAvatar;
-        // TODO: move all this info into its own object. It's stupid 
-        // and bug-prone to keep it all in separate containers, but 
-        // I want to get this out for 1.2 -- McCabe
-        std::set<LLUUID>                mChatAvatars;
-        std::set<LLUUID>                mTypingAvatars;
-        std::set<LLUUID>                mSimAvatars;
-        bool                                    mUpdate;
-        
-        static void onList(LLUICtrl* ctrl, void* user_data);
-        static void onRangeChange(LLFocusableElement* focus, void* user_data);
-        BOOL visibleItemsSelected() const;
-        BOOL isKickable(const LLUUID &agent_id);
-        void toggleButtons();
-        void populateRadar();
-        void updateChatList(std::vector<LLUUID> agent_ids);
-        bool isInChatList(LLUUID agent_id);
-        void addToChatList(LLUUID agent_id, std::string distance);
-        void removeFromChatList(LLUUID agent_id);
-        bool getInSimAvList(LLUUID agent_id);
-        void addToSimAvList(LLUUID agent_id, std::string distance);
-        void updateSimAvList(std::vector<LLUUID> agent_ids);
-        static void onClickProfile(void* user_data);
-        static void onClickIM(void* user_data);
-        static void onClickAddFriend(void* user_data);
-        static void onClickOfferTeleport(void* user_data);
-        static void onClickTrack(void* user_data);
-        static void onClickInvite(void* user_data);
-        static void callback_invite_to_group(LLUUID group_id, void *user_data);
-        static std::string getSelectedName(const LLUUID &agent_id);
-        static void onClickFreeze(void *user_data);
-        static void onClickEject(void *user_data);
-        static void onClickMute(void *user_data);
-        static void onClickUnmute(void *user_data);
-        static void onClickAR(void *user_data);
-        static void onClickEjectFromEstate(void *user_data);
-        static void callbackFreeze(S32 option, void *user_data);
-        static void callbackEject(S32 option, void *user_data);
-        static void callbackAR(void *user_data);
-        static void callbackEjectFromEstate(S32 option, void *user_data);
-        static void sendFreeze(const LLUUID &avatar, bool);
+  static void onToggleRadar(void *user_data);
-        static void sendEject(const LLUUID &avatar, bool);
+  void toggleRadarVisible();
-        static void cmdEstateEject(const LLUUID &avatar);
+  void setRadarVisible( bool show_radar );
-        static void cmdEstateBan(const LLUUID &avatar);
+  void setRadarButtonState(bool showing_radar);
-        static void sendEstateBan(const LLUUID& agent);
+  void adjustLayout( bool expand );
-        static void sendEstateMessage(const char* request, const LLUUID &target);
 };
 #endif  // LL_LLFLOATERMAP_H
diff --git a/linden/indra/newview/llfloateropenobject.cpp b/linden/indra/newview/llfloateropenobject.cpp
index d7fdece..fc483dd 100644
--- a/linden/indra/newview/llfloateropenobject.cpp
+++ b/linden/indra/newview/llfloateropenobject.cpp
@@ -208,18 +208,7 @@ void LLFloaterOpenObject::onClickMoveToInventory(void* data)
 void LLFloaterOpenObject::onClickMoveAndWear(void* data)
 {
        LLFloaterOpenObject* self = (LLFloaterOpenObject*)data;
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Deprecated: RLVa-0.2.2a
+        self->moveToInventory(true);
-        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
-        {
-                // TODO-RLVa: once we have "Add to Outfit" and "Replace Outfit" working we don't need this anymore
-                self->moveToInventory(false);
-        }
-        else
-        {
-                self->moveToInventory(true);
-        }
-// [/RLVa:KB]
-//      self->moveToInventory(true);
        self->close();
 }
diff --git a/linden/indra/newview/llfloaterworldmap.cpp b/linden/indra/newview/llfloaterworldmap.cpp
index 9257349..fbb90a9 100644
--- a/linden/indra/newview/llfloaterworldmap.cpp
+++ b/linden/indra/newview/llfloaterworldmap.cpp
@@ -779,7 +779,7 @@ void LLFloaterWorldMap::updateLocation()
 void LLFloaterWorldMap::trackURL(const std::string& region_name, S32 x_coord, S32 y_coord, S32 z_coord)
 {
        LLSimInfo* sim_info = LLWorldMap::getInstance()->simInfoFromName(region_name);
-        z_coord = llclamp(z_coord, 0, 1000);
+        z_coord = llclamp(z_coord, 0, 4096);
        if (sim_info)
        {
                LLVector3 local_pos;
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 5a4fad7..1e86301 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -489,6 +489,20 @@ 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
+                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))) ) )
+                        {
+                                disabled_items.push_back(std::string("Open"));
+                        }
+                }
+// [/RLVa:KB]
                getClipboardEntries(true, items, disabled_items, flags);
        }
        hideContextEntries(menu, items, disabled_items);
@@ -2472,6 +2486,13 @@ 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
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))
+        {
+                return;
+        }
+// [/RLVa:KB]
        // See if we can bring an exiting preview to the front
        if( !LLPreview::show( item_id, take_focus ) )
        {
@@ -3305,11 +3326,11 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model
                item = (LLViewerInventoryItem*)gInventory.getItem(object_id);
                if(item && gInventory.isObjectDescendentOf(object_id, gAgent.getInventoryRootID()))
                {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                        // User picked "Wear" so either nothing is locked, or we need to look up the specific attach point from its name
                        // (NOTE: rez_attachment will take care of deciding whether or not we *can* attach)
                        rez_attachment(item, 
-                                ((!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment()) || (RlvSettings::getEnableWear()))
+                                ((!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) || (RlvSettings::getEnableWear()))
                                        ? NULL : gRlvHandler.getAttachPoint(item, true));
 // [/RLVa:KB]
 //                      rez_attachment(item, NULL);
@@ -3332,9 +3353,9 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model
        {
                LLInventoryItem* item = gInventory.getItem(mUUID);
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                // Fall-through: if there's a "Detach from yourself" code path we missed then we'll still disallow the detach here
-                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(item)) )
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(item, RLV_LOCK_REMOVE)) )
                {
                        return;
                }
@@ -3504,9 +3525,12 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                        {
                                items.push_back(std::string("Detach From Yourself"));
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(item)) )
+                                if ( (rlv_handler_t::isEnabled()) && 
+                                         (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) && (gRlvHandler.isLockedAttachment(item, RLV_LOCK_REMOVE)) )
+                                {
                                        disabled_items.push_back(std::string("Detach From Yourself"));
+                                }
 // [/RLVa:KB]
                        }
                        else
@@ -3519,13 +3543,16 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                                items.push_back(std::string("RestoreToWorld Separator"));
                                items.push_back(std::string("Restore to Last Position"));
-// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0c
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                                // Only enable "Wear" if there is an attach point name *and* there isn't a worn attachment there that's currently locked
+                                if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getEnableWear()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) )
-                                if ( (rlv_handler_t::isEnabled()) && (!RlvSettings::getEnableWear()) && (gRlvHandler.hasLockedAttachment()) )
                                {
-                                        LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(item, true);
+                                        LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(item, true);      // The item's name should specify
-                                        if ( (!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt)) )
+                                        if ( (!pAttachPt) ||                                                                                                                      // an attachment point that
+                                                 (gRlvHandler.isLockedAttachment(pAttachPt->getObject(), RLV_LOCK_REMOVE)) || // doesn't have an undetachable object
+                                                 (gRlvHandler.isLockedAttachment(pAttachPt, RLV_LOCK_ADD)) )                              // and that can be attached to
+                                        {
                                                disabled_items.push_back(std::string("Object Wear"));
+                                        }
                                }
 // [/RLVa:KB]
@@ -3628,6 +3655,13 @@ LLUIImagePtr LLLSLTextBridge::getIcon() const
 void LLLSLTextBridge::openItem()
 {
+// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Modified: RLVa-1.0.5c
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWSCRIPT))
+        {
+                return;
+        }
+// [/RLVa:KB]
        // See if we can bring an exiting preview to the front
        if(!LLPreview::show(mUUID))
        {
@@ -4069,15 +4103,26 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
                                                                                is_gesture);
                S32 gest_count = gest_item_array.count();
-// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-1.0.0c
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) && (!RlvSettings::getEnableWear()) )
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) )
                {
-                        // Filter anything that doesn't specify an attachment point (or that specifies one that's currently locked)
+                        // Filter anything that we shouldn't be attaching
                        for (S32 idxObj = obj_item_array.count() - 1; idxObj >= 0; idxObj--)
                        {
-                                LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(obj_item_array.get(idxObj).get(), true);
+                                if (!RlvSettings::getEnableWear())
-                                if ( ((!pAttachPt) || (!gRlvHandler.isDetachable(pAttachPt))) )
+                                {
-                                        obj_item_array.remove(idxObj);
+                                        LLViewerJointAttachment* pAttachPt = gRlvHandler.getAttachPoint(obj_item_array.get(idxObj).get(), true);
+                                        if ( (!pAttachPt) ||                                                                                                                      // Item should specify attachpt that
+                                                 (gRlvHandler.isLockedAttachment(pAttachPt->getObject(), RLV_LOCK_REMOVE)) || // doesn't have an undetachable object
+                                                 (gRlvHandler.isLockedAttachment(pAttachPt, RLV_LOCK_ADD)) )                              // and that is attachable
+                                        {
+                                                obj_item_array.remove(idxObj);
+                                        }
+                                }
+                                else
+                                {
+                                        gRlvHandler.onWearAttachment(obj_item_array.get(idxObj)->getUUID());
+                                }
                        }
                        obj_count = obj_item_array.count();
                }
@@ -4260,15 +4305,26 @@ void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove)
                {
                        if ( (gInventory.isObjectDescendentOf(*it, gAgent.getInventoryRootID())) )
                        {
-//                              items.put(item);
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-10-15 (RLVa-1.0.5e) | Modified: RLVa-1.0.5e
-// [RLVa:KB] - Checked: 2009-09-11 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
+                                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) )
-                                LLViewerJointAttachment* pAttachPt = NULL;
-                                if ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) || 
-                                         (((pAttachPt = gRlvHandler.getAttachPoint(item, true)) != NULL) && (gRlvHandler.isDetachable(pAttachPt))) )
                                {
-                                        items.put(item);
+                                        if (!RlvSettings::getEnableWear())
+                                        {
+                                                LLViewerJointAttachment* pAttachPt = NULL;
+                                                if ( ((pAttachPt = gRlvHandler.getAttachPoint(item, true)) == NULL) ||                    // Item should specify attachpt that
+                                                         (gRlvHandler.isLockedAttachment(pAttachPt->getObject(), RLV_LOCK_REMOVE)) || // doesn't have an undetachable object
+                                                         (gRlvHandler.isLockedAttachment(pAttachPt, RLV_LOCK_ADD)) )                              // and that is attachable
+                                                {
+                                                        continue;
+                                                }
+                                        }
+                                        else
+                                        {
+                                                gRlvHandler.onWearAttachment(item->getUUID());
+                                        }
                                }
 // [/RLVa:KB]
+                                items.put(item);
                        }
                        else if ( (item->isComplete()) )
                        {
@@ -4328,9 +4384,9 @@ void wear_attachments_on_avatar(const LLInventoryModel::item_array_t& items, BOO
                        msg->addUUIDFast(_PREHASH_CompoundMsgID, compound_msg_id );
                        msg->addU8Fast(_PREHASH_TotalObjects, count );
 //                      msg->addBOOLFast(_PREHASH_FirstDetachAll, remove );
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.2a
+// [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, remove && (!gRlvHandler.hasLockedAttachment()) );
+                                msg->addBOOLFast(_PREHASH_FirstDetachAll, remove && (!gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) );
 // [/RLVa:KB]
                        }
@@ -4339,9 +4395,9 @@ 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-07-06 (RLVa-1.0.0c) | Added: RLVa-0.2.2a
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
                        msg->addU8Fast(_PREHASH_AttachmentPt, 
-                                ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) )
+                                ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) )
                                        ? 0
                                        : gRlvHandler.getAttachPointIndex(gRlvHandler.getAttachPoint(item, true)));
 // [/RLVa:KB]
@@ -4447,13 +4503,12 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata)
                {
                        for(i = 0; i  < obj_count; ++i)
                        {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.2a
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                                // TODO-RLVa: is there a reason why LL doesn't bother checking to see if you're actually wearing the object?
+                                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
-                                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
                                {
                                        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
                                        if ( (!pAvatar) || (!pAvatar->isWearingAttachment(obj_item_array.get(i)->getUUID())) || 
-                                                 (!gRlvHandler.isDetachable(obj_item_array.get(i).get())) ) // Why does LLPointer have a cast to BOOL aka S32??? 
+                                                 (gRlvHandler.isLockedAttachment(obj_item_array.get(i).get(), RLV_LOCK_REMOVE)) )
                                        {
                                                continue;
                                        }
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 73f19d5..6ebf98e 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -47,6 +47,7 @@
 #include "llviewercontrol.h"
 #include "llfloateravatarinfo.h"
 #include "llfloatermap.h"
+#include "panelradar.h"
 #include "llfloaterworldmap.h"
 #include "llframetimer.h"
 #include "llmutelist.h"
@@ -359,7 +360,7 @@ void LLNetMap::draw()
                        pos_map = globalPosToView(positions[i], rotate_map);
                        
                        // Save this entry to draw last
-                        if (LLFloaterMap::getSelected() == avatar_ids[i])
+                        if (LLFloaterMap::getInstance()->getRadar()->getSelected() == avatar_ids[i])
                        {
                                selected = i;
                                continue;
@@ -371,7 +372,7 @@ void LLNetMap::draw()
                                {
                                        glyph_color = muted_color;
                                }
-                                else if (LLFloaterMap::isImpDev(avatar_ids[i]))
+                                else if (PanelRadar::isImpDev(avatar_ids[i]))
                                {
                                        glyph_color = imp_dev_color;
                                }
@@ -515,7 +516,7 @@ void LLNetMap::draw()
        LLView::draw();
-        LLFloaterMap::updateRadar();
+        LLFloaterMap::getInstance()->getRadar()->populateRadar();
 }
 void LLNetMap::reshape(S32 width, S32 height, BOOL called_from_parent)
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index 6820622..6da3b97 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -54,6 +54,7 @@
 #include "llfloaterchat.h"      // for add_chat_history()
 #include "lloverlaybar.h" // for gOverlayBar
 #include "lluictrlfactory.h"
+#include "llversionviewer.h"
 // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
 #include "rlvhandler.h"
@@ -546,6 +547,7 @@ void LLNotifyBox::format(std::string& msg, const LLStringUtil::format_map_t& arg
        // XUI:translate!
        LLStringUtil::format_map_t targs = args;
        targs["[SECOND_LIFE]"] = "Second Life";
+        targs["[VIEWER]"] = IMP_VIEWER_NAME;
        LLStringUtil::format(msg, targs);
 }
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index d576a20..33cebec 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -157,10 +157,10 @@ void LLPanelContents::onClickNewScript(void *userdata)
        LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
        if(object)
        {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a)
                if (rlv_handler_t::isEnabled()) // Fallback code [see LLPanelContents::getState()]
                {
-                        if (!gRlvHandler.isDetachable(object))
+                        if (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE))
                        {
                                return;                                 // Disallow creating new scripts in a locked attachment
                        }
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 51cac4b..adb4cfc 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -165,5 +165,5 @@ void LLPanelGeneral::cancel()
 void LLPanelGeneral::onClickResetUISize(void* user_data)
 {
        LLPanelGeneral* self = (LLPanelGeneral*)user_data;
-        self->childSetValue("ui_scale_slider", 1.0f);
+        self->childSetValue("ui_scale_slider", 1.002f);
 }
diff --git a/linden/indra/newview/llpanelinput.cpp b/linden/indra/newview/llpanelinput.cpp
index 63d22b2..4b94435 100644
--- a/linden/indra/newview/llpanelinput.cpp
+++ b/linden/indra/newview/llpanelinput.cpp
@@ -71,6 +71,9 @@ BOOL LLPanelInput::postBuild()
        fov_slider->setMinValue(LLViewerCamera::getInstance()->getMinView());
        fov_slider->setMaxValue(LLViewerCamera::getInstance()->getMaxView());
        fov_slider->setValue(LLViewerCamera::getInstance()->getView());
+        
+        childSetValue("double_click_action", gSavedSettings.getString("DoubleClickAction"));
+        childSetValue("go_action", gSavedSettings.getString("GoAction"));
        return TRUE;
 }
@@ -93,6 +96,10 @@ void LLPanelInput::apply()
        gSavedSettings.setBOOL("AppearanceCameraMovement", childGetValue("appearance_camera_movement"));
        gSavedSettings.setF32("CameraAngle", mPreAdjustFOV);
        gSavedSettings.setBOOL("FirstPersonAvatarVisible", childGetValue("first_person_avatar_visible"));
+        gSavedSettings.setString("DoubleClickAction", childGetValue("double_click_action"));
+        gSavedSettings.setString("GoAction", childGetValue("go_action"));
 }
 void LLPanelInput::cancel()
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index bc7c60f..2b78281 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -372,9 +372,9 @@ void LLTaskInvFVBridge::previewItem()
 BOOL LLTaskInvFVBridge::isItemRenameable() const
 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
        LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
-        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) )
        {
                return FALSE;
        }
@@ -398,8 +398,8 @@ BOOL LLTaskInvFVBridge::isItemRenameable() const
 BOOL LLTaskInvFVBridge::renameItem(const std::string& new_name)
 {
        LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) )
        {
                return TRUE; // Fallback code [see LLTaskInvFVBridge::isItemRenameable()]
        }
@@ -430,13 +430,13 @@ BOOL LLTaskInvFVBridge::isItemMovable()
        //      return TRUE;
        //}
        //return FALSE;
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0g
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
        if (rlv_handler_t::isEnabled())
        {
                LLViewerObject* pObj = gObjectList.findObject(mPanel->getTaskUUID());
                if (pObj)
                {
-                        if (!gRlvHandler.isDetachable(pObj))
+                        if (gRlvHandler.isLockedAttachment(pObj, RLV_LOCK_REMOVE))
                        {
                                return FALSE;
                        }
@@ -455,10 +455,10 @@ BOOL LLTaskInvFVBridge::isItemMovable()
 BOOL LLTaskInvFVBridge::isItemRemovable()
 {
        LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0g
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
        if ( (object) && (rlv_handler_t::isEnabled()) )
        {
-                if (!gRlvHandler.isDetachable(object))
+                if (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE))
                {
                        return FALSE;
                }
@@ -618,9 +618,9 @@ BOOL LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
                                const LLPermissions& perm = inv->getPermissions();
                                bool can_copy = gAgent.allowOperation(PERM_COPY, perm,
                                                                                                                GP_OBJECT_MANIPULATE);
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                                // Kind of redundant due to the note below, but in case that ever gets fixed
-                                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+                                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) )
                                {
                                        return FALSE;
                                }
@@ -747,12 +747,16 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                {
                        disabled_items.push_back(std::string("Task Open"));
                }
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Modified: RLVa-1.0.5c
-                else if ( (rlv_handler_t::isEnabled()) && 
+                else if (rlv_handler_t::isEnabled())
-                                  ((LLAssetType::AT_LSL_TEXT == item->getType()) || (LLAssetType::AT_NOTECARD == item->getType())) && 
-                                  (!gRlvHandler.isDetachable(gObjectList.findObject(mPanel->getTaskUUID()))) )
                {
-                        disabled_items.push_back(std::string("Task Open"));
+                        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))) )
+                        {
+                                disabled_items.push_back(std::string("Task Open"));
+                        }
                }
 // [/RLVa:KB]
        }
@@ -979,6 +983,13 @@ LLUIImagePtr LLTaskTextureBridge::getIcon() const
 void LLTaskTextureBridge::openItem()
 {
+// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Added: RLVa-1.0.5c
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))
+        {
+                return;
+        }
+// [/RLVa:KB]
        llinfos << "LLTaskTextureBridge::openItem()" << llendl;
        if(!LLPreview::show(mUUID))
        {
@@ -1260,9 +1271,10 @@ LLTaskLSLBridge::LLTaskLSLBridge(
 void LLTaskLSLBridge::openItem()
 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-13 (RLVa-1.0.5c) | Modified: RLVa-1.0.5c
        LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
-        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        if ( (rlv_handler_t::isEnabled()) && 
+                ((gRlvHandler.hasBehaviour(RLV_BHVR_VIEWSCRIPT)) || (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE))) )
        {
                return;
        }
@@ -1388,8 +1400,9 @@ void LLTaskNotecardBridge::openItem()
        {
                return;
        }
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) || (!gRlvHandler.isDetachable(object))) )
+        if ( (rlv_handler_t::isEnabled()) && 
+                 ( (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWNOTE)) || (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) ) )
        {
                return;
        }
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index feb85a7..63f76dc 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -626,7 +626,16 @@ void LLPanelLogin::addServer(const std::string& server)
                        i++;
                }
        }
-        grids->setCurrentByIndex(0);
+        
+        // when you first login select the default, otherwise last connected
+        if (gDisconnected)
+        {
+                grids->setSimple(gHippoGridManager->getCurrentGrid()->getGridNick());
+        }
+        else
+        {
+                grids->setSimple(defaultGrid);
+        }
        //LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
        //combo->add(server, LLSD(domain_name) );
@@ -767,13 +776,13 @@ void LLPanelLogin::refreshLoginPage()
    if (!sInstance) return;
    sInstance->childSetVisible("create_new_account_text",
-        !gHippoGridManager->getConnectedGrid()->getRegisterUrl().empty());
+        !gHippoGridManager->getCurrentGrid()->getRegisterUrl().empty());
    sInstance->childSetVisible("forgot_password_text",
-        !gHippoGridManager->getConnectedGrid()->getPasswordUrl().empty());
+        !gHippoGridManager->getCurrentGrid()->getPasswordUrl().empty());
    // kick off a request to grab the url manually
        gResponsePtr = LLIamHereLogin::build(sInstance);
-        std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage();
+        std::string login_page = gHippoGridManager->getCurrentGrid()->getLoginPage();
        if (!login_page.empty()) {
                LLHTTPClient::head(login_page, gResponsePtr);
        } else {
@@ -787,7 +796,7 @@ void LLPanelLogin::loadLoginPage()
        if (!sInstance) return;
        
-        std::string login_page = gHippoGridManager->getConnectedGrid()->getLoginPage();
+        std::string login_page = gHippoGridManager->getCurrentGrid()->getLoginPage();
        if (login_page.empty()) {
                sInstance->setSiteIsAlive(false);
                return;
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index 4b8a151..082b95c 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -2001,8 +2001,8 @@ void LLLiveLSLEditor::onRunningCheckboxClicked( LLUICtrl*, void* userdata )
        LLCheckBoxCtrl* runningCheckbox = self->getChild<LLCheckBoxCtrl>("running");
        BOOL running =  runningCheckbox->get();
        //self->mRunningCheckbox->get();
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) )
        {
                return;
        }
@@ -2032,8 +2032,8 @@ void LLLiveLSLEditor::onReset(void *userdata)
        LLLiveLSLEditor* self = (LLLiveLSLEditor*) userdata;
        LLViewerObject* object = gObjectList.findObject( self->mObjectID );
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(object, RLV_LOCK_REMOVE)) )
        {
                return;
        }
@@ -2460,8 +2460,8 @@ void LLLiveLSLEditor::onSave(void* userdata, BOOL close_after_save)
 {
        LLLiveLSLEditor* self = (LLLiveLSLEditor*)userdata;
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(gObjectList.findObject(self->mObjectID))) )
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(gObjectList.findObject(self->mObjectID), RLV_LOCK_REMOVE)) )
        {
                return;
        }
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index b862d61..4d35242 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2656,6 +2656,23 @@ bool idle_startup()
 #endif
+// [RLVa:KB] - Alternate: Snowglobe-1.0 | 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();
+                if (rlv_handler_t::isEnabled())
+                {
+                        RlvCurrentlyWorn::fetchWorn();
+                        rlv_handler_t::fetchSharedInventory();
+                        #ifdef RLV_EXTENSION_STARTLOCATION
+                                RlvSettings::updateLoginLastLocation();
+                        #endif // RLV_EXTENSION_STARTLOCATION
+                        gRlvHandler.processRetainedCommands();
+                }
+// [/RLVa:KB]
                return TRUE;
        }
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index c24dd78..aa5bfad 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -1974,7 +1974,7 @@ EAcceptance LLToolDragAndDrop::willObjectAcceptInventory(LLViewerObject* obj, LL
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
        if (rlv_handler_t::isEnabled())
        {
-                if (!gRlvHandler.isDetachable(obj))
+                if (gRlvHandler.isLockedAttachment(obj, RLV_LOCK_REMOVE))
                {
                        return ACCEPT_NO_LOCKED;                // Disallow inventory drops on a locked attachment
                }
@@ -2118,10 +2118,12 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv(
                return ACCEPT_NO;
        }
-// [RLVa:KB] - Checked: 2009-09-08 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5) | Modified: RLVa-1.0.5
        LLViewerJointAttachment* pAttachPt = NULL;
-        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) && (!RlvSettings::getEnableWear()) &&
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) && (!RlvSettings::getEnableWear()) &&
-                 ( ((pAttachPt = gRlvHandler.getAttachPoint(item, true)) == NULL) || (!gRlvHandler.isDetachable(pAttachPt)) ) )
+                 ( ((pAttachPt = gRlvHandler.getAttachPoint(item, true)) == NULL) ||                    // Item should specify an attachpt that
+                   (gRlvHandler.isLockedAttachment(pAttachPt->getObject(), RLV_LOCK_REMOVE)) || // doesn't have an undetachable object
+                   (gRlvHandler.isLockedAttachment(pAttachPt, RLV_LOCK_ADD)) ) )                                // and that is attachable
        {
                return ACCEPT_NO_LOCKED;
        }
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index f6c2eef..6bc36a5 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -694,12 +694,19 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
                llinfos << "LLToolPie handleDoubleClick (becoming mouseDown)" << llendl;
        }
-        if (gSavedSettings.getBOOL("DoubleClickAutoPilot") || gSavedSettings.getBOOL("DoubleClickTeleport"))
+        std::string action = gSavedSettings.getString("DoubleClickAction");
+        LLStringUtil::toLower(action);
+        if (action == "none")
+        {
+                return FALSE;
+        }
+        else if (action == "go")
        {
                if (mPick.mPickType == LLPickInfo::PICK_LAND
                        && !mPick.mPosGlobal.isExactlyZero())
                {
-                        handle_go_to();
+                        handle_go_to_confirm();
                        return TRUE;
                }
                else if (mPick.mObjectID.notNull()
@@ -709,36 +716,16 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
                        if(mPick.getObject().notNull() && mPick.getObject()->isHUDAttachment())
                                return FALSE;
-                        handle_go_to();
+                        handle_go_to_confirm();
                        return TRUE;
                }
        }
+        else
-        return FALSE;
-        /* JC - don't do go-there, because then double-clicking on physical
-        objects gets you into trouble.
-        // If double-click on object or land, go there.
-        LLViewerObject *object = gViewerWindow->getLastPick().getObject();
-        if (object)
-        {
-                if (object->isAvatar())
-                {
-                        LLFloaterAvatarInfo::showFromAvatar(object->getID());
-                }
-                else
-                {
-                        handle_go_to(NULL);
-                }
-        }
-        else if (!gLastHitPosGlobal.isExactlyZero())
        {
-                handle_go_to(NULL);
+                llwarns << "Unhandled DoubleClickAction setting: " << action << llendl;
        }
-        return TRUE;
+        return FALSE;
-        */
 }
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index 3975290..388ba73 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -720,8 +720,8 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                }
 //              if(gUseWireframe)
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                if ( (gUseWireframe) && ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment()) ) )
+                if ( (gUseWireframe) && ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) ) )
 // [/RLVa:KB]
                {
                        glClearColor(0.5f, 0.5f, 0.5f, 0.f);
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index b129bff..cebd6fd 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2190,8 +2190,9 @@ class LLSelfEnableRemoveAllAttachments : public view_listener_t
                                LLVOAvatar::attachment_map_t::iterator curiter = iter++;
                                LLViewerJointAttachment* attachment = curiter->second;
 //                              if (attachment->getObject())
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0c
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                                if ( (attachment->getObject()) && ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.isDetachable(curiter->first)) ) )
+                                if ( (attachment->getObject()) && 
+                                         ((!rlv_handler_t::isEnabled()) || (!gRlvHandler.isLockedAttachment(curiter->first, RLV_LOCK_REMOVE))) )
 // [/RLVa:KB]
                                {
                                        new_value = true;
@@ -2428,26 +2429,45 @@ class LLObjectImportUpload : public view_listener_t
        }
 };
-bool handle_go_to()
+bool handle_go_to_confirm()
 {
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
-        if ( (rlv_handler_t::isEnabled()) && gAgent.forwardGrabbed() && (gRlvHandler.hasLockedAttachment()) )
+        if ( (rlv_handler_t::isEnabled()) && (gAgent.forwardGrabbed()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
        {
                return true;
        }
 // [/RLVa:KB]
-        if (gSavedSettings.getBOOL("DoubleClickTeleport"))
+        std::string action = gSavedSettings.getString("GoAction");
+        LLStringUtil::toLower(action);
+        if (action == "teleport")
        {
                gViewerWindow->alertXml("ConfirmDoubleClickTP", handle_go_to_callback, (void*)LLToolPie::getInstance());
        }
-        else if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
+        else if (action == "autopilot")
        {
                gViewerWindow->alertXml("ConfirmAutoPilot", handle_go_to_callback, (void*)LLToolPie::getInstance());
        }
        return true;
 }
+bool handle_go_to()
+{
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
+        if ( (rlv_handler_t::isEnabled()) && (gAgent.forwardGrabbed()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
+        {
+                return true;
+        }
+ // [/RLVa:KB]
+        handle_go_to_callback( 0, (void*)LLToolPie::getInstance() );
+        return true;
+}
 //static
 void handle_go_to_callback(S32 option, void *userdata)
 {
@@ -2459,13 +2479,17 @@ void handle_go_to_callback(S32 option, void *userdata)
                std::vector<std::string> strings;
                std::string val;
                LLVector3d pos = pie->getPick().mPosGlobal;
-                if (gSavedSettings.getBOOL("DoubleClickTeleport"))
+                std::string action = gSavedSettings.getString("GoAction");
+                LLStringUtil::toLower(action);
+                if (action == "teleport")
                {
                        LLVector3d hips_offset(0.0f, 0.0f, 1.2f);
                        gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
                        gAgent.teleportViaLocation(pos + hips_offset);
                }
-                else
+                else if (action == "autopilot")
                {
                        // JAMESDEBUG try simulator autopilot
                        std::vector<std::string> strings;
@@ -2493,6 +2517,10 @@ void handle_go_to_callback(S32 option, void *userdata)
                        // Could be first use
                        LLFirstUse::useGoTo();
                }
+                else
+                {
+                        llwarns << "Unhandled GoAction setting: " << action << llendl;
+                }
        }
 }
@@ -4710,8 +4738,8 @@ class LLToolsReleaseKeys : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
                {
                        return true;
                }
@@ -4727,9 +4755,9 @@ class LLToolsEnableReleaseKeys : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                gMenuHolder->findControl(userdata["control"].asString())->setValue( 
-                                gAgent.anyControlGrabbed() && ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment() ) ) );
+                        gAgent.anyControlGrabbed() && ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE) ) ) );
 // [/RLVa:KB]
                //gMenuHolder->findControl(userdata["control"].asString())->setValue( gAgent.anyControlGrabbed() );
                return true;
@@ -6100,11 +6128,13 @@ private:
                        if (index > 0)
                                attachment_point = get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, index, (LLViewerJointAttachment*)NULL);
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                        if ( (rlv_handler_t::isEnabled()) &&
-                                 ( ((index == 0) && (gRlvHandler.hasLockedAttachment())) ||                      // Can't wear on default attach point
+                                 ( ((index == 0) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY))) ||          // Can't wear on default attach point
-                                   ((index > 0) && (!gRlvHandler.isDetachable(attachment_point))) || // Can't replace locked attachment
+                                   ((index > 0) &&                                                           // or replace a locked attachment
-                                   (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) ) )                                          // Attach on rezzed object == "Take"
+                                    ((gRlvHandler.isLockedAttachment(attachment_point->getObject(), RLV_LOCK_REMOVE)) ||
+                                         (gRlvHandler.isLockedAttachment(attachment_point, RLV_LOCK_ADD)) ) ) || // or wear on a non-attachable attach point
+                                   (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) ) )                                                          // Attach on rezzed object == "Take"
                        {
                                setObjectSelection(NULL); // Clear the selection or it'll get stuck
                                return true;
@@ -6218,15 +6248,15 @@ class LLAttachmentDrop : public view_listener_t
                        return true;
                }
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                if (rlv_handler_t::isEnabled()) 
                {
-                        if (gRlvHandler.hasLockedAttachment())
+                        if (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE))
                        {
                                // NOTE: copy/paste of the code in enable_detach()
-                                LLObjectSelectionHandle hSelect = LLSelectMgr::getInstance()->getSelection();
+                                LLObjectSelectionHandle hSelection = LLSelectMgr::getInstance()->getSelection();
-                                RlvSelectHasLockedAttach functor;
+                                RlvSelectHasLockedAttach functor(RLV_LOCK_REMOVE);
-                                if ( (hSelect->isAttachment()) && (hSelect->getFirstRootNode(&functor, FALSE)) )
+                                if ( (hSelection->isAttachment()) && (hSelection->getFirstRootNode(&functor, FALSE)) )
                                        return true;
                        }
                        else if (gRlvHandler.hasBehaviour(RLV_BHVR_REZ))
@@ -6254,8 +6284,8 @@ void handle_detach_from_avatar(void* user_data)
        if (attached_object)
        {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0d
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(attached_object)) )
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.isLockedAttachment(attached_object, RLV_LOCK_REMOVE)) )
                {
                        return;
                }
@@ -6343,12 +6373,12 @@ class LLAttachmentDetach : public view_listener_t
                        return true;
                }
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5) | Modified: RLVa-1.0.5
                // NOTE: copy/paste of the code in enable_detach()
-                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
                {
                        LLObjectSelectionHandle hSelect = LLSelectMgr::getInstance()->getSelection();
-                        RlvSelectHasLockedAttach functor;
+                        RlvSelectHasLockedAttach functor(RLV_LOCK_REMOVE);
                        if ( (hSelect->isAttachment()) && (hSelect->getFirstRootNode(&functor, FALSE)) )
                                return FALSE;
                }
@@ -6460,16 +6490,16 @@ BOOL enable_detach(void*)
                // ...if it's you, good to detach
                if (avatar->getID() == gAgent.getID())
                {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5) | Modified: RLVa-1.0.5
                        // NOTE: this code is reused as-is in LLAttachmentDetach::handleEvent() and LLAttachmentDrop::handleEvent()
-                        //       so any changes here should be reflected there as well (I think it's in a number of other places as well by now)
+                        //       so any changes here should be reflected there as well
                        // RELEASE-RLVa: LLSelectMgr::sendDetach() and LLSelectMgr::sendDropAttachment() call sendListToRegions with
                        //               SEND_ONLY_ROOTS so we only need to examine the roots which saves us time
-                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
                        {
                                LLObjectSelectionHandle hSelect = LLSelectMgr::getInstance()->getSelection();
-                                RlvSelectHasLockedAttach functor;
+                                RlvSelectHasLockedAttach functor(RLV_LOCK_REMOVE);
                                if ( (hSelect->isAttachment()) && (hSelect->getFirstRootNode(&functor, FALSE)) )
                                        return FALSE;
                        }
@@ -6496,7 +6526,7 @@ class LLAttachmentEnableDetach : public view_listener_t
 // Used to tell if the selected object can be attached to your avatar.
 BOOL object_selected_and_point_valid(void *user_data)
 {
-// [RLVa:KB] - Checked: 2009-07-05 (RLVa-1.0.0b)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5) | Modified: RLVa-1.0.5
        if (rlv_handler_t::isEnabled())
        {
                // RELEASE-RLVa: look at the caller graph for this function on every new release
@@ -6506,9 +6536,11 @@ BOOL object_selected_and_point_valid(void *user_data)
                //      - enabler set up in LLVOAvatar::buildCharacter() => Rezzed prim / right-click / "Attach >" [user_data == pAttachPt]
                //      - enabler set up in LLVOAvatar::buildCharacter() => Rezzed prim / Edit menu / "Attach Object" [user_data == pAttachPt]
                LLViewerJointAttachment* pAttachPt = (LLViewerJointAttachment*)user_data;
-                if  ( ((!pAttachPt) && (gRlvHandler.hasLockedAttachment())) ||          // Don't allow attach to default attach point
+                if  ( ( (!pAttachPt) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) ) ||    // Don't allow attach to default attach point
-                          ((pAttachPt) && (!gRlvHandler.isDetachable(pAttachPt))) ||    // Don't allow replacing of locked attachment
+                          ( (pAttachPt) &&                                                                                                                      // Don't allow replacing of a locked attachment
-                          (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) )                                    // Attaching a rezzed object == "Take"
+                            ( (gRlvHandler.isLockedAttachment(pAttachPt->getObject(), RLV_LOCK_REMOVE)) ||
+                              (gRlvHandler.isLockedAttachment(pAttachPt, RLV_LOCK_ADD)) ) ) ||          // or wear on a non-attachable attach point
+                          (gRlvHandler.hasBehaviour(RLV_BHVR_REZ)) )                                                            // Attaching a rezzed object == "Take"
                {
                        return FALSE;
                }
@@ -6585,7 +6617,7 @@ BOOL object_attached(void *user_data)
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
        return ( 
                      (attachment->getObject() != NULL) && 
-                          ( (!rlv_handler_t::isEnabled()) || (gRlvHandler.isDetachable(attachment->getObject())) )
+                          ( (!rlv_handler_t::isEnabled()) || (!gRlvHandler.isLockedAttachment(attachment->getObject(), RLV_LOCK_REMOVE)) )
                   );
 // [/RLVa:KB]
 //      return attachment->getObject() != NULL;
@@ -6737,12 +6769,13 @@ class LLToolsSelectedScriptAction : public view_listener_t
 {
        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
        {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+                // We'll allow resetting the scripts of objects on a non-attachable attach point since they wouldn't be able to circumvent anything
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
                {
-                        LLObjectSelectionHandle selectHandle = LLSelectMgr::getInstance()->getSelection();
+                        LLObjectSelectionHandle hSelection = LLSelectMgr::getInstance()->getSelection();
-                        RlvSelectHasLockedAttach functor;
+                        RlvSelectHasLockedAttach functor(RLV_LOCK_REMOVE);
-                        if ( (selectHandle->isAttachment()) && (selectHandle->getFirstNode(&functor)) )
+                        if ( (hSelection->isAttachment()) && (hSelection->getFirstNode(&functor)) )
                                return true;
                }
 // [/RLVa:KB]
@@ -6831,9 +6864,9 @@ void handle_dump_image_list(void*)
 void handle_test_male(void*)
 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
        if ( (rlv_handler_t::isEnabled()) && 
-                 ( (gRlvHandler.hasLockedAttachment()) || 
+                 ( (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) || 
                   (gRlvHandler.hasBehaviour(RLV_BHVR_ADDOUTFIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_REMOUTFIT)) ) )
        {
                return;
@@ -6846,9 +6879,9 @@ void handle_test_male(void*)
 void handle_test_female(void*)
 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
        if ( (rlv_handler_t::isEnabled()) && 
-                 ( (gRlvHandler.hasLockedAttachment()) || 
+                 ( (gRlvHandler.hasLockedAttachment(RLV_LOCK_ANY)) || 
                   (gRlvHandler.hasBehaviour(RLV_BHVR_ADDOUTFIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_REMOUTFIT)) ) )
        {
                return;
@@ -6990,16 +7023,16 @@ BOOL enable_more_than_one_selected(void* )
 static bool is_editable_selected()
 {
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-1.0.0c
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
        // RELEASE-RLVa: check that this still isn't called by anything but script actions in the Tools menu
-        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment()) )
+        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasLockedAttachment(RLV_LOCK_REMOVE)) )
        {
-                LLObjectSelectionHandle selectHandle = LLSelectMgr::getInstance()->getSelection();
+                LLObjectSelectionHandle hSelection = LLSelectMgr::getInstance()->getSelection();
                // NOTE: this is called for 5 different menu items so we'll trade accuracy for efficiency and only
                //       examine root nodes (LLToolsSelectedScriptAction::handleEvent() will catch what we miss)
-                RlvSelectHasLockedAttach functor;
+                RlvSelectHasLockedAttach functor(RLV_LOCK_REMOVE);
-                if ( (selectHandle->isAttachment()) && (selectHandle->getFirstRootNode(&functor)) )
+                if ( (hSelection->isAttachment()) && (hSelection->getFirstRootNode(&functor)) )
                {
                        return false;
                }
@@ -10452,6 +10485,35 @@ class LLAvatarReportAbuse : public view_listener_t
+////////////////////////////
+// ALLOW MULTIPLE VIEWERS //
+////////////////////////////
+class LLAdvancedToggleMultipleViewers : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                BOOL cur_val = gSavedSettings.getBOOL("AllowMultipleViewers");
+                gSavedSettings.setBOOL("AllowMultipleViewers", !cur_val );
+                return true;
+        }
+};
+class LLAdvancedCheckMultipleViewers : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gSavedSettings.getBOOL("AllowMultipleViewers");
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
 ///////////////
 // RLVa Main //
 ///////////////
@@ -10893,7 +10955,8 @@ void initialize_menus()
        addMenu(new LLAdvancedCheckViewAdminOptions(), "Advanced.CheckViewAdminOptions");
        addMenu(new LLAdvancedRequestAdminStatus(), "Advanced.RequestAdminStatus");
        addMenu(new LLAdvancedLeaveAdminStatus(), "Advanced.LeaveAdminStatus");
+        addMenu(new LLAdvancedToggleMultipleViewers(), "Advanced.ToggleMultipleViewers");
+        addMenu(new LLAdvancedCheckMultipleViewers(), "Advanced.CheckMultipleViewers");
        // RLVa
        addMenu(new RLVaMainToggle(), "RLVa.Main.Toggle");
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index 48e7492..26c65fb 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -106,6 +106,7 @@ void handle_toggle_flycam();
 bool handle_sit_or_stand();
 bool handle_give_money_dialog();
 bool handle_object_open();
+bool handle_go_to_confirm();
 bool handle_go_to();
 // Export to XML or Collada
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index d64eecd..54b4730 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -2534,7 +2534,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                        if (LLFloaterMap::getInstance())
                        {
-                                LLFloaterMap::getInstance()->updateTypingList(from_id, false);
+                                LLFloaterMap::getInstance()->getRadar()->addToTypingList(from_id);
                        }
                        return;
@@ -2551,10 +2551,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                        if (LLFloaterMap::getInstance())
                        {
-                                if (LLFloaterMap::getInstance()->isTyping(from_id))
+                                LLFloaterMap::getInstance()->getRadar()->removeFromTypingList(from_id);
-                                {
-                                        LLFloaterMap::getInstance()->updateTypingList(from_id, true);
-                                }
                        }
                        return;
diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 5e131b9..296c540 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -1377,6 +1377,13 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item, llwchar wc)
 void LLViewerTextEditor::openEmbeddedTexture( LLInventoryItem* item, llwchar wc )
 {
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-10-13 (RLVa-1.0.5c) | Added: RLVa-1.0.5c
+        if (gRlvHandler.hasBehaviour(RLV_BHVR_VIEWTEXTURE))
+        {
+                return;
+        }
+// [/RLVa:KB]
        // See if we can bring an existing preview to the front
        // *NOTE:  Just for embedded Texture , we should use getAssetUUID(), 
        // not getUUID(), because LLPreviewTexture pass in AssetUUID into 
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index d35ad40..225ef2e 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -6048,37 +6048,10 @@ BOOL LLVOAvatar::attachObject(LLViewerObject *viewer_object)
        {
                updateAttachmentVisibility(gAgent.getCameraMode());
                
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                if (rlv_handler_t::isEnabled())
                {
-                        static bool fRlvFullyLoaded = false;
+                        gRlvHandler.onAttach(attachment);
-                        static LLFrameTimer* pRlvFullyLoadedTimer = NULL;
-                        // There's no way to know when we're done reattaching what was attached at log-off but this ugly evil bad hack tries anyway
-                        if (!fRlvFullyLoaded)
-                        {
-                                if (pRlvFullyLoadedTimer)
-                                {
-                                        if (pRlvFullyLoadedTimer->getElapsedTimeF32() > 30.0f)
-                                        {
-                                                fRlvFullyLoaded = true;
-                                                delete pRlvFullyLoadedTimer;
-                                                pRlvFullyLoadedTimer = NULL;
-                                        }
-                                        else
-                                        {
-                                                pRlvFullyLoadedTimer->reset();
-                                        }
-                                }
-                                else if ( (!pRlvFullyLoadedTimer) && 
-                                              ( (0 == mPendingAttachment.size()) || 
-                                                    ((1 == mPendingAttachment.size()) && (mPendingAttachment[0] == viewer_object)) ) )
-                                {
-                                        pRlvFullyLoadedTimer = new LLFrameTimer();
-                                }
-                        }
-                        gRlvHandler.onAttach(attachment, fRlvFullyLoaded);
                }
 // [/RLVa:KB]
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index d543a65..607bb42 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -1979,9 +1979,9 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
 {
        if (!mbCanSelect ||
 //              (gHideSelectedObjects && isSelected()) ||
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                ( (gHideSelectedObjects && isSelected()) && 
-                  ((!rlv_handler_t::isEnabled()) || (!isHUDAttachment()) || (gRlvHandler.isDetachable(this))) ) ||
+                  ((!rlv_handler_t::isEnabled()) || (!isHUDAttachment()) || (!gRlvHandler.isLockedAttachment(this, RLV_LOCK_REMOVE))) ) ||
 // [/RLVa:KB]
                        mDrawable->isDead() || 
                        !gPipeline.hasRenderType(mDrawable->getRenderType()))
@@ -2128,10 +2128,10 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
 //      {
 //              return;
 //      }
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
        LLViewerObject* pObj = facep->getViewerObject();
        if ( (pObj->isSelected() && gHideSelectedObjects) && 
-                 ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (gRlvHandler.isDetachable(pObj))) )
+                 ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (!gRlvHandler.isLockedAttachment(pObj, RLV_LOCK_REMOVE))) )
        {
                return;
        }
diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
new file mode 100644
index 0000000..e85af44
--- /dev/null
+++ b/linden/indra/newview/panelradar.cpp
@@ -0,0 +1,935 @@
+/**
+ * @file panelradar.cpp
+ * @brief PanelRadar class (list of nearby agents)
+ *
+ * Copyright (c) 2009, McCabe Maxsted, Jacek Antonelli, Dale Glass
+ *
+ * The source code in this file ("Source Code") is provided to you
+ * under the terms of the GNU General Public License, version 2.0
+ * ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+ * this distribution, or online at
+ * http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+#include "llviewerprecompiledheaders.h"
+#include "panelradar.h"
+#include "llagent.h"
+#include "llchat.h"
+#include "llfloateravatarinfo.h"
+#include "llfloaterchat.h"
+#include "llfloaterfriends.h"
+#include "llfloatergroupinvite.h"
+#include "llfloatergroups.h"
+#include "llfloaterreporter.h"
+#include "llimview.h"
+#include "llmutelist.h"
+#include "llparcel.h"
+#include "llregionposition.h"
+#include "roles_constants.h"
+#include "llscrolllistctrl.h"
+#include "lltracker.h"
+#include "lluictrlfactory.h"
+#include "llviewerobjectlist.h"
+#include "llviewermenu.h"
+#include "llviewermessage.h"
+#include "llviewerparcelmgr.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
+#include "llvoavatar.h"
+#include "llworld.h"
+PanelRadar::PanelRadar()
+        :
+        LLPanel(),
+        mSelectedAvatar(LLUUID::null)
+{
+        LLUICtrlFactory::getInstance()->buildPanel(this, "panel_radar.xml");
+        mChatAvatars.clear();
+        mTypingAvatars.clear();
+        mSimAvatars.clear();
+}
+BOOL PanelRadar::postBuild()
+{
+        mRadarList = getChild<LLScrollListCtrl>("RadarList");
+        childSetCommitCallback("RadarList", onUseRadarList, this);
+        mRadarList->setDoubleClickCallback(onClickIM);
+        childSetAction("im_btn", onClickIM, this);
+        childSetAction("profile_btn", onClickProfile, this);
+        childSetAction("offer_teleport_btn", onClickOfferTeleport, this);
+        childSetAction("track_btn", onClickTrack, this);
+        childSetAction("invite_btn", onClickInvite, this);
+        childSetAction("add_btn", onClickAddFriend, this);
+        childSetAction("freeze_btn", onClickFreeze, this);
+        childSetAction("eject_btn", onClickEject, this);
+        childSetAction("mute_btn", onClickMute, this);
+        childSetAction("unmute_btn", onClickUnmute, this);
+        childSetAction("ar_btn", onClickAR, this);
+        childSetAction("estate_eject_btn", onClickEjectFromEstate, this);
+        setDefaultBtn("im_btn");
+        populateRadar();
+        return TRUE;
+}
+PanelRadar::~PanelRadar()
+{
+}
+//static
+bool PanelRadar::isImpDev(LLUUID agent_id)
+{
+        // We use strings here as avatar keys change across grids. 
+        // Feel free to add/remove yourself.
+        std::string agent_name = getSelectedName(agent_id);
+        return (agent_name == "McCabe Maxsted" || 
+                agent_name == "Jacek Antonelli" ||
+                agent_name == "Armin Weatherwax");
+}
+void PanelRadar::populateRadar()
+{
+        if (!getVisible())
+        {
+                return;
+        }
+        if (visibleItemsSelected())
+        {
+                mSelectedAvatar = mRadarList->getFirstSelected()->getUUID();
+        }
+        else
+        {
+                mSelectedAvatar.setNull();
+        }
+        S32 scroll_pos = mRadarList->getScrollPos();
+        // clear count
+        std::stringstream avatar_count; 
+        avatar_count.str("");
+        // find what avatars you can see
+        F32 range = gSavedSettings.getF32("NearMeRange");
+        LLVector3d current_pos = gAgent.getPositionGlobal();
+        std::vector<LLUUID> avatar_ids;
+        std::vector<LLVector3d> positions;
+        LLWorld::getInstance()->getAvatars(&avatar_ids, &positions);
+        LLSD element;
+        mRadarList->deleteAllItems();
+        if (!avatar_ids.empty())
+        {
+                for (U32 i=0; i<avatar_ids.size(); i++)
+                {
+                        if (avatar_ids[i] == gAgent.getID() ||
+                                avatar_ids[i].isNull())
+                        {
+                                continue;
+                        }
+                        // Add to list only if we get their name
+                        std::string fullname = getSelectedName(avatar_ids[i]);
+                        if (!fullname.empty())
+                        {
+                                bool notify_chat = gSavedSettings.getBOOL("MiniMapNotifyChatRange");
+                                bool notify_sim = gSavedSettings.getBOOL("MiniMapNotifySimRange");
+        // [RLVa:KB] - Alternate: Imprudence-1.2.0
+                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                                {
+                                        fullname = gRlvHandler.getAnonym(fullname);
+                                        notify_chat = false;
+                                        notify_sim = false;
+                                }
+        // [/RLVa:KB]
+                                // check if they're in certain ranges and notify user if we've enabled that
+                                LLVector3d temp = positions[i];
+                                if (positions[i].mdV[VZ] == 0.0f) // LL only sends height value up to 1024m, try to work around it
+                                {
+                                        LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]);
+                                        if (av_obj != NULL && av_obj->isAvatar())
+                                        {
+                                                LLVOAvatar* avatarp = (LLVOAvatar*)av_obj;
+                                                if (avatarp != NULL)
+                                                {
+                                                        temp = avatarp->getPositionGlobal();
+                                                }
+                                        }
+                                }
+                                F64 distance = dist_vec(temp, current_pos); 
+                                // we round for accuracy when avs tp in
+                                std::string dist_string = llformat("%.1f", llround((F32)distance, 0.1f));
+                                /*llinfos << "Avatar :" << fullname << " Position: " << positions[i] << " Your Position: " 
+                                        << current_pos << " Distance: " << distance << llendl;*/
+                                if (notify_chat)
+                                {
+                                        if (distance < 20.0f)
+                                        {
+                                                if (!isInChatList(avatar_ids[i]))
+                                                {
+                                                        addToChatList(avatar_ids[i], dist_string);
+                                                }
+                                        }
+                                        else
+                                        {
+                                                if (isInChatList(avatar_ids[i]))
+                                                {
+                                                        removeFromChatList(avatar_ids[i]);
+                                                }
+                                        }
+                                        updateChatList(avatar_ids);
+                                }
+                                else if (!mChatAvatars.empty())
+                                {
+                                        mChatAvatars.clear();
+                                }
+                                if (notify_sim)
+                                {
+                                        if (!isInChatList(avatar_ids[i]) && !isInSimAvList(avatar_ids[i]))
+                                        {
+                                                LLViewerObject *av_obj = gObjectList.findObject(avatar_ids[i]);
+                                                if (av_obj != NULL && av_obj->isAvatar())
+                                                {
+                                                        LLVOAvatar* avatarp = (LLVOAvatar*)av_obj;
+                                                        if (avatarp != NULL)
+                                                        {
+                                                                if (avatarp->getRegion() == gAgent.getRegion())
+                                                                {
+                                                                        addToSimAvList(avatar_ids[i], dist_string);
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                        updateSimAvList(avatar_ids);
+                                }
+                                else if (!mSimAvatars.empty())
+                                {
+                                        mSimAvatars.clear();
+                                }
+                                // only display avatars in range
+                                if (distance <= range)
+                                {
+                                        // append typing string
+                                        std::string typing = "";
+                                        if (isTyping(avatar_ids[i]))
+                                        {
+                                                typing = getString("is_typing")+ " ";
+                                        }
+                                        std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("is_muted") : "";
+                                        element["id"] = avatar_ids[i];
+                                        element["columns"][0]["column"] = "avatar_name";
+                                        element["columns"][0]["type"] = "text";
+                                        element["columns"][0]["value"] = typing + fullname + " " + mute_text;
+                                        element["columns"][1]["column"] = "avatar_distance";
+                                        element["columns"][1]["type"] = "text";
+                                        element["columns"][1]["value"] = dist_string+"m";
+                                        mRadarList->addElement(element, ADD_BOTTOM);
+                                }
+                        }
+                }
+                mRadarList->sortItems();
+                mRadarList->setScrollPos(scroll_pos);
+                if (mSelectedAvatar.notNull())
+                {
+                        mRadarList->selectByID(mSelectedAvatar);
+                }
+                avatar_count << (int)avatar_ids.size();
+        }
+        else
+        {
+                mTypingAvatars.clear();
+                mRadarList->addCommentText(getString("no_one_near"), ADD_TOP);
+                avatar_count << "0";
+        }
+        childSetText("lblAvatarCount", avatar_count.str());
+        updateButtonStates();
+        //llinfos << "mSelectedAvatar: " << mSelectedAvatar.asString() << llendl;
+}
+void PanelRadar::updateChatList(std::vector<LLUUID> agent_ids)
+{
+        std::set<LLUUID>::iterator it;
+        std::vector<LLUUID>::iterator result;
+        for (it = mChatAvatars.begin(); it != mChatAvatars.end(); )
+        {
+                result = find(agent_ids.begin(), agent_ids.end(), *it);
+                if (result == agent_ids.end())
+                {
+                        mChatAvatars.erase(it++);
+                }
+                else
+                {
+                        it++;
+                }
+        }
+}
+bool PanelRadar::isInChatList(LLUUID agent_id)
+{
+        return (mChatAvatars.count(agent_id) > 0);
+}
+void PanelRadar::addToChatList(LLUUID agent_id, std::string distance)
+{
+        mChatAvatars.insert(agent_id);
+        LLChat chat;
+        LLUIString notify = getString("entering_chat_range");
+        notify.setArg("[NAME]", getSelectedName(agent_id));
+        notify.setArg("[DISTANCE]", distance);
+        chat.mText = notify;
+        chat.mSourceType = CHAT_SOURCE_SYSTEM;
+        LLFloaterChat::addChat(chat, FALSE, FALSE);     
+}
+void PanelRadar::removeFromChatList(LLUUID agent_id)
+{
+        // Do we want to add a notice?
+        mChatAvatars.erase(agent_id);
+}
+bool PanelRadar::isTyping(LLUUID agent_id)
+{
+        return (mTypingAvatars.count(agent_id) > 0);
+}
+void PanelRadar::addToTypingList(LLUUID agent_id)
+{
+        mTypingAvatars.insert(agent_id);
+}
+void PanelRadar::removeFromTypingList(LLUUID agent_id)
+{
+        mTypingAvatars.erase(agent_id);
+}
+void PanelRadar::updateSimAvList(std::vector<LLUUID> agent_ids)
+{
+        std::set<LLUUID>::iterator it;
+        std::vector<LLUUID>::iterator result;
+        for (it = mSimAvatars.begin(); it != mSimAvatars.end(); )
+        {
+                result = find(agent_ids.begin(), agent_ids.end(), *it);
+                if (result == agent_ids.end())
+                {
+                        mSimAvatars.erase(it++);
+                }
+                else
+                {
+                        it++;
+                }
+        }
+}
+void PanelRadar::addToSimAvList(LLUUID agent_id, std::string distance)
+{
+        mSimAvatars.insert(agent_id);
+        LLChat chat;
+        LLUIString notify = getString("entering_sim_range");
+        notify.setArg("[NAME]", getSelectedName(agent_id));
+        notify.setArg("[DISTANCE]", distance);
+        chat.mText = notify;
+        chat.mSourceType = CHAT_SOURCE_SYSTEM;
+        LLFloaterChat::addChat(chat, FALSE, FALSE);     
+}
+bool PanelRadar::isInSimAvList(LLUUID agent_id)
+{
+        if (mSimAvatars.count(agent_id) > 0)
+        {
+                return true;
+        }
+        return false;
+}
+void PanelRadar::updateButtonStates()
+{
+        bool enable = false;
+        bool enable_unmute = false;
+        bool enable_track = false;
+        bool enable_estate = false;
+        bool enable_friend = false;
+        if (hasFocus())
+        {
+                enable = mSelectedAvatar.notNull() ? visibleItemsSelected() : false;
+                enable_unmute = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : false;
+                enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
+                enable_estate = isKickable(mSelectedAvatar);
+                enable_friend = !is_agent_friend(mSelectedAvatar);
+        }
+        else
+        {
+                mRadarList->deselect();
+        }
+        childSetEnabled("im_btn", enable);
+        childSetEnabled("profile_btn", enable);
+        childSetEnabled("offer_teleport_btn", enable);
+        childSetEnabled("track_btn", enable_track);
+        childSetEnabled("invite_btn", enable);
+        childSetEnabled("add_btn", enable);
+        childSetEnabled("freeze_btn", enable_estate);
+        childSetEnabled("eject_btn", enable_estate);
+        childSetEnabled("mute_btn", enable);
+        childSetEnabled("ar_btn", enable);
+        childSetEnabled("estate_eject_btn", enable_estate);
+        if (enable_unmute)
+        {
+                childSetVisible("mute_btn", false);
+                childSetEnabled("unmute_btn", true);
+                childSetVisible("unmute_btn", true);
+        }
+        else
+        {
+                childSetVisible("mute_btn", true);
+                childSetVisible("unmute_btn", false);
+        }
+// [RLVa:KB] - Imprudence-1.2.0
+        // Bit clumsy, but this way the RLV stuff is in its own separate
+        // block and keeps the code above clean - Kitty
+        if ( (rlv_handler_t::isEnabled()) && (mSelectedAvatar.notNull()) )
+        {
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                {
+                        childSetEnabled("im_btn", false);
+                        childSetEnabled("profile_btn", false);
+                        childSetEnabled("invite_btn", false);
+                        childSetEnabled("add_btn", false);
+                        childSetEnabled("mute_btn", false);
+                        childSetEnabled("unmute_btn", false);
+                }
+                // Even though the avie is in the same sim (so they already know
+                // where we are) the tp would just get blocked by different code
+                // so it's actually less confusing to the user if we just disable
+                // the teleport button here so they'll at least have a visual cue
+                BOOL rlv_enable_tp = (!gRlvHandler.hasBehaviour(RLV_BHVR_TPLURE)) || (gRlvHandler.isException(RLV_BHVR_TPLURE, mSelectedAvatar));
+                if ( (rlv_enable_tp) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
+                {
+                        const LLRelationship* pBuddyInfo = LLAvatarTracker::instance().getBuddyInfo(mSelectedAvatar);
+                        if ( ((!pBuddyInfo) || (!pBuddyInfo->isOnline()) || (!pBuddyInfo->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION))) )
+                                rlv_enable_tp = FALSE;
+                }
+                childSetEnabled("offer_teleport_btn", rlv_enable_tp);
+        }
+// [/RLVa:KB]
+}
+bool PanelRadar::isKickable(const LLUUID &agent_id)
+{
+        if (agent_id.notNull())
+        {
+                LLViewerObject* av_obj = gObjectList.findObject(agent_id);
+                if (av_obj != NULL && av_obj->isAvatar())
+                {
+                        LLVOAvatar* avatar = (LLVOAvatar*)av_obj;
+                        LLViewerRegion* region = avatar->getRegion();
+                        if (region)
+                        {
+                                const LLVector3& pos = avatar->getPositionRegion();
+                                const LLVector3d& pos_global = avatar->getPositionGlobal();
+                                if (LLWorld::getInstance()->positionRegionValidGlobal(pos_global))
+                                {
+                                        LLParcel* parcel = LLViewerParcelMgr::getInstance()->selectParcelAt(pos_global)->getParcel();
+                                        LLViewerParcelMgr::getInstance()->deselectLand();
+                                        
+                                        bool new_value = (region != NULL);
+                                                                
+                                        if (new_value)
+                                        {
+                                                new_value = region->isOwnedSelf(pos);
+                                                if (!new_value || region->isOwnedGroup(pos))
+                                                {
+                                                        new_value = LLViewerParcelMgr::getInstance()->isParcelOwnedByAgent(parcel,GP_LAND_ADMIN);
+                                                }
+                                        }
+                                        return new_value;
+                                }
+                        }
+                }
+        }
+        return false;   
+}
+// static
+void PanelRadar::onUseRadarList(LLUICtrl* ctrl, void* user_data)
+{
+        PanelRadar* self = (PanelRadar*)user_data;
+        if (self)
+        {
+                self->updateButtonStates();
+        }
+}
+bool PanelRadar::visibleItemsSelected() const
+{
+        return (mRadarList->getFirstSelectedIndex() >= 0);
+}
+LLUUID PanelRadar::getSelected()
+{
+        return mSelectedAvatar;
+}
+//static 
+std::string PanelRadar::getSelectedName(const LLUUID &agent_id)
+{
+        std::string agent_name;
+        if(gCacheName->getFullName(agent_id, agent_name) && agent_name != " ")
+        {
+                return agent_name;
+        }
+        return LLStringUtil::null;
+}
+//
+// Avatar tab
+//
+// static
+void PanelRadar::onClickIM(void* user_data)
+{
+        PanelRadar* self = (PanelRadar*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                gIMMgr->setFloaterOpen(TRUE);
+                gIMMgr->addSession(getSelectedName(agent_id), IM_NOTHING_SPECIAL, agent_id);
+        }
+}
+// static
+void PanelRadar::onClickProfile(void* user_data)
+{
+        PanelRadar* self = (PanelRadar*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLFloaterAvatarInfo::show(agent_id);
+        }
+}
+// static
+void PanelRadar::onClickOfferTeleport(void* user_data)
+{
+        PanelRadar* self = (PanelRadar*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                handle_lure(agent_id);
+        }
+}
+// static
+void PanelRadar::onClickTrack(void* user_data)
+{
+        PanelRadar* self = (PanelRadar*) user_data;
+        LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus();
+        
+        if (LLTracker::TRACKING_AVATAR == tracking_status)
+        {
+                LLTracker::stopTracking(NULL);
+        }
+        else
+        {
+                LLScrollListItem *item = self->mRadarList->getFirstSelected();
+                if (item != NULL)
+                {
+                        LLUUID agent_id = item->getUUID();
+                        LLTracker::trackAvatar(agent_id, getSelectedName(agent_id));
+                }
+        }
+}
+// static
+void PanelRadar::onClickInvite(void* user_data)
+{
+        PanelRadar* self = (PanelRadar*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLFloaterGroupPicker* widget;
+                widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
+                if (widget)
+                {
+                        widget->center();
+                        widget->setPowersMask(GP_MEMBER_INVITE);
+                        widget->setSelectCallback(callback_invite_to_group, (void *)&agent_id);
+                }
+        }
+}
+// static
+void PanelRadar::callback_invite_to_group(LLUUID group_id, void *user_data)
+{
+        std::vector<LLUUID> agent_ids;
+        agent_ids.push_back(*(LLUUID *)user_data);
+        
+        LLFloaterGroupInvite::showForGroup(group_id, &agent_ids);
+}
+// static
+void PanelRadar::onClickAddFriend(void* user_data)
+{
+        PanelRadar* self = (PanelRadar*) user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                LLPanelFriends::requestFriendshipDialog(agent_id, getSelectedName(agent_id));
+        }
+}
+//
+// Estate tab
+//
+//static 
+void PanelRadar::callbackFreeze(S32 option, void *user_data)
+{
+        PanelRadar *self = (PanelRadar*)user_data;
+        if ( option == 0 )
+        {
+                sendFreeze(self->mSelectedAvatar, true);
+        }
+        else if ( option == 1 )
+        {
+                sendFreeze(self->mSelectedAvatar, false);
+        }
+}
+//static 
+void PanelRadar::callbackEject(S32 option, void *user_data)
+{
+        PanelRadar *self = (PanelRadar*)user_data;
+ 
+        if ( option == 0 )
+        {
+                sendEject(self->mSelectedAvatar, false);
+        }
+        else if ( option == 1 )
+        {
+                sendEject(self->mSelectedAvatar, true);
+        }
+}
+//static 
+void PanelRadar::callbackEjectFromEstate(S32 option, void *user_data)
+{
+        PanelRadar *self = (PanelRadar*)user_data;
+        if ( option == 0 )
+        {
+                cmdEstateEject(self->mSelectedAvatar);
+        } 
+        else if ( option == 1 )
+        {
+                cmdEstateBan(self->mSelectedAvatar);
+        }
+}
+void PanelRadar::onClickFreeze(void *user_data)
+{
+        PanelRadar *self = (PanelRadar*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["[AVATAR_NAME]"] = getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("FreezeAvatarFullname", args, callbackFreeze, user_data);
+}
+//static
+void PanelRadar::onClickEject(void *user_data)
+{
+        PanelRadar *self = (PanelRadar*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["AVATAR_NAME"] = getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("EjectAvatarFullName", args, callbackEject, user_data);
+}
+//static
+void PanelRadar::onClickMute(void *user_data)
+{
+        PanelRadar *self = (PanelRadar*)user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                std::string agent_name = getSelectedName(agent_id);
+                if (LLMuteList::getInstance()->isMuted(agent_id))
+                {
+                        //LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        //LLMuteList::getInstance()->remove(mute);      
+                        //LLFloaterMute::getInstance()->selectMute(agent_id);
+                }
+                else
+                {
+                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        LLMuteList::getInstance()->add(mute);
+                }
+        }
+}
+//static
+void PanelRadar::onClickUnmute(void *user_data)
+{
+        PanelRadar *self = (PanelRadar*)user_data;
+        LLScrollListItem *item = self->mRadarList->getFirstSelected();
+        if (item != NULL)
+        {
+                LLUUID agent_id = item->getUUID();
+                std::string agent_name = getSelectedName(agent_id);
+                if (LLMuteList::getInstance()->isMuted(agent_id))
+                {
+                        LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        LLMuteList::getInstance()->remove(mute);        
+                        //LLFloaterMute::getInstance()->selectMute(agent_id);
+                }
+                else
+                {
+                        //LLMute mute(agent_id, agent_name, LLMute::AGENT);
+                        //LLMuteList::getInstance()->add(mute);
+                }
+        }
+}
+//static
+void PanelRadar::onClickEjectFromEstate(void *user_data)
+{
+        PanelRadar *self = (PanelRadar*)user_data;
+        LLStringUtil::format_map_t args;
+        LLSD payload;
+        args["EVIL_USER"] = getSelectedName(self->mSelectedAvatar);
+        gViewerWindow->alertXml("EstateKickUser", args, callbackEjectFromEstate, user_data);
+}
+//static
+void PanelRadar::onClickAR(void *user_data)
+{
+        PanelRadar *self = (PanelRadar*)user_data;
+        LLUUID agent_id = self->mSelectedAvatar;
+                
+        if (agent_id.notNull())
+        {
+                        LLFloaterReporter::showFromObject(agent_id);
+        }
+}
+// static 
+void PanelRadar::cmdEstateEject(const LLUUID &avatar)
+{ 
+        sendEstateMessage("teleporthomeuser", avatar); 
+}
+// static 
+void PanelRadar::cmdEstateBan(const LLUUID &avatar)
+{
+        sendEstateMessage("teleporthomeuser", avatar); // Kick first, just to be sure
+        sendEstateBan(avatar);
+}
+// static 
+void PanelRadar::sendFreeze(const LLUUID& avatar_id, bool freeze)
+{
+        U32 flags = 0x0;
+        if (!freeze)
+        {
+                // unfreeze
+                flags |= 0x1;
+        }
+        LLMessageSystem* msg = gMessageSystem;
+        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
+        if (avatar)
+        {
+                msg->newMessage("FreezeUser");
+                msg->nextBlock("AgentData");
+                msg->addUUID("AgentID", gAgent.getID());
+                msg->addUUID("SessionID", gAgent.getSessionID());
+                msg->nextBlock("Data");
+                msg->addUUID("TargetID", avatar_id );
+                msg->addU32("Flags", flags );
+                msg->sendReliable( avatar->getRegion()->getHost() );
+        }
+}
+// static 
+void PanelRadar::sendEject(const LLUUID& avatar_id, bool ban)
+{       
+        LLMessageSystem* msg = gMessageSystem;
+        LLViewerObject* avatar = gObjectList.findObject(avatar_id);
+        if (avatar)
+        {
+                U32 flags = 0x0;
+                if ( ban )
+                {
+                        // eject and add to ban list
+                        flags |= 0x1;
+                }
+                msg->newMessage("EjectUser");
+                msg->nextBlock("AgentData");
+                msg->addUUID("AgentID", gAgent.getID() );
+                msg->addUUID("SessionID", gAgent.getSessionID() );
+                msg->nextBlock("Data");
+                msg->addUUID("TargetID", avatar_id );
+                msg->addU32("Flags", flags );
+                msg->sendReliable( avatar->getRegion()->getHost() );
+        }
+}
+// static 
+void PanelRadar::sendEstateMessage(const char* request, const LLUUID &target)
+{
+        LLMessageSystem* msg = gMessageSystem;
+        LLUUID invoice;
+        // This seems to provide an ID so that the sim can say which request it's
+        // replying to. I think this can be ignored for now.
+        invoice.generate();
+        llinfos << "Sending estate request '" << request << "'" << llendl;
+        msg->newMessage("EstateOwnerMessage");
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+        msg->nextBlock("MethodData");
+        msg->addString("Method", request);
+        msg->addUUID("Invoice", invoice);
+        // Agent id
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", gAgent.getID().asString().c_str());
+        // Target
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", target.asString().c_str());
+        msg->sendReliable(gAgent.getRegion()->getHost());
+}
+// static 
+void PanelRadar::sendEstateBan(const LLUUID& agent)
+{
+        LLUUID invoice;
+        U32 flags = ESTATE_ACCESS_BANNED_AGENT_ADD;
+        invoice.generate();
+        LLMessageSystem* msg = gMessageSystem;
+        msg->newMessage("EstateOwnerMessage");
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+        msg->nextBlock("MethodData");
+        msg->addString("Method", "estateaccessdelta");
+        msg->addUUID("Invoice", invoice);
+        char buf[MAX_STRING];           /* Flawfinder: ignore*/
+        gAgent.getID().toString(buf);
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+        snprintf(buf, MAX_STRING, "%u", flags);                 /* Flawfinder: ignore */
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+        agent.toString(buf);
+        msg->nextBlock("ParamList");
+        msg->addString("Parameter", buf);
+        gAgent.sendReliableMessage();
+}
diff --git a/linden/indra/newview/panelradar.h b/linden/indra/newview/panelradar.h
new file mode 100644
index 0000000..0152f26
--- /dev/null
+++ b/linden/indra/newview/panelradar.h
@@ -0,0 +1,118 @@
+/**
+ * @file panelradar.h
+ * @brief PanelRadar class header (list of nearby agents)
+ *
+ * Copyright (c) 2009, McCabe Maxsted, Jacek Antonelli, Dale Glass
+ *
+ * The source code in this file ("Source Code") is provided to you
+ * under the terms of the GNU General Public License, version 2.0
+ * ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+ * this distribution, or online at
+ * http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+#ifndef PANELRADAR_H
+#define PANELRADAR_H
+#include "llpanel.h"
+#include "llscrolllistctrl.h"
+class PanelRadar : public LLPanel
+{
+public:
+        PanelRadar();
+        virtual ~PanelRadar();
+        BOOL postBuild();
+        // returns true if agent_id belongs to an Imprudence developer
+        static bool isImpDev(LLUUID agent_id);
+        LLUUID getSelected();
+        void addToTypingList(LLUUID agent_id);
+        void removeFromTypingList(LLUUID agent_id);
+        void updateButtonStates();
+        void populateRadar();
+private:
+        // TODO: move all this info into its own object. It's stupid 
+        // and bug-prone to keep it all in separate containers, but 
+        // I want to get this out for 1.2 -- McCabe
+        std::set<LLUUID>    mChatAvatars;
+        std::set<LLUUID>    mTypingAvatars;
+        std::set<LLUUID>    mSimAvatars;
+        LLScrollListCtrl*   mRadarList;
+        LLUUID              mSelectedAvatar;
+        void updateChatList(std::vector<LLUUID> agent_ids);
+        bool isInChatList(LLUUID agent_id);
+        void addToChatList(LLUUID agent_id, std::string distance);
+        void removeFromChatList(LLUUID agent_id);
+        bool isInSimAvList(LLUUID agent_id);
+        void addToSimAvList(LLUUID agent_id, std::string distance);
+        void updateSimAvList(std::vector<LLUUID> agent_ids);
+        bool isTyping(LLUUID agent_id);
+        bool visibleItemsSelected() const;
+        bool isKickable(const LLUUID &agent_id);
+        static std::string getSelectedName(const LLUUID &agent_id);
+        static void onUseRadarList(LLUICtrl* ctrl, void* user_data);
+        static void onRangeChange(LLFocusableElement* focus, void* user_data);
+        static void onClickProfile(void* user_data);
+        static void onClickIM(void* user_data);
+        static void onClickAddFriend(void* user_data);
+        static void onClickOfferTeleport(void* user_data);
+        static void onClickTrack(void* user_data);
+        static void onClickInvite(void* user_data);
+        static void callback_invite_to_group(LLUUID group_id, void *user_data);
+        static void onClickFreeze(void *user_data);
+        static void onClickEject(void *user_data);
+        static void onClickMute(void *user_data);
+        static void onClickUnmute(void *user_data);
+        static void onClickAR(void *user_data);
+        static void onClickEjectFromEstate(void *user_data);
+        static void callbackFreeze(S32 option, void *user_data);
+        static void callbackEject(S32 option, void *user_data);
+        static void callbackAR(void *user_data);
+        static void callbackEjectFromEstate(S32 option, void *user_data);
+        static void sendFreeze(const LLUUID &avatar, bool);
+        static void sendEject(const LLUUID &avatar, bool);
+        static void cmdEstateEject(const LLUUID &avatar);
+        static void cmdEstateBan(const LLUUID &avatar);
+        static void sendEstateBan(const LLUUID& agent);
+        static void sendEstateMessage(const char* request, const LLUUID &target);
+};
+#endif // PANELRADAR_H
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 6fb2cec..4ea9e41 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -1965,10 +1965,10 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
        {
 //              if (drawablep->getVObj().notNull() &&
 //                      drawablep->getVObj()->isSelected())
-// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+// [RLVa:KB] - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
                LLViewerObject* pObj = drawablep->getVObj();
                if ( (pObj) && (pObj->isSelected()) && 
-                         ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (gRlvHandler.isDetachable(pObj))) )
+                         ((!rlv_handler_t::isEnabled()) || (!pObj->isHUDAttachment()) || (!gRlvHandler.isLockedAttachment(pObj, RLV_LOCK_REMOVE))) )
 // [/RVLa:KB]
                {
                        return;
diff --git a/linden/indra/newview/rlvdefines.h b/linden/indra/newview/rlvdefines.h
index 118ba31..a35d109 100644
--- a/linden/indra/newview/rlvdefines.h
+++ b/linden/indra/newview/rlvdefines.h
@@ -41,14 +41,14 @@
 // Version of the specifcation we support
 const S32 RLV_VERSION_MAJOR = 1;
-const S32 RLV_VERSION_MINOR = 21;
+const S32 RLV_VERSION_MINOR = 22;
 const S32 RLV_VERSION_PATCH = 0;
 const S32 RLV_VERSION_BUILD = 0;
 // Implementation version
 const S32 RLVa_VERSION_MAJOR = 1;
 const S32 RLVa_VERSION_MINOR = 0;
-const S32 RLVa_VERSION_PATCH = 4;
+const S32 RLVa_VERSION_PATCH = 5;
 const S32 RLVa_VERSION_BUILD = 4;
 // The official viewer version we're patching against
@@ -59,12 +59,15 @@ const S32 RLVa_VERSION_BUILD = 4;
 #define RLV_WARNS       LL_WARNS("RLV")
 #define RLV_INFOS       LL_INFOS("RLV")
 #define RLV_DEBUGS      LL_DEBUGS("RLV")
+#define RLV_ENDL        LL_ENDL
 #if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
        // Turn on extended debugging information
        #define RLV_DEBUG
        // Make sure we halt execution on errors
-        #define RLV_ERRS  LL_ERRS("RLV")
+        #define RLV_ERRS                LL_ERRS("RLV")
+        // Keep our asserts separate from LL's
+        #define RLV_ASSERT(f)   if (!(f)) RLV_ERRS << "ASSERT (" << #f << ")" << RLV_ENDL;
        // Uncomment to enable the Advanced / RLVa / Unit Tests menu (non-public)
        //#define RLV_DEBUG_TESTS
 #else
@@ -72,6 +75,8 @@ const S32 RLVa_VERSION_BUILD = 4;
        //#define RLV_DEBUG
        // Don't halt execution on errors in release
        #define RLV_ERRS  LL_WARNS("RLV")
+        // We don't want to check assertions in release builds
+        #define RLV_ASSERT(f)
 #endif // LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
 #define RLV_ROOT_FOLDER                                 "#RLV"
@@ -111,6 +116,8 @@ enum ERlvBehaviour {
        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"
@@ -152,6 +159,8 @@ enum ERlvBehaviour {
        RLV_BHVR_DEFAULTWEAR,                   // "defaultwear"
        RLV_BHVR_VERSIONNUM,                    // "versionnum"
        RLV_BHVR_PERMISSIVE,                    // "permissive"
+        RLV_BHVR_VIEWSCRIPT,                    // "viewscript"
+        RLV_BHVR_VIEWTEXTURE,                   // "viewtexture"
        RLV_BHVR_COUNT,
        RLV_BHVR_UNKNOWN
@@ -185,6 +194,12 @@ enum ERlvExceptionCheck {
        RLV_CHECK_DEFAULT                               // Permissive or strict will be determined by currently enforced restrictions
 };
+enum ERlvLockMask {
+        RLV_LOCK_ADD    = 0x01,
+        RLV_LOCK_REMOVE = 0x02,
+        RLV_LOCK_ANY    = RLV_LOCK_ADD | RLV_LOCK_REMOVE
+};
 // ============================================================================
 // Settings
diff --git a/linden/indra/newview/rlvextensions.cpp b/linden/indra/newview/rlvextensions.cpp
index f31c62e..769d3cc 100644
--- a/linden/indra/newview/rlvextensions.cpp
+++ b/linden/indra/newview/rlvextensions.cpp
@@ -97,7 +97,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();
diff --git a/linden/indra/newview/rlvhandler.cpp b/linden/indra/newview/rlvhandler.cpp
index 69e2e2f..88cd174 100644
--- a/linden/indra/newview/rlvhandler.cpp
+++ b/linden/indra/newview/rlvhandler.cpp
@@ -31,11 +31,6 @@
 #include "rlvextensions.h"
 #include "rlvhandler.h"
-// Only defined in llinventorybridge.cpp
-#if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
-        #include "llinventorybridge.h"
-        void confirm_replace_attachment_rez(S32 option, void* user_data);
-#endif
 // Only defined in llinventorymodel.cpp
 extern const char* NEW_CATEGORY_NAME;
@@ -66,8 +61,8 @@ const std::string RlvHandler::cstrMsgTpLure =
 const std::string RlvHandler::cstrAnonyms[] =
 {
        "A resident", "This resident", "That resident", "An individual", "This individual", "That individual", "A person",
-        "This person", "That person", "A stranger", "This stranger", "That stranger", "A human being", "This human being", 
+        "This person", "That person", "A stranger", "This stranger", "That stranger", "A being", "This being", 
-        "That human being", "An agent", "This agent", "That agent", "A soul", "This soul", "That soul", "Somebody", 
+        "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"
 };
@@ -131,6 +126,7 @@ RlvHandler::~RlvHandler()
        //delete m_pGCTimer;    // <- deletes itself
        delete m_pWLSnapshot;   // <- delete on NULL is harmless
        delete m_pBhvrNotify;
+        delete m_pAttachMgr;
 }
 // ============================================================================
@@ -246,7 +242,7 @@ bool RlvHandler::hasLockedHUD() const
                return false;
        
        LLViewerJointAttachment* pAttachPt;
-        for (rlv_detach_map_t::const_iterator itAttachPt = m_Attachments.begin(); itAttachPt != m_Attachments.end(); ++itAttachPt)
+        for (rlv_attachlock_map_t::const_iterator itAttachPt = m_AttachRem.begin(); itAttachPt != m_AttachRem.end(); ++itAttachPt)
        {
                pAttachPt = get_if_there(pAvatar->mAttachmentPoints, (S32)itAttachPt->first, (LLViewerJointAttachment*)NULL);
                if ( (pAttachPt) && (pAttachPt->getIsHUDAttachment()) )
@@ -255,61 +251,94 @@ bool RlvHandler::hasLockedHUD() const
        return false;                   // None of our locked attachments is a HUD
 }
-bool RlvHandler::isDetachable(const LLInventoryItem* pItem) const
+// 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) ) ? isDetachable(pAvatar->getWornAttachment(pItem->getUUID())) : true;
+        return (pItem) && (pAvatar) && (isLockedAttachment(pAvatar->getWornAttachment(pItem->getUUID()), eLock));
 }
-// Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
+// Checked: 2009-10-13 (RLVa-1.0.5b) | Added: RLVa-1.0.5b
-bool RlvHandler::isDetachableExcept(S32 idxAttachPt, LLViewerObject *pObj) const
+bool RlvHandler::isLockedAttachmentExcept(S32 idxAttachPt, ERlvLockMask eLock, LLViewerObject *pObj) const
 {
-        // Loop over every object that marked the specific attachment point undetachable (but ignore pObj and any of its children)
+        // Loop over every object that marked the specific attachment point eLock type locked (but ignore pObj and any of its children)
-        for (rlv_detach_map_t::const_iterator itAttach = m_Attachments.lower_bound(idxAttachPt), 
+        LLViewerObject* pTempObj;
-                endAttach = m_Attachments.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
+        if (eLock & RLV_LOCK_REMOVE)
        {
-                LLViewerObject* pTempObj = gObjectList.findObject(itAttach->second);
+                for (rlv_attachlock_map_t::const_iterator itAttach = m_AttachRem.lower_bound(idxAttachPt), 
-                if ( (!pTempObj) || (pTempObj->getRootEdit()->getID() != pObj->getID()) )
+                        endAttach = m_AttachRem.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
-                        return false;
+                {
+                        if ( ((pTempObj = gObjectList.findObject(itAttach->second)) == NULL) || (pTempObj->getRootEdit()->getID() != pObj->getID()) )
+                                return true;
+                }
        }
-        return true;
+        if (eLock & RLV_LOCK_ADD)
+        {
+                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()) )
+                                return true;
+                }
+        }
+        return false;
 }
-// Checked: 2009-09-06 (RLVa-1.0.2b) | Modified: RLVa-1.0.2b
+// Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
-bool RlvHandler::setDetachable(S32 idxAttachPt, const LLUUID& idRlvObj, bool fDetachable)
+void RlvHandler::addAttachmentLock(S32 idxAttachPt, const LLUUID &idRlvObj, ERlvLockMask eLock)
 {
        // Sanity check - make sure it's an object we know about
-        rlv_object_map_t::const_iterator itObj = m_Objects.find(idRlvObj);
+        if ( (m_Objects.find(idRlvObj) == m_Objects.end()) || (!idxAttachPt) )
-        if ( (itObj == m_Objects.end()) || (!idxAttachPt) )
+                return; // If (idxAttachPt) == 0 then: (pObj == NULL) || (pObj->isAttachment() == FALSE)
-                return false;   // If (idxAttachPt) == 0 then: (pObj == NULL) || (pObj->isAttachment() == FALSE)
-        if (!fDetachable)
+        // NOTE: m_AttachXXX can contain duplicate <idxAttachPt, idRlvObj> pairs (ie @detach:spine=n,detach=n from an attachment on spine)
+        if (eLock & RLV_LOCK_REMOVE)
        {
                #ifdef RLV_EXPERIMENTAL_FIRSTUSE
                        //LLFirstUse::useRlvDetach();
                #endif // RLV_EXPERIMENTAL_FIRSTUSE
-                // NOTE: m_Attachments can contain duplicate <idxAttachPt, idRlvObj> pairs (ie @detach:spine=n,detach=n from an attachment on spine)
+                m_AttachRem.insert(std::pair<S32, LLUUID>(idxAttachPt, idRlvObj));
-                m_Attachments.insert(std::pair<S32, LLUUID>(idxAttachPt, itObj->second.m_UUID));
-                return true;
        }
-        else
+        if (eLock & RLV_LOCK_ADD)
        {
-                for (rlv_detach_map_t::iterator itAttach = m_Attachments.lower_bound(idxAttachPt), 
+                m_AttachAdd.insert(std::pair<S32, LLUUID>(idxAttachPt, idRlvObj));
-                                endAttach = m_Attachments.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
+        }
+}
+// Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
+void RlvHandler::removeAttachmentLock(S32 idxAttachPt, const LLUUID &idRlvObj, ERlvLockMask eLock)
+{
+        // Sanity check - make sure it's an object we know about
+        if ( (m_Objects.find(idRlvObj) == m_Objects.end()) || (!idxAttachPt) )
+                return; // If (idxAttachPt) == 0 then: (pObj == NULL) || (pObj->isAttachment() == FALSE)
+        if (eLock & RLV_LOCK_REMOVE)
+        {
+                for (rlv_attachlock_map_t::iterator itAttach = m_AttachRem.lower_bound(idxAttachPt), 
+                                endAttach = m_AttachRem.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
                {
-                        if (itObj->second.m_UUID == itAttach->second)
+                        if (idRlvObj == itAttach->second)
                        {
-                                m_Attachments.erase(itAttach);
+                                m_AttachRem.erase(itAttach);
-                                return true;
+                                break;
+                        }
+                }
+        }
+        if (eLock & RLV_LOCK_ADD)
+        {
+                for (rlv_attachlock_map_t::iterator itAttach = m_AttachAdd.lower_bound(idxAttachPt), 
+                                endAttach = m_AttachAdd.upper_bound(idxAttachPt); itAttach != endAttach; ++itAttach)
+                {
+                        if (idRlvObj == itAttach->second)
+                        {
+                                m_AttachAdd.erase(itAttach);
+                                break;
                        }
                }
        }
-        return false;   // Fall-through for (fDetachable == TRUE) - if the object wasn't undetachable then we consider it a failure
 }
 #ifdef RLV_EXTENSION_FLAG_NOSTRIP
        // Checked: 2009-05-26 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
        bool RlvHandler::isStrippable(const LLUUID& idItem) const
@@ -413,10 +442,10 @@ void RlvHandler::notifyBehaviourObservers(const RlvCommand& rlvCmd, bool fIntern
 }
 // Checked:
-BOOL RlvHandler::processCommand(const LLUUID& uuid, const std::string& strCmd, bool fFromObj)
+BOOL RlvHandler::processCommand(const LLUUID& idObj, const std::string& strCmd, bool fFromObj)
 {
        #ifdef RLV_DEBUG
-                RLV_INFOS << "[" << uuid << "]: " << strCmd << LL_ENDL;
+                RLV_INFOS << "[" << idObj << "]: " << strCmd << LL_ENDL;
        #endif // RLV_DEBUG
        RlvCommand rlvCmd(strCmd);
@@ -427,7 +456,10 @@ BOOL RlvHandler::processCommand(const LLUUID& uuid, const std::string& strCmd, b
                #endif // RLV_DEBUG
                return FALSE;
        }
-        m_pCurCommand = &rlvCmd; m_idCurObject = uuid;
+        // 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;
        BOOL fRet = FALSE;
        switch (rlvCmd.getParamType())
@@ -444,7 +476,7 @@ BOOL RlvHandler::processCommand(const LLUUID& uuid, const std::string& strCmd, b
                                        break;
                                }
-                                rlv_object_map_t::iterator itObj = m_Objects.find(uuid);
+                                rlv_object_map_t::iterator itObj = m_Objects.find(m_idCurObject);
                                if (itObj != m_Objects.end())
                                {
                                        RlvObject& rlvObj = itObj->second;
@@ -452,9 +484,9 @@ BOOL RlvHandler::processCommand(const LLUUID& uuid, const std::string& strCmd, b
                                }
                                else
                                {
-                                        RlvObject rlvObj(uuid);
+                                        RlvObject rlvObj(m_idCurObject);
                                        fRet = rlvObj.addCommand(rlvCmd);
-                                        m_Objects.insert(std::pair<LLUUID, RlvObject>(uuid, rlvObj));
+                                        m_Objects.insert(std::pair<LLUUID, RlvObject>(m_idCurObject, rlvObj));
                                }
                                #ifdef RLV_DEBUG
@@ -464,14 +496,14 @@ BOOL RlvHandler::processCommand(const LLUUID& uuid, const std::string& strCmd, b
                                if (fRet) {     // If FALSE then this was a duplicate, there's no need to handle those
                                        if (!m_pGCTimer)
                                                m_pGCTimer = new RlvGCTimer();
-                                        processAddCommand(uuid, rlvCmd);
+                                        processAddCommand(m_idCurObject, rlvCmd);
                                        notifyBehaviourObservers(rlvCmd, !fFromObj);
                                }
                        }
                        break;
                case RLV_TYPE_REMOVE:           // Checked:
                        {
-                                rlv_object_map_t::iterator itObj = m_Objects.find(uuid);
+                                rlv_object_map_t::iterator itObj = m_Objects.find(m_idCurObject);
                                if (itObj != m_Objects.end())
                                        fRet = itObj->second.removeCommand(rlvCmd);
@@ -481,13 +513,13 @@ BOOL RlvHandler::processCommand(const LLUUID& uuid, const std::string& strCmd, b
                                #endif // RLV_DEBUG
                                if (fRet) {     // Don't handle non-sensical removes
-                                        processRemoveCommand(uuid, rlvCmd);
+                                        processRemoveCommand(m_idCurObject, rlvCmd);
                                        notifyBehaviourObservers(rlvCmd, !fFromObj);
                                        if (0 == itObj->second.m_Commands.size())
                                        {
                                                #ifdef RLV_DEBUG
-                                                        RLV_INFOS << "\t- command list empty => removing " << uuid << LL_ENDL;
+                                                        RLV_INFOS << "\t- command list empty => removing " << m_idCurObject << LL_ENDL;
                                                #endif // RLV_DEBUG
                                                m_Objects.erase(itObj);
                                        }
@@ -495,14 +527,14 @@ BOOL RlvHandler::processCommand(const LLUUID& uuid, const std::string& strCmd, b
                        }
                        break;
                case RLV_TYPE_CLEAR:
-                        fRet = processClearCommand(uuid, rlvCmd);
+                        fRet = processClearCommand(m_idCurObject, rlvCmd);
                        notifyBehaviourObservers(rlvCmd, !fFromObj);
                        break;
                case RLV_TYPE_FORCE:            // Checked:
-                        fRet = processForceCommand(uuid, rlvCmd);
+                        fRet = processForceCommand(m_idCurObject, rlvCmd);
                        break;
                case RLV_TYPE_REPLY:            // Checked:
-                        fRet = processReplyCommand(uuid, rlvCmd);
+                        fRet = processReplyCommand(m_idCurObject, rlvCmd);
                        break;
                case RLV_TYPE_UNKNOWN:          // Checked:
                        break;
@@ -535,35 +567,15 @@ BOOL RlvHandler::processAddCommand(const LLUUID& uuid, const RlvCommand& rlvCmd)
                m_Behaviours[eBehaviour]++;
        }
+        bool fRefCount = false; // Unused for the moment
        switch (eBehaviour)
        {
-                case RLV_BHVR_DETACH:                           // @detach[:<option>]=n         - Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
+                case RLV_BHVR_DETACH:                           // @detach[:<option>]=n         - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                        {
+                        onAddRemDetach(uuid, rlvCmd, fRefCount);
-                                LLViewerObject* pObj = NULL; S32 idxAttachPt = 0;
+                        break;
-                                if (strOption.empty())                                                                                                  // @detach=n
+                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
-                                        // If the object rezzed before we received @detach=n from it then we can just do our thing here
+                        onAddRemAttach(uuid, rlvCmd, fRefCount);
-                                        // If the object hasn't rezzed yet then we need to wait until RlvHandler::onAttach()
-                                        // If @detach=n were possible for non-attachments another copy/paste would be needed in RlvHandler::onGC()
-                                        if ((pObj = gObjectList.findObject(uuid)) != NULL)
-                                                setDetachable(pObj, uuid, false);
-                                } 
-                                else if ((idxAttachPt = getAttachPointIndex(strOption, true)) != 0)             // @detach:<attachpt>=n
-                                {
-                                        setDetachable(idxAttachPt, uuid, false);
-                                        // (See below)
-                                        LLViewerJointAttachment* pAttachPt = getAttachPoint(strOption, true);
-                                        if (pAttachPt)
-                                                pObj = pAttachPt->getObject();
-                                }
-                                // When at least one HUD attachment is locked we want to make sure they're all visible (ie prevent hiding a blindfold HUD)
-                                // However, since @detach:<attachpt>=n might lock a HUD attachment point that doesn't currently have an object we
-                                // have to do this here *and* in RlvHandler::onAttach()
-                                if ( (pObj) && (pObj->isHUDAttachment()) )
-                                        LLPipeline::sShowHUDAttachments = TRUE;
-                        }
                        break;
                case RLV_BHVR_REDIRCHAT:                        // @redirchat:<option>=n        - Checked: 2009-07-07 (RLVa-1.0.0d)
                case RLV_BHVR_REDIREMOTE:                       // @rediremote:<option>=n       - Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.2a
@@ -797,25 +809,15 @@ BOOL RlvHandler::processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvC
                m_Behaviours[eBehaviour]--;
        }
+        bool fRefCount = false; // Unused for the moment
        switch (eBehaviour)
        {
-                case RLV_BHVR_DETACH:                           // @detach[:<option>]=y         - Checked: 2009-08-04 (RLVa-1.0.1d) | Modified: RLVa-1.0.1d
+                case RLV_BHVR_DETACH:                           // @detach[:<option>]=y         - Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                        {
+                        onAddRemDetach(uuid, rlvCmd, fRefCount);
-                                S32 idxAttachPt = 0;
+                        break;
-                                if (strOption.empty())                                                                                          // @detach=y
+                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
-                                        // The object may or may not (if it got detached) still exist
+                        onAddRemAttach(uuid, rlvCmd, fRefCount);
-                                        rlv_object_map_t::const_iterator itObj = m_Objects.find(uuid);
-                                        if (itObj != m_Objects.end())
-                                                idxAttachPt = itObj->second.m_idxAttachPt;
-                                        if (idxAttachPt)
-                                                setDetachable(idxAttachPt, uuid, true);
-                                }
-                                else if ((idxAttachPt = getAttachPointIndex(strOption, true)))          // @detach:<attachpt>=y
-                                {
-                                        setDetachable(idxAttachPt, uuid, true);
-                                }
-                        }
                        break;
                case RLV_BHVR_REDIRCHAT:                        // @redirchat:<option>=y        - Checked: 2009-07-07 (RLVa-1.0.0d)
                case RLV_BHVR_REDIREMOTE:                       // @rediremote:<option>=y       - Checked: 2009-07-07 (RLVa-1.0.0d) | Added: RLVa-0.2.2a
@@ -940,7 +942,7 @@ BOOL RlvHandler::processRemoveCommand(const LLUUID& uuid, const RlvCommand& rlvC
        return TRUE; // Remove commands don't fail, doesn't matter what we return here
 }
-BOOL RlvHandler::processClearCommand(const LLUUID& idObj, const RlvCommand& rlvCmd)
+BOOL RlvHandler::processClearCommand(const LLUUID idObj, const RlvCommand& rlvCmd)
 {
        const std::string& strFilter = rlvCmd.getParam(); std::string strCmdRem;
@@ -976,8 +978,11 @@ BOOL RlvHandler::processForceCommand(const LLUUID& idObj, const RlvCommand& rlvC
        switch (rlvCmd.getBehaviourType())
        {
-                case RLV_BHVR_DETACH:           // @detach[:<option>]=force             - Checked:
+                case RLV_BHVR_DETACH:           // @detach[:<option>]=force             - Checked: 2009-10-12 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
-                        onForceDetach(idObj, strOption);
+                        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);
@@ -1125,7 +1130,7 @@ BOOL RlvHandler::processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCm
                                #endif // RLV_EXPERIMENTAL_COMPOSITE_FOLDING
                        }
                        break;
-                case RLV_BHVR_GETATTACH:                // @getattach[:<layer>]=<channel>         - Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0d
+                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())
@@ -1155,9 +1160,9 @@ BOOL RlvHandler::processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCm
                                                {
                                                        bool fWorn = (pAttachment->getItemID().notNull()) && 
                                                                ( (!RlvSettings::getHideLockedAttach()) || 
-                                                                  ( (isDetachable(itAttach->first)) && (isStrippable(pAttachment->getItemID())) ) );
+                                                                  ( (!isLockedAttachmentExcept(itAttach->first, RLV_LOCK_REMOVE, gObjectList.findObject(uuid))) && 
+                                                                    (isStrippable(pAttachment->getItemID())) ) );
                                                        strReply.push_back( (fWorn) ? '1' : '0' );
-                                                        //strReply.push_back( (pAttachment->getItemID().notNull()) ? '1' : '0' );
                                                }
                                        #endif // RLV_EXPERIMENTAL_COMPOSITE_FOLDING
                                }
@@ -1327,7 +1332,7 @@ void RlvHandler::initLookupTables()
 }
 // Checked: 2009-08-11 (RLVa-1.0.1h) | Modified: RLVa-1.0.1h
-void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt, bool fFullyLoaded)
+void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt)
 {
        // Sanity check - LLVOAvatar::attachObject() should call us *after* calling LLViewerJointAttachment::addObject()
        LLViewerObject* pObj = pAttachPt->getObject();
@@ -1338,30 +1343,8 @@ void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt, bool fFullyLoaded)
                return;
        }
-        // Check if this attachment point has a pending "reattach-on-detach"
+        // Let the attachment manager know
-        rlv_reattach_map_t::iterator itReattach = m_AttachPending.find(idxAttachPt);
+        m_pAttachMgr->onAttach(pAttachPt);
-        if (itReattach != m_AttachPending.end())
-        {
-                if (itReattach->second == pAttachPt->getItemID())
-                {
-                        RLV_INFOS << "Reattached " << pAttachPt->getItemID().asString() << " to " << idxAttachPt << LL_ENDL;
-                        m_AttachPending.erase(itReattach);
-                }
-        }
-        else if ( (fFullyLoaded) && (!isDetachableExcept(idxAttachPt, pObj)) )
-        {
-                // We're fully loaded with no pending reattach on this attach point but it's "undetachable" -> force detach the new attachment
-                // Assertion: the only way the attachment point could be locked at this point is if some object locked it with @detach:attachpt=n
-                //   - previous attachments on this attachment point might have issued @detach=n but those were all cleaned up at detach
-                //   - the new attachment might have issued @detach=n but that won't actually lock down the attachment point until further down
-                // NOTE 1: "some object" may no longer exist if it was not an attachment and the GC hasn't cleaned it up yet (informative)
-                // NOTE 2: "some object" may refer to the new attachment - ie @detach:spine=n from object on spine (problematic, causes reattach)
-                //           -> solved by using isDetachableExcept(idxAttachPt, pObj) instead of isDetachable(idxAttachPt)
-                m_DetachPending.insert(std::pair<S32, LLUUID>(idxAttachPt, pObj->getID()));
-                rlvForceDetach(pAttachPt);
-        }
        // Check if we already have an RlvObject instance for this object (rezzed prim attached from in-world, or an attachment that rezzed in)
        rlv_object_map_t::iterator itObj = m_Objects.find(pObj->getID());
@@ -1378,7 +1361,7 @@ void RlvHandler::onAttach(LLViewerJointAttachment* pAttachPt, bool fFullyLoaded)
                if (itObj->second.hasBehaviour(RLV_BHVR_DETACH, false))
                {
                        // (Copy/paste from processAddCommand)
-                        setDetachable(idxAttachPt, pObj->getID(), false);
+                        addAttachmentLock(idxAttachPt, itObj->second.m_UUID, RLV_LOCK_REMOVE);
                        if (pObj->isHUDAttachment())
                                LLPipeline::sShowHUDAttachments = TRUE; // Prevents hiding of locked HUD attachments
@@ -1469,44 +1452,19 @@ void RlvHandler::onDetach(LLViewerJointAttachment* pAttachPt)
                //RLV_INFOS << "Clean up for '" << pDbgAttachmentPt->getName() << "'" << LL_ENDL;
        #endif // RLV_DEBUG
-        // If the attachment was locked then we should reattach it (unless we're already trying to reattach to this attachment point)
+        // Let the attachment manager know
-        // (unless we forcefully detached it else in which case we do not want to reattach it)
+        m_pAttachMgr->onDetach(pAttachPt);
-        rlv_reattach_map_t::iterator itDetach = m_DetachPending.find(idxAttachPt);
-        if (itDetach != m_DetachPending.end())
-        {
-                // RLVa-TODO: we should really be comparing item UUIDs but is it even possible to end up here and not have them match?
-                m_DetachPending.erase(itDetach);
-        }
-        else if ( (!isDetachable(idxAttachPt)) && (m_AttachPending.find(idxAttachPt) == m_AttachPending.end()) )
-        {
-                // In an ideal world we would simply set up an LLInventoryObserver but there's no specific "asset updated" changed flag *sighs*
-                // NOTE: attachments *always* know their "inventory item UUID" so we don't have to worry about fetched vs unfetched inventory
-                m_AttachPending.insert(std::pair<S32, LLUUID>(idxAttachPt, pAttachPt->getItemID()));
-        }
-        // We can't - easily - clean up child prims that never issued @detach=n but the GC will get those eventually
+        // Clean up any restriction this object (or one of its child prims) may have
-        rlv_detach_map_t::iterator itAttach = m_Attachments.find(idxAttachPt);
+        rlv_object_map_t::iterator itObj = m_Objects.begin(), itCurrent;
-        while ( (itAttach != m_Attachments.upper_bound(idxAttachPt)) && (itAttach != m_Attachments.end()) )
+        while (itObj != m_Objects.end())
        {
-                LLViewerObject* pTempObj = gObjectList.findObject(itAttach->second);
+                itCurrent = itObj++; // @clear will invalidate our iterator so point it ahead now
-                if ( (pTempObj) && (pTempObj->getRootEdit()->getID() == pObj->getID()) )
-                {
-                        // Iterator points to the object (or to a child prim) so issue a clear on behalf of the object (there's the 
-                        // possibility of going into an eternal loop, but that's ok since it indicates a bug in @clear that needs fixing)
-                        processCommand(itAttach->second, "clear", true);
-                        itAttach = m_Attachments.find(idxAttachPt); // @clear will invalidate all iterators so we have to start anew
+                // NOTE: ObjectKill seems to happen in reverse (child prims are killed before the root is) so we can't use gObjectList here
-                }
+                if (itCurrent->second.m_idxAttachPt == idxAttachPt)
-                else
+                        processCommand(itCurrent->second.m_UUID, "clear", true);
-                {
-                        itAttach++;
-                }
        }
-        // Clean up in case there was never a @detach=n (only works for the root prim - see above)
-        rlv_object_map_t::iterator itObj = m_Objects.find(pObj->getID());
-        if (itObj != m_Objects.end())
-                processCommand(itObj->second.m_UUID, "clear", true);
 }
 // Checked: 2009-07-30 (RLVa-1.0.1c) | Modified: RLVa-1.0.1c
@@ -1548,32 +1506,6 @@ bool RlvHandler::onGC()
        return (0 != m_Objects.size()); // GC will kill itself if it has nothing to do
 }
-// Checked: 2009-08-08 (RLVa-1.0.1g) | Modified: RLVa-1.0.1g
-void RlvHandler::onSavedAssetIntoInventory(const LLUUID& idItem)
-{
-        for (rlv_reattach_map_t::iterator itAttach = m_AttachPending.begin(); itAttach != m_AttachPending.end(); ++itAttach)
-        {
-                if (idItem == itAttach->second)
-                {
-                        RLV_INFOS << "Reattaching " << idItem.asString() << " to " << itAttach->first << LL_ENDL;
-                        #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
-                                LLAttachmentRezAction* rez_action = new LLAttachmentRezAction;
-                                rez_action->mItemID = itAttach->second;
-                                rez_action->mAttachPt = itAttach->first;
-                                confirm_replace_attachment_rez(0/*YES*/, (void*)rez_action); // (Will call delete on rez_action)
-                        #else                                                                                           // Version: 1.23.4
-                                LLSD payload;
-                                payload["item_id"] = itAttach->second;
-                                payload["attachment_point"] = itAttach->first;
-                                LLNotifications::instance().forceResponse(LLNotification::Params("ReplaceAttachment").payload(payload), 0/*YES*/);
-                        #endif
-                }
-        }
-}
 // ============================================================================
 // String/chat censoring functions
 //
@@ -2099,47 +2031,6 @@ std::string RlvHandler::getSharedPath(const LLViewerInventoryCategory* pFolder)
 //
 // Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0d
-void RlvHandler::onForceDetach(const LLUUID& idObj, const std::string& strOption) const
-{
-        U16 nParam;
-        if (strOption.empty())
-        {
-                // Simulate right-click / Take Off > Detach All
-                LLAgent::userRemoveAllAttachments(NULL);
-        }
-        else if (m_AttachLookup.getExactMatchParam(strOption, nParam))
-        {
-                // Simulate right-click / Take Off > Detach > ...
-                LLVOAvatar* pAvatar; LLViewerJointAttachment* pAttachmentPt;
-                if ( ((pAvatar = gAgent.getAvatarObject()) != NULL) &&  // Make sure we're actually wearing something on the attachment point
-                         ((pAttachmentPt = get_if_there(pAvatar->mAttachmentPoints, (S32)nParam, (LLViewerJointAttachment*)NULL)) != NULL) &&
-                         (isStrippable(pAttachmentPt->getItemID())) )           // ... and that it's not marked as "nostrip"
-                {
-                        #ifdef RLV_EXPERIMENTAL_COMPOSITES
-                                // If we're stripping something that's part of a composite folder then we should @detachthis instead
-                                if (isCompositeDescendent(pAttachmentPt->getItemID()))
-                                {
-                                        std::string strCmd = "detachthis:" + strOption + "=force";
-                                        #ifdef RLV_DEBUG
-                                                RLV_INFOS << "\t- '" << strOption << "' belongs to composite folder: @" << strCmd << LL_ENDL;
-                                        #endif // RLV_DEBUG
-                                        processForceCommand(idObj, RlvCommand(strCmd));
-                                }
-                                else
-                        #endif // RLV_EXPERIMENTAL_COMPOSITES
-                                {
-                                        handle_detach_from_avatar(pAttachmentPt);
-                                }
-                }
-        }
-        else
-        {
-                // Force detach single folder
-                onForceWear(strOption, false, false);
-        }
-}
-// Checked: 2009-07-12 (RLVa-1.0.0h) | Modified: RLVa-0.2.0d
 void RlvHandler::onForceRemOutfit(const LLUUID& idObj, const std::string& strOption) const
 {
        EWearableType typeOption = LLWearable::typeNameToType(strOption), type;
@@ -2209,6 +2100,7 @@ bool RlvHandler::onForceSit(const LLUUID& idObj, const std::string& strOption) c
        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
@@ -2281,22 +2173,11 @@ void RlvHandler::onForceWear(const std::string& strPath, bool fAttach, bool fMat
                                                                // Simulate wearing an object to a specific attachment point (copy/paste to suppress replacement dialog)
                                                                // LLAttachObject::handleEvent() => rez_attachment()
                                                                LLViewerJointAttachment* pAttachPt = getAttachPoint(pItem, true);
-                                                                if ( (pAttachPt) && (isDetachable(pAttachPt)) )
+                                                                if ( (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
                                                                {
-                                                                        #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
+                                                                        RlvAttachmentManager::forceAttach(pItem->getUUID(), getAttachPointIndex(pAttachPt->getName(), true));
-                                                                                LLAttachmentRezAction* rez_action = new LLAttachmentRezAction;
-                                                                                rez_action->mItemID = pItem->getUUID();
-                                                                                rez_action->mAttachPt = getAttachPointIndex(pAttachPt->getName(), true);
-                                                                                confirm_replace_attachment_rez(0/*YES*/, (void*)rez_action); // (Will call delete on rez_action)
-                                                                        #else                                                                                           // Version: 1.23.4
-                                                                                LLSD payload;
-                                                                                payload["item_id"] = pItem->getUUID();
-                                                                                payload["attachment_point"] = getAttachPointIndex(pAttachPt->getName(), true);
-                                                                                LLNotifications::instance().forceResponse(
-                                                                                        LLNotification::Params("ReplaceAttachment").payload(payload), 0/*YES*/);
-                                                                        #endif
                                                                }
                                                        }
                                                        else
@@ -2504,6 +2385,7 @@ BOOL RlvHandler::setEnabled(BOOL fEnable)
                        RlvSettings::fShowNameTags = gSavedSettings.getBOOL(RLV_SETTING_SHOWNAMETAGS);
                RlvCommand::initLookupTable();
+                gRlvHandler.m_pAttachMgr = new RlvAttachmentManager();
                gRlvHandler.addObserver(new RlvExtGetSet());
                if (LLStartUp::getStartupState() >= STATE_CLEANUP)
@@ -2553,7 +2435,7 @@ void RlvHandler::clearState()
        while (m_Objects.size())
        {
                idObj = m_Objects.begin()->first; // Need a copy since after @clear the data it points to will no longer exist
-                fDetachable = ((pObj = gObjectList.findObject(idObj)) != NULL) ? isDetachable(pObj) : true;
+                fDetachable = ((pObj = gObjectList.findObject(idObj)) != NULL) ? isLockedAttachment(pObj, RLV_LOCK_REMOVE) : true;
                processCommand(idObj, "clear", false);
                if (!fDetachable)
@@ -2561,32 +2443,165 @@ void RlvHandler::clearState()
        }
        // Sanity check - these should all be empty after we issue @clear on the last object
-        if ( (!m_Objects.empty()) || !(m_Exceptions.empty()) || (!m_Attachments.empty()) )
+        if ( (!m_Objects.empty()) || !(m_Exceptions.empty()) || (!m_AttachAdd.empty()) || (!m_AttachRem.empty()) )
        {
                RLV_ERRS << "Object, exception or attachment map not empty after clearing state!" << LL_ENDL;
                m_Objects.clear();
                m_Exceptions.clear();
-                m_Attachments.clear();
+                m_AttachAdd.clear();
+                m_AttachRem.clear();
        }
        // These all need manual clearing
        memset(m_LayersAdd, 0, sizeof(S16) * WT_COUNT);
        memset(m_LayersRem, 0, sizeof(S16) * WT_COUNT);
        memset(m_Behaviours, 0, sizeof(S16) * RLV_BHVR_COUNT);
-        m_AttachPending.clear();
+        m_Retained.clear();
        m_Emitter.clearObservers(); // <- calls delete on all active observers
        // Clear dynamically allocated memory
-        if (m_pGCTimer)
+        delete m_pGCTimer;
+        m_pGCTimer = NULL;
+        delete m_pWLSnapshot;
+        m_pWLSnapshot = NULL;
+        delete m_pAttachMgr;
+        m_pAttachMgr = NULL;
+}
+// ============================================================================
+// Command handlers (RLV_TYPE_ADD and RLV_TYPE_REMOVE)
+//
+// Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
+ERlvCmdRet RlvHandler::onAddRemAttach(const LLUUID& idObj, const RlvCommand& rlvCmd, bool& fRefCount)
+{
+        // Sanity check - if there's an option it should specify a valid attachment point name
+        S32 idxAttachPt = getAttachPointIndex(rlvCmd.getOption(), true);
+        if ( (!idxAttachPt) && (!rlvCmd.getOption().empty())  )
+                return RLV_RET_FAILED_OPTION;
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        if (!pAvatar)
+                return RLV_RET_FAILED;
+        ERlvLockMask eLock = (RLV_BHVR_REMATTACH == rlvCmd.getBehaviourType()) ? RLV_LOCK_REMOVE : RLV_LOCK_ADD;
+        for (LLVOAvatar::attachment_map_t::const_iterator itAttach = pAvatar->mAttachmentPoints.begin(); 
+                        itAttach != pAvatar->mAttachmentPoints.end(); ++itAttach)
        {
-                delete m_pGCTimer;
+                if ( (0 == idxAttachPt) || (itAttach->first == idxAttachPt) )
-                m_pGCTimer = NULL;
+                {
+                        if (RLV_TYPE_ADD == rlvCmd.getParamType())
+                                addAttachmentLock(itAttach->first, idObj, eLock);
+                        else
+                                removeAttachmentLock(itAttach->first, idObj, eLock);
+                }
        }
-        if (m_pWLSnapshot)
+        // Refresh HUD visibility if needed
+        if ( (RLV_BHVR_REMATTACH == rlvCmd.getBehaviourType()) && (hasLockedHUD()) )
+                LLPipeline::sShowHUDAttachments = TRUE;
+        fRefCount = rlvCmd.getOption().empty(); // Only reference count global locks
+        return RLV_RET_NOERROR;
+}
+// Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
+ERlvCmdRet RlvHandler::onAddRemDetach(const LLUUID& idObj, const RlvCommand& rlvCmd, bool& fRefCount)
+{
+        S32 idxAttachPt = 0;
+        if (rlvCmd.getOption().empty()) // @detach=n|y
        {
-                delete m_pWLSnapshot;
+                // The object may or may not exist (it may not have rezzed yet, or it may have already been killed):
-                m_pWLSnapshot = NULL;
+                //   * @detach=n: - if it has rezzed then we'll already have its attachment point 
+                //                - if it hasn't rezzed yet then it's a @detach=n from a non-attachment and RlvHandler::onAttach() takes care of it
+                //   * @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())
+                        idxAttachPt = itObj->second.m_idxAttachPt;
+        }
+        else                                                    // @detach:<attachpt>=n|y
+        {
+                idxAttachPt = getAttachPointIndex(rlvCmd.getOption(), true);
+        }
+        // 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;
+        // 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);
+        if (RLV_TYPE_ADD == rlvCmd.getParamType())
+                addAttachmentLock(idxAttachPt, idObj, eLock);
+        else
+                removeAttachmentLock(idxAttachPt, idObj, eLock);
+        // Refresh HUD visibility if needed
+        if ( (RLV_TYPE_ADD == rlvCmd.getParamType()) && (hasLockedHUD()) )
+                LLPipeline::sShowHUDAttachments = TRUE;
+        fRefCount = false;      // Don't reference count @detach[:<option>]=n
+        return RLV_RET_NOERROR;
+}
+// ============================================================================
+// 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
+{
+        // TODO-RLVA: this still needs a rewrite to conform to the new event handler system
+        if ( (rlvCmd.getOption().empty()) || (getAttachPointIndex(rlvCmd.getOption(), true)) )
+        {
+                onForceRemAttach(idObj, rlvCmd);
+        }
+        else
+        {
+                // Force detach single folder
+                onForceWear(rlvCmd.getOption(), false, false);
+        }
+        return RLV_RET_NOERROR;
+}
+// Checked: 2009-10-12 (RLVa-1.0.5b) | Added: RLVa-1.0.5b
+ERlvCmdRet RlvHandler::onForceRemAttach(const LLUUID& idObj, const RlvCommand& rlvCmd) const
+{
+        S32 idxAttachPt = 0;
+        if (rlvCmd.getOption().empty())
+        {
+                // Simulate right-click / Take Off > Detach All
+                LLAgent::userRemoveAllAttachments(NULL);
+                return RLV_RET_NOERROR;
+        }
+        else if ((idxAttachPt = getAttachPointIndex(rlvCmd.getOption(), true)) != 0)
+        {
+                // 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"
+                {
+                        #ifdef RLV_EXPERIMENTAL_COMPOSITES
+                                // If we're stripping something that's part of a composite folder then we should @detachthis instead
+                                if (isCompositeDescendent(pAttachmentPt->getItemID()))
+                                {
+                                        std::string strCmd = "detachthis:" + strOption + "=force";
+                                        #ifdef RLV_DEBUG
+                                                RLV_INFOS << "\t- '" << strOption << "' belongs to composite folder: @" << strCmd << LL_ENDL;
+                                        #endif // RLV_DEBUG
+                                        processForceCommand(idObj, RlvCommand(strCmd));
+                                }
+                                else
+                        #endif // RLV_EXPERIMENTAL_COMPOSITES
+                                {
+                                        handle_detach_from_avatar(pAttachmentPt);
+                                }
+                }
+                return RLV_RET_NOERROR;
        }
+        return RLV_RET_FAILED_OPTION;
 }
 // ============================================================================
diff --git a/linden/indra/newview/rlvhandler.h b/linden/indra/newview/rlvhandler.h
index 5295a72..6821149 100644
--- a/linden/indra/newview/rlvhandler.h
+++ b/linden/indra/newview/rlvhandler.h
@@ -16,9 +16,8 @@
 // ============================================================================
 typedef std::map<LLUUID, RlvObject> rlv_object_map_t;
-typedef std::multimap<S32, LLUUID> rlv_detach_map_t;
-typedef std::map<S32, LLUUID> rlv_reattach_map_t;
 typedef std::multimap<ERlvBehaviour, RlvException> rlv_exception_map_t;
+typedef std::map<S32, LLUUID> rlv_attachlock_map_t;
 class RlvHandler
 {
@@ -47,7 +46,9 @@ public:
        /*
         * Rule checking functions
         */
-        // NOTE: - to check @detach=n    -> hasLockedAttachment() / hasLockedHUD() / isDetachable()
+        // NOTE: - to check @detach=n    -> hasLockedAttachment(RLV_LOCK_REMOVE) / hasLockedHUD() / isLockedAttachment(.., RLV_LOCK_REMOVE)
+        //       - to check @addattach=n -> hasLockedAttachment(RLV_LOCK_ADD) / isLockedAttachment(.., RLV_LOCK_ADD)
+        //       - to check @remattach=n -> (see @detach=n)
        //       - to check exceptions   -> isException()
        //       - to check @addoutfit=n -> isWearable()
        //       - to check @remoutfit=n -> isRemovable()
@@ -59,20 +60,21 @@ public:
        bool hasBehaviourExcept(ERlvBehaviour eBehaviour, const LLUUID& idObj) const;
        bool hasBehaviourExcept(ERlvBehaviour eBehaviour, const std::string& strOption, const LLUUID& idObj) const;
-        // Returns TRUE if there is at least 1 non-detachable attachment
+        // Adds an eLock type lock (held by idRlvObj) for the specified attachment point
-        bool hasLockedAttachment() const { return (0 != m_Attachments.size()); }
+        void addAttachmentLock(S32 idxAttachPt, const LLUUID& idRlvObj, ERlvLockMask eLock);
+        // 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
        bool hasLockedHUD() const;
-        // Returns TRUE if the specified attachment point is detachable
+        // Returns TRUE if the specified attachment point is eLock type locked (RLV_LOCK_ANY = RLV_LOCK_ADD *or* RLV_LOCK_REMOVE)
-        bool isDetachable(S32 idxAttachPt) const { return (idxAttachPt) && (m_Attachments.find(idxAttachPt) == m_Attachments.end()); }
+        bool isLockedAttachment(S32 idxAttachPt, ERlvLockMask eLock) const;
-        bool isDetachable(const LLInventoryItem* pItem) const;
+        bool isLockedAttachment(const LLInventoryItem* pItem, ERlvLockMask eLock) const;
-        bool isDetachable(LLViewerJointAttachment* pAttachPt) const;
+        bool isLockedAttachment(LLViewerJointAttachment* pAttachPt, ERlvLockMask eLock) const;
-        bool isDetachable(LLViewerObject* pObj) const;
+        bool isLockedAttachment(LLViewerObject* pObj, ERlvLockMask eLock) const;
-        // Returns TRUE if the specified attachment point is set non-detachable by anything other than pObj (or one of its children)
+        // Returns TRUE if the specified attachment point is eLock type locked by anything other than pObj (or one of its children)
-        bool isDetachableExcept(S32 idxAttachPt, LLViewerObject* pObj) const;
+        bool isLockedAttachmentExcept(S32 idxAttachPt, ERlvLockMask eLock, LLViewerObject* pObj) const;
-        // Marks the specified attachment point as (non-)detachable (return value indicates success ; used by unit tests)
+        // Adds an eLock type lock (held by idRlvObj) for the specified attachment point
-        bool setDetachable(S32 idxAttachPt, const LLUUID& idRlvObj, bool fDetachable);
+        void removeAttachmentLock(S32 idxAttachPt, const LLUUID& idRlovObj, ERlvLockMask eLock);
-        bool setDetachable(LLViewerObject* pObj, const LLUUID& idRlvObj, bool fDetachable);
        // Adds or removes an exception for the specified behaviour
        void addException(const LLUUID& idObj, ERlvBehaviour eBhvr, const RlvExceptionOption& varOption);
@@ -183,19 +185,28 @@ public:
        void notifyBehaviourObservers(const RlvCommand& rlvCmd, bool fInternal);
        // Externally invoked event handlers
-        void onAttach(LLViewerJointAttachment* pAttachPt, bool fFullyLoaded);   // LLVOAvatar::attachObject()
+        void onAttach(LLViewerJointAttachment* pAttachPt);                                              // LLVOAvatar::attachObject()
        void onDetach(LLViewerJointAttachment* pAttachPt);                                              // LLVOAvatar::detachObject()
        bool onGC();                                                                                                                    // RlvGCTimer::tick()
-        void onSavedAssetIntoInventory(const LLUUID& idItem);                                   // LLInventoryModel::processSaveAssetIntoInventory()
+        void onSavedAssetIntoInventory(const LLUUID& idItem) { if (m_pAttachMgr) m_pAttachMgr->onSavedAssetIntoInventory(idItem); }
+        void onWearAttachment(const LLUUID& idItem)                      { if (m_pAttachMgr) m_pAttachMgr->onWearAttachment(idItem); }
 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 processClearCommand(const LLUUID idObj, const RlvCommand& rlvCmd);
        BOOL processReplyCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const;
        BOOL processForceCommand(const LLUUID& uuid, const RlvCommand& rlvCmd) const;
        // Command handlers (exist for no other reason than to keep the length of the processXXX functions down)
-        void onForceDetach(const LLUUID& idObj, const std::string& strOption) const;
+        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 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;
@@ -221,29 +232,29 @@ public:
        static const std::string cstrMsgTpLure;                 // Message sent to tplure sender when tplure restricted
        static const std::string cstrAnonyms[28];
 protected:
-        rlv_object_map_t     m_Objects;                                 // Map of objects that have active restrictions (by UUID)
+        rlv_object_map_t      m_Objects;                                // Map of objects that have active restrictions (idObj -> RlvObject)
-        rlv_exception_map_t  m_Exceptions;              // Map of UUIDs that are exempt from the associated ERlvBehaviour
+        rlv_exception_map_t   m_Exceptions;                             // Map of currently active restriction exceptions (ERlvBehaviour -> RlvException)
-        rlv_detach_map_t     m_Attachments;                             // Map of locked attachments (attachment point index -> object that issued @detach=n)
+        rlv_attachlock_map_t  m_AttachAdd;                              // Map of attachment points that can't be attached (idxAttachPt -> idObj)
-        S16                  m_LayersAdd[WT_COUNT];             // Array of locked layers (reference counted)
+        rlv_attachlock_map_t  m_AttachRem;                              // Map of attachment points that can't be detached (idxAttachPt -> idObj)
-        S16                  m_LayersRem[WT_COUNT];             // Array of locked layers (reference counted)
+        S16                   m_LayersAdd[WT_COUNT];    // Array of layers that can't be worn (reference counted)
-        S16                  m_Behaviours[RLV_BHVR_COUNT];
+        S16                   m_LayersRem[WT_COUNT];    // Array of layers that can't be removed (reference counted)
+        S16                   m_Behaviours[RLV_BHVR_COUNT];
-        rlv_retained_list_t  m_Retained;
-        rlv_reattach_map_t   m_AttachPending;
+        rlv_retained_list_t   m_Retained;
-        rlv_reattach_map_t   m_DetachPending;
+        RlvGCTimer*           m_pGCTimer;
-        RlvGCTimer*          m_pGCTimer;
+        RlvWLSnapshot*        m_pWLSnapshot;
-        RlvWLSnapshot*       m_pWLSnapshot;
+        RlvAttachmentManager* m_pAttachMgr;
-        RlvCommand*          m_pCurCommand;                             // Convenience (see @tpto)
+        RlvCommand*           m_pCurCommand;                    // Convenience (see @tpto)
-        LLUUID               m_idCurObject;                             // Convenience (see @tpto)
+        LLUUID                m_idCurObject;                    // Convenience (see @tpto)
        mutable RlvEventEmitter<RlvObserver>     m_Emitter;
        mutable std::list<RlvBehaviourObserver*> m_BhvrObservers;
        RlvBehaviourNotifyObserver*                              m_pBhvrNotify;
-        static BOOL                     m_fEnabled;                                     // Use setEnabled() to toggle this
+        static BOOL                       m_fEnabled;                           // Use setEnabled() to toggle this
-        static BOOL                     m_fFetchStarted;                        // TRUE if we fired off an inventory fetch
+        static BOOL                       m_fFetchStarted;                      // TRUE if we fired off an inventory fetch
-        static BOOL                     m_fFetchComplete;                       // TRUE if everything was fetched
+        static BOOL                       m_fFetchComplete;                     // TRUE if everything was fetched
        static RlvMultiStringSearch m_AttachLookup;             // Lookup table for attachment names (lower case)
        bool m_fCanCancelTp;
@@ -258,8 +269,8 @@ protected:
         */
 public:
        const rlv_object_map_t*    getObjectMap() const         { return &m_Objects; }
-        const rlv_exception_map_t* getExceptionMap() const      { return &m_Exceptions; }
+        //const rlv_exception_map_t* getExceptionMap() const    { return &m_Exceptions; }
-        const rlv_detach_map_t*    getDetachMap() const         { return &m_Attachments; }
+        //const rlv_detach_map_t*    getDetachMap() const               { return &m_Attachments; }
        #ifdef RLV_DEBUG_TESTS
                const S16*                 getAddLayers() const         { return m_LayersAdd; }
                const S16*                 getRemLayers() const         { return m_LayersRem; }
@@ -345,6 +356,13 @@ inline bool RlvHandler::hasBehaviourExcept(ERlvBehaviour eBehaviour, const LLUUI
        return hasBehaviourExcept(eBehaviour, std::string(), idObj);
 }
+// Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
+inline bool RlvHandler::hasLockedAttachment(ERlvLockMask eLock) const
+{
+        // Remove locks are more common so check those first
+        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
@@ -359,20 +377,6 @@ inline bool RlvHandler::hasBehaviourExcept(ERlvBehaviour eBehaviour, const LLUUI
        }
 #endif // RLV_EXPERIMENTAL_COMPOSITES
-// Checked: 2009-09-08 (RLVa-1.0.2c) | Added: RLVa-1.0.2c
-inline bool RlvHandler::isDetachable(LLViewerJointAttachment *pAttachPt) const
-{
-        // If there's an attached object it's faster to just use that; otherwise look up the attachment index because it might be locked empty
-        return (pAttachPt == NULL) ||
-                   ( (pAttachPt->getObject() != NULL) && isDetachable(pAttachPt->getObject()) ) || (isDetachable(getAttachPointIndex(pAttachPt)));
-}
-// Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
-inline bool RlvHandler::isDetachable(LLViewerObject* pObj) const
-{
-        return (pObj == NULL) || (!pObj->isAttachment()) || (isDetachable(getAttachPointIndex(pObj)));
-}
 inline bool RlvHandler::isPermissive(ERlvBehaviour eBhvr) const
 {
        return (RlvCommand::hasStrictVariant(eBhvr)) 
@@ -395,6 +399,29 @@ inline bool RlvHandler::isFoldedFolder(const LLInventoryCategory* pFolder, bool
          );
 }
+// Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
+inline bool RlvHandler::isLockedAttachment(S32 idxAttachPt, ERlvLockMask eLock) const
+{
+        return ( (eLock & RLV_LOCK_REMOVE) && (m_AttachRem.find(idxAttachPt) != m_AttachRem.end()) ) ||
+                   ( (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(LLViewerJointAttachment *pAttachPt, ERlvLockMask eLock) const
+{
+        // If there's an attached object it's faster to just use that; otherwise look up the attachment index because it might be locked empty
+        return (pAttachPt != NULL) && 
+                   ( ( (pAttachPt->getObject() != NULL) && (isLockedAttachment(pAttachPt->getObject(), eLock)) ) || 
+                     (isLockedAttachment(getAttachPointIndex(pAttachPt), eLock)) );
+}
+// Checked: 2009-10-10 (RLVa-1.0.5a) | Added: RLVa-1.0.5a
+inline bool RlvHandler::isLockedAttachment(LLViewerObject* pObj, ERlvLockMask eLock) const
+{
+        return (pObj != NULL) && (pObj->isAttachment()) && (isLockedAttachment(getAttachPointIndex(pObj), eLock));
+}
 // Checked: 2009-05-23 (RLVa-0.2.0d) | Added: RLVa-0.2.0d
 inline bool RlvHandler::isRemovableExcept(EWearableType type, const LLUUID& idObj) const
 {
@@ -434,12 +461,6 @@ inline void RlvHandler::retainCommand(const std::string& strObj, const LLUUID& i
        m_Retained.push_back(RlvRetainedCommand(strObj, idObj, strCmd));
 }
-// Checked: 2009-05-23 (RLVa-0.2.0d) | Modified: RLVa-0.2.0d
-inline bool RlvHandler::setDetachable(LLViewerObject* pObj, const LLUUID& idRlvObj, bool fDetachable)
-{
-        return setDetachable(getAttachPointIndex(pObj), idRlvObj, fDetachable); // getAttachPointIndex() has a NULL pointer check
-}
 // ============================================================================
 #endif // RLV_HANDLER_H
diff --git a/linden/indra/newview/rlvhelper.cpp b/linden/indra/newview/rlvhelper.cpp
index c8d430d..67ffbe2 100644
--- a/linden/indra/newview/rlvhelper.cpp
+++ b/linden/indra/newview/rlvhelper.cpp
@@ -1,6 +1,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llagent.h"
 #include "llfloaterwindlight.h"
+#include "llinventoryview.h"
 #include "llviewerobject.h"
 #include "llviewerstats.h"
 #include "llviewerwindow.h"
@@ -11,6 +12,12 @@
 #include "rlvevent.h"
 #include "rlvhandler.h"
+// Only defined in llinventorybridge.cpp
+#if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
+        #include "llinventorybridge.h"
+        void confirm_replace_attachment_rez(S32 option, void* user_data);
+#endif
 // ============================================================================
 // Static variable initialization
 //
@@ -104,12 +111,13 @@ void RlvCommand::initLookupTable()
                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",
+                                "sendim", "recvchat", "recvemote", "recvim", "tplm", "tploc", "tplure", "sittp", "edit", "rez",
-                                "remoutfit", "getoutfit", "getattach", "showinv", "viewnote", "unsit", "sit", "sendchannel", "getstatus", "getstatusall",
+                                "addoutfit", "remoutfit", "getoutfit", "addattach", "remattach", "getattach", "showinv", "viewnote", "unsit", "sit", 
-                                "getinv", "getinvworn", "findfolder", "findfolders", "attach", "attachall", "detachall", "getpath", "attachthis",
+                                "sendchannel", "getstatus", "getstatusall", "getinv", "getinvworn", "findfolder", "findfolders", 
-                                "attachallthis", "detachthis", "detachallthis", "fartouch", "showworldmap", "showminimap", "showloc", "tpto", "accepttp",
+                                "attach", "attachall", "detachall", "getpath", "attachthis", "attachallthis", "detachthis", "detachallthis", 
-                                "acceptpermission", "shownames", "fly", "getsitid", "setdebug", "setenv", "detachme", "showhovertextall", 
+                                "fartouch", "showworldmap", "showminimap", "showloc", "tpto", "accepttp", "acceptpermission", "shownames", "fly", 
-                                "showhovertextworld", "showhovertexthud", "showhovertext", "notify", "defaultwear", "versionnum", "permissive"
+                                "getsitid", "setdebug", "setenv", "detachme", "showhovertextall",  "showhovertextworld", "showhovertexthud", 
+                                "showhovertext", "notify", "defaultwear", "versionnum", "permissive", "viewscript", "viewtexture"
                        };
                for (int idxBvhr = 0; idxBvhr < RLV_BHVR_COUNT; idxBvhr++)
@@ -207,6 +215,204 @@ std::string RlvObject::getStatusString(const std::string& strMatch) const
 }
 // ============================================================================
+// RlvAttachmentManager
+//
+// Checked: 2009-10-12 (RLVa-1.0.5b) | Modified: RLVa-1.0.5b
+void RlvAttachmentManager::forceAttach(const LLUUID& idItem, S32 idxAttachPt)
+{
+        #if RLV_TARGET < RLV_MAKE_TARGET(1, 23, 0)                      // Version: 1.22.11
+                LLAttachmentRezAction* rez_action = new LLAttachmentRezAction();
+                rez_action->mItemID = idItem;
+                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"] = idItem;
+                payload["attachment_point"] = idxAttachPt;
+                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)
+{
+        // Copy/paste from handle_detach_from_avatar()
+        LLViewerObject* attached_object = pAttachPt->getObject();
+        if (attached_object)
+        {
+                gMessageSystem->newMessage("ObjectDetach");
+                gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+                gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+                gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+                gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
+                gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, attached_object->getLocalID());
+                gMessageSystem->sendReliable( gAgent.getRegionHost() );
+        }
+}
+// Checked: 2009-10-12 (RLVa-1.0.5b) | Modified: RLVa-1.0.5b
+void RlvAttachmentManager::onAttach(LLViewerJointAttachment* pAttachPt)
+{
+        S32 idxAttachPt = gRlvHandler.getAttachPointIndex(pAttachPt->getObject());
+        if (!idxAttachPt)
+                return;
+        // If the attachment point has a pending "reattach" then we don't want to do anything
+        rlv_attach_map_t::iterator itAttach = m_PendingAttach.find(idxAttachPt);
+        if (itAttach != m_PendingAttach.end())
+        {
+                if (pAttachPt->getItemID() == itAttach->second.idItem)
+                        m_PendingAttach.erase(itAttach);
+                return;
+        }
+        // Check if the attach is the result of a user action (="Wear")
+        rlv_wear_map_t::iterator itWear = m_PendingWear.find(pAttachPt->getItemID());
+        if (itWear != m_PendingWear.end())
+        {
+                // We need to return the attachment point to its previous state if it's non-attachable
+                if (gRlvHandler.isLockedAttachment(idxAttachPt, RLV_LOCK_ADD))
+                {
+                        // Get the state of the attachment point at the time the user picked "Wear" (if we don't have one it wasn't "add locked" then)
+                        std::map<S32, LLUUID>::iterator itAttachPrev = itWear->second.attachPts.find(idxAttachPt);
+                        if ( (itAttachPrev != itWear->second.attachPts.end()) && (pAttachPt->getItemID() != itAttachPrev->second) )
+                        {
+                                // 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);
+                                        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)
+                                {
+                                        m_PendingAttach.insert(std::pair<S32, RlvReattachInfo>(idxAttachPt, RlvReattachInfo(itAttachPrev->second)));
+                                }
+                        }
+                }
+                m_PendingWear.erase(itWear); // No need to start the timer since it should be running already if '!m_PendingWear.empty()'
+        }
+}
+// Checked: 2009-10-12 (RLVa-1.0.5b) | Modified: RLVa-1.0.5b
+void RlvAttachmentManager::onDetach(LLViewerJointAttachment* pAttachPt)
+{
+        S32 idxAttachPt = gRlvHandler.getAttachPointIndex(pAttachPt->getObject());
+        if (!idxAttachPt)
+                return;
+        // If this is an attachment that we force-detached then we don't want to do anything (even if it is "remove locked")
+        rlv_detach_map_t::iterator itDetach = m_PendingDetach.find(idxAttachPt);
+        if ( (itDetach != m_PendingDetach.end()) && (itDetach->second == pAttachPt->getItemID()) )
+        {
+                m_PendingDetach.erase(itDetach);
+                return;
+        }
+        // If the attachment is currently "remove locked" and we're not already trying to reattach something there we should reattach it
+        if ( (m_PendingAttach.find(idxAttachPt) == m_PendingAttach.end()) && (gRlvHandler.isLockedAttachment(idxAttachPt, RLV_LOCK_REMOVE)) )
+        {
+                m_PendingAttach.insert(std::pair<S32, RlvReattachInfo>(idxAttachPt, RlvReattachInfo(pAttachPt->getItemID())));
+                startTimer();
+        }
+}
+// Checked: 2009-10-12 (RLVa-1.0.5b) | Modified: RLVa-1.0.5b
+void RlvAttachmentManager::onSavedAssetIntoInventory(const LLUUID& idItem)
+{
+        for (rlv_attach_map_t::iterator itAttach = m_PendingAttach.begin(); itAttach != m_PendingAttach.end(); ++itAttach)
+        {
+                if ( (!itAttach->second.fAssetSaved) && (idItem == itAttach->second.idItem) )
+                {
+                        forceAttach(itAttach->second.idItem, itAttach->first);
+                        itAttach->second.tsAttach = LLFrameTimer::getElapsedSeconds();
+                }
+        }
+}
+// Checked: 2009-10-12 (RLVa-1.0.5b) | Modified: RLVa-1.0.5b
+BOOL RlvAttachmentManager::onTimer()
+{
+        F64 tsCurrent = LLFrameTimer::getElapsedSeconds();
+        // Garbage collect (failed) wear requests older than 60 seconds
+        rlv_wear_map_t::iterator itWear = m_PendingWear.begin();
+        while (itWear != m_PendingWear.end())
+        {
+                if (itWear->second.tsWear + 60 < tsCurrent)
+                        m_PendingWear.erase(itWear++);
+                else
+                        ++itWear;
+        }
+        // Walk over the pending reattach list
+        rlv_attach_map_t::iterator itAttach = m_PendingAttach.begin();
+        while (itAttach != m_PendingAttach.end())
+        {
+                // Sanity check - make sure the item is still in the user's inventory
+                if (gInventory.getItem(itAttach->second.idItem) == NULL)
+                {
+                        m_PendingAttach.erase(itAttach++);
+                        continue;
+                }
+                // Force an attach if we haven't gotten an SavedAssetIntoInventory message after 15 seconds
+                // (or if it's been 30 seconds since we last tried to reattach the item)
+                bool fAttach = false;
+                if ( (!itAttach->second.fAssetSaved) && (itAttach->second.tsDetach + 15 < tsCurrent) )
+                {
+                        itAttach->second.fAssetSaved = true;
+                        fAttach = true;
+                }
+                else if ( (itAttach->second.fAssetSaved) && (itAttach->second.tsAttach + 30 < tsCurrent) )
+                {
+                        fAttach = true;
+                }
+                if (fAttach)
+                {
+                        forceAttach(itAttach->second.idItem, itAttach->first);
+                        itAttach->second.tsAttach = tsCurrent;
+                }
+                ++itAttach;
+        }
+        return ( (m_PendingAttach.empty()) && (m_PendingDetach.empty()) && (m_PendingWear.empty()) );
+}
+// Checked: 2009-10-12 (RLVa-1.0.5b) | Modified: RLVa-1.0.5b
+void RlvAttachmentManager::onWearAttachment(const LLUUID& idItem)
+{
+        // We only need to keep track of wears if there are non-attachable attachment points
+        if (!gRlvHandler.hasLockedAttachment(RLV_LOCK_ADD))
+                return;
+        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+        if (!pAvatar)
+                return;
+        // If the attachment point this will end up being attached to is:
+        //   - unlocked    : nothing should happen (from RLVa's point of view)
+        //   - RLV_LOCK_ADD: the new attachment should get detached and the current one reattached (unless it's currently empty)
+        //   - RLV_LOCK_REM: the current attachment will get reattached on ObjectKill (if there is no current one then nothing should happen)
+        RlvWearInfo infoWear(idItem);
+        for (LLVOAvatar::attachment_map_t::const_iterator itAttach = pAvatar->mAttachmentPoints.begin(); 
+                        itAttach != pAvatar->mAttachmentPoints.end(); ++itAttach)
+        {
+                if (gRlvHandler.isLockedAttachment(itAttach->first, RLV_LOCK_ADD))      // We only need to keep track of these (see above)
+                        infoWear.attachPts.insert(std::pair<S32, LLUUID>(itAttach->first, itAttach->second->getItemID()));
+        }
+        m_PendingWear.insert(std::pair<LLUUID, RlvWearInfo>(idItem, infoWear));
+        startTimer();
+}
+// ============================================================================
 // RlvWearableItemCollector
 //
@@ -354,7 +560,10 @@ BOOL RlvSettings::fShowNameTags = FALSE;
 BOOL RlvSettings::getEnableWear()
 {
-        return rlvGetSettingBOOL(RLV_SETTING_ENABLEWEAR, TRUE) && (!gRlvHandler.hasBehaviour(RLV_BHVR_DEFAULTWEAR));
+        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
@@ -419,7 +628,7 @@ void RlvCurrentlyWorn::fetchWorn()
 // Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0f
 bool RlvSelectHasLockedAttach::apply(LLSelectNode* pNode)
 {
-        return (pNode->getObject()) ? !gRlvHandler.isDetachable(pNode->getObject()) : false;
+        return (pNode->getObject()) ? gRlvHandler.isLockedAttachment(pNode->getObject(), m_eLock) : false;
 }
 // Checked: 2009-07-05 (RLVa-1.0.0b) | Modified: RLVa-0.2.0f
@@ -438,11 +647,15 @@ bool RlvSelectIsSittingOn::apply(LLSelectNode* pNode)
 // Various helper functions
 //
-// Checked: 2009-09-08 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
+// Checked: 2009-10-10 (RLVa-1.0.5a) | Modified: RLVa-1.0.5a
 BOOL rlvAttachToEnabler(void* pParam)
 {
-        // Enables/disables an option on the "Attach to (HUD)" submenu depending on whether it is (un)detachable
+        // Disable an option on the "Attach to (HUD)" submenu if:
-        return gRlvHandler.isDetachable((LLViewerJointAttachment*)pParam);
+        //   - 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
@@ -527,24 +740,6 @@ S32 rlvGetDirectDescendentsCount(const LLInventoryCategory* pFolder, LLAssetType
 // Message sending functions
 //
-// Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.1h
-void rlvForceDetach(LLViewerJointAttachment* pAttachPt)
-{
-        // Copy/paste from handle_detach_from_avatar()
-        LLViewerObject* attached_object = pAttachPt->getObject();
-        if (attached_object)
-        {
-                gMessageSystem->newMessage("ObjectDetach");
-                gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-                gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-                gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-                gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, attached_object->getLocalID());
-                gMessageSystem->sendReliable( gAgent.getRegionHost() );
-        }
-}
 void rlvSendBusyMessage(const LLUUID& idTo, const std::string& strMsg, const LLUUID& idSession)
 {
        // (See process_improved_im)
@@ -662,7 +857,3 @@ std::string rlvGetLastParenthesisedText(const std::string& strText, std::string:
 }
 // =========================================================================
-// Debug helper functions
-//
-// =========================================================================
diff --git a/linden/indra/newview/rlvhelper.h b/linden/indra/newview/rlvhelper.h
index 42d10b8..25d8174 100644
--- a/linden/indra/newview/rlvhelper.h
+++ b/linden/indra/newview/rlvhelper.h
@@ -109,6 +109,80 @@ protected:
 };
 // ============================================================================
+// RlvAttachmentManager - Self contained helper class that automagically takes care of the nitty gritty of force detaching/reattaching
+//
+class RlvAttachmentManager
+{
+public:
+        RlvAttachmentManager() : m_pTimer(NULL) {}
+        ~RlvAttachmentManager() { delete m_pTimer; }
+        /*
+         * Member functions
+         */
+public:
+        static void forceAttach(const LLUUID& idItem, S32 idxAttachPt);
+        static void forceDetach(LLViewerJointAttachment* pAttachPt);
+protected:
+        void startTimer() { if (!m_pTimer) m_pTimer = new RlvAttachmentManagerTimer(this); }
+        /*
+         * Event handlers
+         */
+public:
+        void onAttach(LLViewerJointAttachment* pAttachPt);
+        void onDetach(LLViewerJointAttachment* pAttachPt);
+        void onSavedAssetIntoInventory(const LLUUID& idItem);
+        BOOL onTimer();
+        void onWearAttachment(const LLUUID& idItem);
+        /*
+         * Member variables
+         */
+protected:
+        typedef std::map<S32, LLUUID> rlv_detach_map_t;
+        rlv_detach_map_t m_PendingDetach;
+        struct RlvReattachInfo
+        {
+                RlvReattachInfo(const LLUUID& itemid) : idItem(itemid), fAssetSaved(false), tsAttach(0) 
+                        { tsDetach = LLFrameTimer::getElapsedSeconds(); }
+                LLUUID idItem;
+                bool   fAssetSaved;
+                F64    tsDetach;
+                F64    tsAttach;
+        protected:
+                RlvReattachInfo();
+        };
+        typedef std::map<S32, RlvReattachInfo> rlv_attach_map_t;
+        rlv_attach_map_t m_PendingAttach;
+        struct RlvWearInfo
+        {
+                RlvWearInfo(LLUUID itemid) : idItem(itemid) { tsWear = LLFrameTimer::getElapsedSeconds(); }
+                LLUUID idItem;
+                F64    tsWear;
+                std::map<S32, LLUUID> attachPts;
+        protected:
+                RlvWearInfo();
+        };
+        typedef std::map<LLUUID, RlvWearInfo> rlv_wear_map_t;
+        rlv_wear_map_t   m_PendingWear;
+        class RlvAttachmentManagerTimer : public LLEventTimer
+        {
+        public:
+                RlvAttachmentManagerTimer(RlvAttachmentManager* pMgr) : LLEventTimer(10), m_pMgr(pMgr) {}
+                virtual ~RlvAttachmentManagerTimer() { m_pMgr->m_pTimer = NULL; }
+                virtual BOOL tick() { return m_pMgr->onTimer(); }
+                RlvAttachmentManager* m_pMgr;
+        } *m_pTimer;
+};
+// ============================================================================
 // RlvCriteriaCategoryCollector - Criteria based folder matching filter used by @findfolder and @findfolders
 //
@@ -295,7 +369,10 @@ public:
 struct RlvSelectHasLockedAttach : public LLSelectedNodeFunctor
 {
+        RlvSelectHasLockedAttach(ERlvLockMask eLock) : m_eLock(eLock) {}
        virtual bool apply(LLSelectNode* pNode);
+protected:
+        ERlvLockMask m_eLock;
 };
 struct RlvSelectIsOwnedByOrGroupOwned : public LLSelectedNodeFunctor
@@ -324,7 +401,6 @@ bool rlvIsEmote(const std::string& strUTF8Text);
 bool rlvIsValidReplyChannel(S32 nChannel);
 bool rlvIsWearingItem(const LLInventoryItem* pItem);
-void rlvForceDetach(LLViewerJointAttachment* pAttachPt);
 void rlvSendBusyMessage(const LLUUID& idTo, const std::string& strMsg, const LLUUID& idSession = LLUUID::null);
 bool rlvSendChatReply(const std::string& strChannel, const std::string& strReply);
 bool rlvSendChatReply(S32 nChannel, const std::string& strReply);
diff --git a/linden/indra/newview/skins/default/xui/de/alerts.xml b/linden/indra/newview/skins/default/xui/de/alerts.xml
index 2c3c306..a2a9032 100644
--- a/linden/indra/newview/skins/default/xui/de/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/de/alerts.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
 </alerts>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/de/notify.xml b/linden/indra/newview/skins/default/xui/de/notify.xml
index 969117f..128e4bd 100644
--- a/linden/indra/newview/skins/default/xui/de/notify.xml
+++ b/linden/indra/newview/skins/default/xui/de/notify.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <notifications>
 </notifications>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index abf45cc..b5d6a20 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -382,7 +382,7 @@ You can use [SECOND_LIFE] normally and other users will see you correctly.
        </alert>
        <alert modal="true" name="FirstRun">
                <message name="message">
-                        [SECOND_LIFE] installation is complete.
+                        [VIEWER] installation is complete.
 If this is your first time using [SECOND_LIFE], you will need to create
 an account before you can log on.
@@ -405,7 +405,7 @@ Please check your network connection.
        </alert>
        <alert modal="true" name="LoginPacketNeverReceived">
                <message name="message">
-                        We&apos;re having trouble connecting. There may be a problem with your internet connection or the Second Life servers.
+                        We&apos;re having trouble connecting. There may be a problem with your internet connection or the [SECOND_LIFE] servers.
 You can either check your internet connection and try again in a few minutes, click Help to connect to our support site, or click Teleport to attempt to teleport home.
                </message>
@@ -609,7 +609,7 @@ Please set the object for sale and try again.
        </alert>
        <alert modal="true" name="DownloadWindowsMandatory">
                <message name="message">
-                        A new version of [SECOND_LIFE] is available.
+                        A new version of [VIEWER] is available.
 [MESSAGE]
 You must download this update to use [SECOND_LIFE].
                </message>
@@ -622,7 +622,7 @@ You must download this update to use [SECOND_LIFE].
        </alert>
        <alert modal="true" name="DownloadWindows">
                <message name="message">
-                        An updated version of [SECOND_LIFE] is available.
+                        An updated version of [VIEWER] is available.
 [MESSAGE]
 This update is not required, but we suggest you install it to improve performance and stability.
                </message>
@@ -635,7 +635,7 @@ This update is not required, but we suggest you install it to improve performanc
        </alert>
        <alert modal="true" name="DownloadWindowsReleaseForDownload">
                <message name="message">
-                        An updated version of [SECOND_LIFE] is available.
+                        An updated version of [VIEWER] is available.
 [MESSAGE]
 This update is not required, but we suggest you install it to improve performance and stability.
                </message>
@@ -648,7 +648,7 @@ This update is not required, but we suggest you install it to improve performanc
        </alert>
        <alert modal="true" name="DownloadMacMandatory">
                <message name="message">
-                        A new version of [SECOND_LIFE] is available.
+                        A new version of [VIEWER] is available.
 [MESSAGE]
 You must download this update to use [SECOND_LIFE].
@@ -663,7 +663,7 @@ Download to your Applications folder?
        </alert>
        <alert modal="true" name="DownloadMac">
                <message name="message">
-                        An updated version of [SECOND_LIFE] is available.
+                        An updated version of [VIEWER] is available.
 [MESSAGE]
 This update is not required, but we suggest you install it to improve performance and stability.
 
@@ -678,7 +678,7 @@ Download to your Applications folder?
        </alert>
        <alert modal="true" name="DownloadMacReleaseForDownload">
                <message name="message">
-                        An updated version of [SECOND_LIFE] is available.
+                        An updated version of [VIEWER] is available.
 [MESSAGE]
 This update is not required, but we suggest you install it to improve performance and stability.
 
@@ -1861,7 +1861,7 @@ Default: off
        </alert>
        <alert modal="true" name="VoiceVersionMismatch" title="Voice Version Mismatch">
                <message name="message">
-                        This version of Second Life is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update Second Life.
+                        This version of [SECOND_LIFE] is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update [SECOND_LIFE].
                </message>
        </alert>
        <alert modal="true" name="HelpEstateCovenant" title="Estate Covenant">
@@ -2100,7 +2100,7 @@ will only work if a script is added with a money() event.
        </alert>
        <alert modal="true" name="WebLaunchAccountHistory">
                <message name="message">
-                        Go to the Second Life web site to see your account history?
+                        Go to the [SECOND_LIFE] web site to see your account history?
                </message>
                <ignore name="ignore">
                        When loading account history web page
@@ -2114,10 +2114,10 @@ will only work if a script is added with a money() event.
        </alert>
        <alert modal="true" name="ClickOpenF1Help">
                <message name="message">
-                        Visit the Second Life Support Web site? (note: this is not an Imprudence Help site)
+                        Visit the [SECOND_LIFE] Support Web site? (note: this is not an Imprudence Help site)
                </message>
                <ignore name="ignore">
-                        When visiting the Second Life Support Website.
+                        When visiting the [SECOND_LIFE] Support Website.
                </ignore>
                <option name="Gotopage">
                        Go
@@ -2145,7 +2145,7 @@ will only work if a script is added with a money() event.
                        Are you sure you want to quit?
                </message>
                <ignore name="ignore">
-                        When Quitting Second Life.
+                        When Quitting
                </ignore>
                <option name="Quit">
                        Quit
@@ -2185,9 +2185,9 @@ rules of this region as outlined in the estate Covenant.
 About Land.)
 The resolution of this report applies only to this Region; 
-Residents access to other areas of Second Life will not be 
+Residents access to other areas of [SECOND_LIFE] will not be 
 affected by the outcome of this report. Only Linden Lab can 
-restrict access to the entirety of Second Life.
+restrict access to the entirety of [SECOND_LIFE].
                </message>
        </alert>
        <alert modal="true" name="HelpReportBug">
@@ -2264,9 +2264,9 @@ Entering an accurate description helps us file and process bug reports.
 
 You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly:
-(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world.
+(1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the [SECOND_LIFE] permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the [SECOND_LIFE] Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the [SECOND_LIFE] world.
-(2) The DMCA or Content Removal Process. To request removal of content from Second Life, you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
+(2) The DMCA or Content Removal Process. To request removal of content from [SECOND_LIFE], you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php.
 If you still wish to continue with the abuse process, please close this window and finish submitting your report.  You may need to select the specific category 'CopyBot or Permissions Exploit'.
@@ -2487,7 +2487,7 @@ Click &quot;Advanced Water&quot; to bring up an editor with more advanced settin
        </alert>
        <alert modal="true" name="HelpDayCycle">
                <message name="message">
-                        The Day Cycle Editor gives you control over the sky during Second Life&apos;s day/night cycle. This is the cycle that is used by the Basic Environment Editor&apos;s Time of Day slider.
+                        The Day Cycle Editor gives you control over the sky during [SECOND_LIFE]&apos;s day/night cycle. This is the cycle that is used by the Basic Environment Editor&apos;s Time of Day slider.
 The Day Cycle Editor works by setting keyframes. These are nodes (represented by the gray blips on the time graph) that have Sky Presets associated with them. As the Time of Day progresses, the WindLight sky &quot;animates&quot; as it interpolates between these keyframes. 
@@ -2632,7 +2632,7 @@ with the the D slider.
        </alert>
        <alert modal="true" name="HelpClassicClouds">
                <message name="message">
-                        Check this box to enable rendering of Second Life&apos;s older classic clouds in addition to WindLight&apos;s clouds.
+                        Check this box to enable rendering of [SECOND_LIFE]&apos;s older classic clouds in addition to WindLight&apos;s clouds.
                </message>
        </alert>
        <alert modal="true" name="HelpWaterFogColor">
@@ -2801,7 +2801,7 @@ they are part of an attachment.
        </alert>
        <alert modal="true" name="BadURL">
                <message name="message">
-                        Second Life doesn&apos;t know how to handle the link:
+                        Imprudence doesn&apos;t know how to handle the link:
 [SLURL]
 Most links are similar to this:
@@ -2814,7 +2814,7 @@ Please check the spelling and try again.
        <alert modal="true" name="NotAgeVerified">
                <message name="message">
                        You need to be age-verified in order to access this parcel.
-Would you like to visit the Second Life website to verify your age?
+Would you like to visit the [SECOND_LIFE] website to verify your age?
 [_URL]
                </message>
@@ -2834,7 +2834,7 @@ Would you like to visit the Second Life website to verify your age?
        <alert modal="true" name="Cannot enter parcel: no payment info on file">
                <message name="message">
                        This parcel requires that you have payment information on file before you can access it.
-Would you like to visit the Second Life website to set this up?
+Would you like to visit the [SECOND_LIFE] website to set this up?
 [_URL]
                </message>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index e86bf71..a21887f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -102,7 +102,7 @@
        <string name="gesture_label">Gestures</string>
        <spinner bottom="-22" decimal_digits="0" follows="left|bottom" height="20"
             increment="1.00" initial_val="0" label="Channel" label_width="50" left="0"
-             max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
+             max_val="1000000" min_val="0" mouse_opaque="true" name="channel_control"
             width="100" tool_tip="Set the default channel for inworld chat"/>
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0"
                                     enabled="true" follows="left|right|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 57f955f..8dfd43c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -1,107 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-         can_tear_off="false" follows="top|right" height="455" min_height="400" min_width="240"
+<floater name="minimap" short_title="Mini-Map"
-         name="minimap" rect_control="FloaterMiniMapRect" width="200" short_title="Mini-Map">
+         height="455" width="200" min_height="400" min_width="240"
+         follows="top|right" can_close="true" can_drag_on_left="false"
+         can_minimize="true" can_resize="true" can_tear_off="false"
+               rect_control="FloaterMiniMapRect">
  <panel label="Mini Map" name="mini_mapview"
         top="-2" left="2" bottom="196" right="196"
-         follows="left|top|right|bottom" mouse_opaque="false"  />
+         follows="left|top|right|bottom" mouse_opaque="false" />
+  <!-- Note: panel contents are defined in panel_radar.xml -->
  <panel name="RadarPanel" label="Radar"
-         background_visible="true" bg_alpha_color="NetMapBackgroundColor"
         left="2" top="196" right="196" height="120"
-         follows="left|right|bottom" border="false" mouse_opaque="true">
+         follows="left|right|bottom" />
+  <button name="toggle_radar" label=""
+          bottom="202" left="10" height="18" width="18"
+          follows="left|bottom" halign="center"
+          font="SansSerif" scale_image="true"
+          tool_tip="Show or hide the radar" />
-    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom="-20" drop_shadow_visible="true" follows="left|top"
-       font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-       mouse_opaque="true" name="lblAvatarCount" v_pad="0"
-       width="220">
-      0
-    </text>
-    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom="-20" drop_shadow_visible="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="16" left="27"
-        mouse_opaque="true" name="avatars_in" v_pad="0"
-        width="220">
-      Avatars in
-    </text>
-    <slider bottom_delta="0" left_delta="55" follows="left|top" width="110" height="15"
-         name="near_me_range" label="" control_name="NearMeRange"
-         min_val="5" max_val="512" increment="1" initial_val="96" decimal_digits="0" />
-    <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-         bottom_delta="0" left="190" drop_shadow_visible="true" follows="left|top"
-         font="SansSerifSmall" h_pad="0" halign="left" height="15"
-         mouse_opaque="true" name="meters" v_pad="0"
-         width="40">
-      m
-    </text>
-    <tab_container border="false" bottom_delta="-176" height="172" left="0" mouse_opaque="false"
-                       name="button_container" tab_position="top" follows="left|right|bottom" width="198">
-      <panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-                       label="Avatars" left="1" mouse_opaque="true" name="avatar_tab" width="198">
-        <button bottom="-25" follows="top|right" height="22" label="IM/Call"
-             left="-85" name="im_btn" tool_tip="Open Instant Message session"
-             width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Profile"
-             left_delta="0" name="profile_btn"
-             tool_tip="Show picture, groups, and other information" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Teleport..."
-             left_delta="0" name="offer_teleport_btn"
-             tool_tip="Offer this friend a teleport to your current location" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Track"
-             left_delta="0" name="track_btn"
-             tool_tip="Create a beacon to track friends you can map" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Invite..."
-             left_delta="0" name="invite_btn"
-             tool_tip="Remove this person from your friends list" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Add..."
-             left_delta="0" name="add_btn" tool_tip="Offer friendship to a resident"
-             width="80" />
-      </panel>
-      <panel border="true" bottom="-160" follows="left|top|right|bottom" height="160"
-                       label="Estate" left="1" mouse_opaque="true" name="estate_tab" width="198">
-        <button bottom="-25" follows="top|right" height="22" label="Freeze..."
-             left="-85" name="freeze_btn" tool_tip=""
-             width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Eject..."
-             left_delta="0" name="eject_btn"
-             tool_tip="" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Mute..."
-             left_delta="0" name="mute_btn"
-             tool_tip="" width="80" />
-        <button bottom_delta="0" follows="top|right" height="22" label="Unmute..."
-             left_delta="0" name="unmute_btn"
-             tool_tip="" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Report..."
-             left_delta="0" name="ar_btn"
-             tool_tip="" width="80" />
-        <button bottom_delta="-25" follows="top|right" height="22" label="Kick..."
-             left_delta="0" name="estate_eject_btn" tool_tip=""
-             width="80" />
-      </panel>
-    </tab_container>
-    <scroll_list bottom="-190" width="104" height="143" left="4"
-         follows="left|bottom|right" draw_border="false" draw_heading="true"
-         draw_stripes="true" column_padding="5" sort_column="1" mouse_opaque="true"
-         background_visible="true" multi_select="false" name="RadarList">
-      <column name="avatar_name" label="Name" dynamicwidth="true" />
-      <column name="avatar_distance" label="Dist." width="48" />
-    </scroll_list>
-  </panel>
-  <string name="no_one_near">
-    No avatars within range
-  </string>
-  <string name="is_muted">
-    (muted)
-  </string>
-  <string name="is_typing">
-    (typing)
-  </string>
-  <string name="entering_chat_range">
-    [NAME] has entered chat range ([DISTANCE]m)
-  </string>
-  <string name="entering_sim_range">
-    [NAME] has entered the sim ([DISTANCE]m)
-  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 24270d9..3db4084 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
@@ -77,10 +77,6 @@
                userdata="" />
    </menu_item_call>
    <menu_item_separator />
-    <menu_item_call name="Logout" label="Logout"
-                    shortcut="control|alt|Q">
-          <on_click function="File.Logout" userdata="" />
-    </menu_item_call>
    <menu_item_call name="Quit" label="Quit"
                    shortcut="control|Q">
      <on_click function="File.Quit" userdata="" />
@@ -2011,6 +2007,16 @@
      <on_click function="Advanced.ToggleClothingFloater"
                userdata="" />
    </menu_item_check>
+    <menu_item_check name="Allow Multiple Instances"
+            label="Allow Multiple Instances">
+      <on_click function="Advanced.ToggleMultipleViewers"
+                userdata="" />
+      <on_check function="Advanced.CheckMultipleViewers"
+                userdata="" />
+    </menu_item_check>
+    <menu_item_call name="Logout" label="Logout (unstable)">
+      <on_click function="File.Logout" userdata="" />
+    </menu_item_call>
    <menu_item_call name="Debug Settings"
                    label="Debug Settings">
      <on_click function="Advanced.ShowDebugSettings"
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index dd03a32..f1a1955 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -908,7 +908,7 @@ until the flexible checkbox is unchecked.
        <notify name="FirstDebugMenus" tip="false">
                <message name="message">
                        You have enabled the Advanced menu. 
-This menu contains features useful for developers debugging Second Life.
+This menu contains features useful for developers debugging Imprudence.
 To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D.
                </message>
        </notify>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index ac3a74a..35883ee 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -10,7 +10,7 @@
             tool_tip="Click here to see what has been said" width="93" />
  <spinner bottom="-24" decimal_digits="0" follows="left|bottom" height="20" 
                         increment="1.00" initial_val="0" label="Channel" label_width="50" left="107"
-                         max_val="2147483647" min_val="0" mouse_opaque="true" name="channel_control"
+                         max_val="1000000" min_val="0" mouse_opaque="true" name="channel_control"
                         width="100" tool_tip="Set the default channel for inworld chat"/>
        <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-23"
             follows="left|right|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index c215e3c..79f775b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -86,4 +86,41 @@
        <button bottom_delta="-30" follows="left|top" font="SansSerif" height="20"
             label="Joystick Setup" left_delta="0" mouse_opaque="true"
             name="joystick_setup_button" width="155" />
+        <text name="double_click_action_label"
+              bottom_delta="-32" left="10" height="18" width="200"
+        follows="left|top" font="SansSerifSmall" mouse_opaque="true">
+    Double-Click Action:
+        </text>
+  <combo_box name="double_click_action"
+             bottom_delta="0" left_delta="138" height="18" width="150"
+             follows="left|top" mouse_opaque="true">
+                <combo_item name="None" value="None">
+                        None
+                </combo_item>
+                <combo_item name="Go" value="Go">
+                        Autopilot
+                </combo_item>
+  </combo_box>
+        <text name="go_action_label"
+              bottom_delta="-20" left="10" height="18" width="200"
+        follows="left|top" font="SansSerifSmall" mouse_opaque="true">
+    Autopilot Style:
+        </text>
+  <combo_box name="go_action"
+             bottom_delta="0" left_delta="138" height="18" width="150"
+             follows="left|top" mouse_opaque="true">
+                <combo_item name="Move" value="Move">
+                        Move
+                </combo_item>
+                <combo_item name="Teleport" value="Teleport">
+                        Teleport
+                </combo_item>
+  </combo_box>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
new file mode 100644
index 0000000..2d50bc0
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- Note: panel rect (size) is specified in floater_mini_map.xml -->
+<panel name="RadarPanel" label="Radar"
+       background_visible="true" bg_alpha_color="NetMapBackgroundColor"
+       border="false" mouse_opaque="true">
+  <string name="no_one_near">
+    No avatars within range
+  </string>
+  <string name="is_muted">
+    (muted)
+  </string>
+  <string name="is_typing">
+    (typing)
+  </string>
+  <string name="entering_chat_range">
+    [NAME] has entered chat range ([DISTANCE]m)
+  </string>
+  <string name="entering_sim_range">
+    [NAME] has entered the sim ([DISTANCE]m)
+  </string>
+  <text name="lblAvatarCount"
+        bottom="-20" left="10" height="16" width="220"
+        h_pad="0" halign="left" v_pad="0" follows="left|top"
+        bg_visible="false" border_drop_shadow_visible="false" 
+        border_visible="false" drop_shadow_visible="true"
+        font="SansSerifSmall" mouse_opaque="true">
+    0
+  </text>
+  <text name="avatars_in" 
+        bottom="-20" left="27" height="16" width="220"
+        h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" border_drop_shadow_visible="false"
+        border_visible="false" drop_shadow_visible="true" follows="left|top"
+        font="SansSerifSmall" mouse_opaque="true" >
+    Avatars in
+  </text>
+  <slider name="near_me_range" label="" control_name="NearMeRange"
+          bottom_delta="0" left_delta="55" width="110" height="15"
+          follows="left|top" min_val="5" max_val="512" increment="1"
+          initial_val="96" decimal_digits="0" />
+  <text name="meters"
+        bottom_delta="0" left="190" height="15" width="40"
+        h_pad="0" halign="left" v_pad="0" follows="left|top"
+        bg_visible="false" border_drop_shadow_visible="false"
+        border_visible="false" drop_shadow_visible="true" 
+        font="SansSerifSmall" mouse_opaque="true">
+    m
+  </text>
+  <tab_container name="buttons_container"
+                 bottom="1" left="0" right="0" height="172"
+                 follows="left|right|bottom" border="false"
+                 mouse_opaque="false" tab_position="top">
+    <panel name="avatar_tab" label="Avatars"
+           bottom="-180" left="1" height="160" width="198"
+           follows="left|top|right|bottom"
+           border="true" mouse_opaque="true">
+      <button name="im_btn" label="IM/Call"
+              bottom="-25" left="-85" height="22" width="80"
+              follows="top|right"
+              tool_tip="Open Instant Message session" />
+      <button name="profile_btn" label="Profile"
+              bottom_delta="-25" left_delta="0" height="22" width="80"
+              follows="top|right" 
+              tool_tip="Show picture, groups, and other information" />
+      <button name="offer_teleport_btn" label="Teleport..."
+              bottom_delta="-25" left_delta="0" height="22" width="80"
+              follows="top|right" 
+              tool_tip="Offer to teleport this person to your location" />
+      <button name="track_btn" label="Track"
+              bottom_delta="-25" left_delta="0" height="22" width="80" 
+              follows="top|right" 
+              tool_tip="Create a beacon to track friends you can map" />
+      <button name="invite_btn" label="Invite..."
+              bottom_delta="-25" left_delta="0" height="22" width="80"
+              follows="top|right"
+              tool_tip="Remove this person from your friends list" />
+      <button name="add_btn" label="Add..."
+              bottom_delta="-25" left_delta="0" height="22" width="80"
+              follows="top|right"
+              tool_tip="Offer friendship to a resident" />
+    </panel>
+    <panel name="estate_tab" label="Estate"
+           bottom="-160" left="1" height="160" width="198"
+           follows="left|top|right|bottom"
+           border="true" mouse_opaque="true">
+      <button name="freeze_btn" label="Freeze..."
+              bottom="-25" left="-85" height="22" width="80"
+              follows="top|right" tool_tip="" />
+      <button name="eject_btn" label="Eject..."
+              bottom_delta="-25" left_delta="0" height="22" width="80"
+              follows="top|right" tool_tip="" />
+      <button name="mute_btn" label="Mute..."
+              bottom_delta="-25" left_delta="0" height="22" width="80"
+              follows="top|right" tool_tip="" />
+      <button name="unmute_btn" label="Unmute..."
+              bottom_delta="0" left_delta="0" height="22" width="80"
+              follows="top|right" tool_tip="" />
+      <button name="ar_btn" label="Report..."
+              bottom_delta="-25" left_delta="0" height="22" width="80"
+              follows="top|right" tool_tip="" />
+      <button name="estate_eject_btn" label="Kick..."
+              bottom_delta="-25" left_delta="0" height="22" width="80"
+              follows="top|right" tool_tip="" />
+    </panel>
+  </tab_container>
+  <scroll_list name="RadarList"
+               bottom="6" left="4" right="-92" height="146"
+               follows="left|bottom|right" 
+               draw_border="false" draw_heading="true"
+               draw_stripes="true" background_visible="true"
+               column_padding="5" sort_column="1" multi_select="false"
+               mouse_opaque="true" >
+    <column name="avatar_name" label="Name" dynamicwidth="true" />
+    <column name="avatar_distance" label="Dist." width="48" />
+  </scroll_list>
+</panel>
diff --git a/linden/indra/newview/skins/default/xui/es/alerts.xml b/linden/indra/newview/skins/default/xui/es/alerts.xml
index 9552091..a2a9032 100644
--- a/linden/indra/newview/skins/default/xui/es/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/es/alerts.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<alerts>
+<alerts>
-</alerts>
+</alerts>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/fr/alerts.xml b/linden/indra/newview/skins/default/xui/fr/alerts.xml
index 9552091..a2a9032 100644
--- a/linden/indra/newview/skins/default/xui/fr/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/fr/alerts.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<alerts>
+<alerts>
-</alerts>
+</alerts>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/fr/notify.xml b/linden/indra/newview/skins/default/xui/fr/notify.xml
index 5c1c092..128e4bd 100644
--- a/linden/indra/newview/skins/default/xui/fr/notify.xml
+++ b/linden/indra/newview/skins/default/xui/fr/notify.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<notifications>
+<notifications>
-</notifications>
+</notifications>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/ja/alerts.xml b/linden/indra/newview/skins/default/xui/ja/alerts.xml
index 2c3c306..a2a9032 100644
--- a/linden/indra/newview/skins/default/xui/ja/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ja/alerts.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
 </alerts>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/ja/notify.xml b/linden/indra/newview/skins/default/xui/ja/notify.xml
index 969117f..128e4bd 100644
--- a/linden/indra/newview/skins/default/xui/ja/notify.xml
+++ b/linden/indra/newview/skins/default/xui/ja/notify.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <notifications>
 </notifications>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/ko/alerts.xml b/linden/indra/newview/skins/default/xui/ko/alerts.xml
index 2c3c306..a2a9032 100644
--- a/linden/indra/newview/skins/default/xui/ko/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/ko/alerts.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
 </alerts>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/ko/notify.xml b/linden/indra/newview/skins/default/xui/ko/notify.xml
index 969117f..128e4bd 100644
--- a/linden/indra/newview/skins/default/xui/ko/notify.xml
+++ b/linden/indra/newview/skins/default/xui/ko/notify.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <notifications>
 </notifications>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/pt/alerts.xml b/linden/indra/newview/skins/default/xui/pt/alerts.xml
index 9552091..a2a9032 100644
--- a/linden/indra/newview/skins/default/xui/pt/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/pt/alerts.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<alerts>
+<alerts>
-</alerts>
+</alerts>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/pt/notify.xml b/linden/indra/newview/skins/default/xui/pt/notify.xml
index 5c1c092..128e4bd 100644
--- a/linden/indra/newview/skins/default/xui/pt/notify.xml
+++ b/linden/indra/newview/skins/default/xui/pt/notify.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<notifications>
+<notifications>
-</notifications>
+</notifications>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/zh/alerts.xml b/linden/indra/newview/skins/default/xui/zh/alerts.xml
index 2c3c306..a2a9032 100644
--- a/linden/indra/newview/skins/default/xui/zh/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/zh/alerts.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
 </alerts>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
-\ No newline at end of file
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
index 9e4c108..fb420b8 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_land.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<pie_menu name="Land Pie">
+<pie_menu name="Land Pie">
-        <menu_item_call label="关于土地..." name="About Land..." />
+        <menu_item_call label="关于土地..." name="About Land..." />
-        <menu_item_call label="创建" name="Create" />
+        <menu_item_call label="创建" name="Create" />
-        <menu_item_call label="去这里" name="Go Here" />
+        <menu_item_call label="去这里" name="Go Here" />
-        <menu_item_call label="坐在这里" name="Sit Here" />
+        <menu_item_call label="坐在这里" name="Sit Here" />
-        <menu_item_call label="购买通行证" name="Land Buy Pass" />
+        <menu_item_call label="购买通行证" name="Land Buy Pass" />
-        <menu_item_call label="编辑地形" name="Edit Terrain" />
+        <menu_item_call label="编辑地形" name="Edit Terrain" />
-        <menu_item_call label="购买土地..." name="Land Buy" />
+        <menu_item_call label="购买土地..." name="Land Buy" />
-</pie_menu>
+</pie_menu>
 <!-- Translated for Second Life 1.19.0 (80267) -->
 \ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
index 1e6e9a5..0a43667 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_pie_object.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<pie_menu name="Object Pie">
+<pie_menu name="Object Pie">
-        <menu_item_call label="打开" name="Open"/>
+        <menu_item_call label="打开" name="Open"/>
-        <menu_item_call label="创造" name="Create"/>
+        <menu_item_call label="创造" name="Create"/>
-        <menu_item_call label="触摸" name="Object Touch">
+        <menu_item_call label="触摸" name="Object Touch">
-                <on_enable userdata="触摸" name="EnableTouch"/>
+                <on_enable userdata="触摸" name="EnableTouch"/>
-        </menu_item_call>
+        </menu_item_call>
-        <menu_item_call label="坐在这里" name="Object Sit">
+        <menu_item_call label="坐在这里" name="Object Sit">
-                <on_enable userdata="坐在这里,起身" name="EnableSitOrStand"/>
+                <on_enable userdata="坐在这里,起身" name="EnableSitOrStand"/>
-        </menu_item_call>
+        </menu_item_call>
-        <menu_item_call label="拿走" name="Pie Object Take">
+        <menu_item_call label="拿走" name="Pie Object Take">
-                <on_enable userdata="购买,拿走" name="EnableBuyOrTake"/>
+                <on_enable userdata="购买,拿走" name="EnableBuyOrTake"/>
-        </menu_item_call>
+        </menu_item_call>
-        <menu_item_call label="付款..." name="Pay..."/>
+        <menu_item_call label="付款..." name="Pay..."/>
-        <pie_menu label="更多 &gt;" name="More &gt;">
+        <pie_menu label="更多 &gt;" name="More &gt;">
-                <menu_item_call label="删除" name="Delete"/>
+                <menu_item_call label="删除" name="Delete"/>
-                <menu_item_call label="穿上" name="Wear"/>
+                <menu_item_call label="穿上" name="Wear"/>
-                <menu_item_call label="拿走副本" name="Take Copy"/>
+                <menu_item_call label="拿走副本" name="Take Copy"/>
-                <pie_menu label="装上到HUD &gt;" name="Object Attach HUD"/>
+                <pie_menu label="装上到HUD &gt;" name="Object Attach HUD"/>
-                <pie_menu label="装备到&gt;" name="Object Attach"/>
+                <pie_menu label="装备到&gt;" name="Object Attach"/>
-                <menu_item_call label="归还..." name="Return..."/>
+                <menu_item_call label="归还..." name="Return..."/>
-                <pie_menu label="更多 &gt;" name="Rate Menu">
+                <pie_menu label="更多 &gt;" name="Rate Menu">
-                        <menu_item_call label="报告..." name="Report Abuse..."/>
+                        <menu_item_call label="报告..." name="Report Abuse..."/>
-                        <menu_item_call label="屏蔽" name="Object Mute"/>
+                        <menu_item_call label="屏蔽" name="Object Mute"/>
-                        <menu_item_call label="审查" name="Object Inspect"/>
+                        <menu_item_call label="审查" name="Object Inspect"/>
-                </pie_menu>
+                </pie_menu>
-                <menu_item_call label="购买..." name="Buy..."/>
+                <menu_item_call label="购买..." name="Buy..."/>
-        </pie_menu>
+        </pie_menu>
-        <menu_item_call label="编辑..." name="Edit..."/>
+        <menu_item_call label="编辑..." name="Edit..."/>
-</pie_menu>
+</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 85036c1..44b0fae 100644
--- a/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -1,204 +1,204 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu_bar name="Main Menu">
+<menu_bar name="Main Menu">
-        <menu label="文件" name="File">
+        <menu label="文件" name="File">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-                <menu label="上传" name="upload">
+                <menu label="上传" name="upload">
-                        <menu_item_call label="图像（L$[COST]）..." name="Upload Image"/>
+                        <menu_item_call label="图像（L$[COST]）..." name="Upload Image"/>
-                        <menu_item_call label="声音（L$[COST]）..." name="Upload Sound"/>
+                        <menu_item_call label="声音（L$[COST]）..." name="Upload Sound"/>
-                        <menu_item_call label="动画（L$[COST]）..." name="Upload Animation"/>
+                        <menu_item_call label="动画（L$[COST]）..." name="Upload Animation"/>
-                        <menu_item_call label="大宗（每份需付L$[COST]）..." name="Bulk Upload"/>
+                        <menu_item_call label="大宗（每份需付L$[COST]）..." name="Bulk Upload"/>
-                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_separator label="-----------" name="separator"/>
-                        <menu_item_call label="设置默认权限..." name="perm prefs"/>
+                        <menu_item_call label="设置默认权限..." name="perm prefs"/>
-                </menu>
+                </menu>
-                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_call label="关闭窗口" name="Close Window"/>
+                <menu_item_call label="关闭窗口" name="Close Window"/>
-                <menu_item_call label="关闭所有窗口" name="Close All Windows"/>
+                <menu_item_call label="关闭所有窗口" name="Close All Windows"/>
-                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_separator label="-----------" name="separator2"/>
-                <menu_item_call label="保存材质为..." name="Save Texture As..."/>
+                <menu_item_call label="保存材质为..." name="Save Texture As..."/>
-                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_separator label="-----------" name="separator3"/>
-                <menu_item_call label="拍摄快照" name="Take Snapshot"/>
+                <menu_item_call label="拍摄快照" name="Take Snapshot"/>
-                <menu_item_call label="快照存至硬盘" name="Snapshot to Disk"/>
+                <menu_item_call label="快照存至硬盘" name="Snapshot to Disk"/>
-                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_separator label="-----------" name="separator4"/>
-                <menu_item_call label="退出" name="Quit"/>
+                <menu_item_call label="退出" name="Quit"/>
-        </menu>
+        </menu>
-        <menu label="编辑" name="Edit">
+        <menu label="编辑" name="Edit">
-                <menu_item_call label="撤销" name="Undo"/>
+                <menu_item_call label="撤销" name="Undo"/>
-                <menu_item_call label="重做" name="Redo"/>
+                <menu_item_call label="重做" name="Redo"/>
-                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_call label="剪贴" name="Cut"/>
+                <menu_item_call label="剪贴" name="Cut"/>
-                <menu_item_call label="复制" name="Copy"/>
+                <menu_item_call label="复制" name="Copy"/>
-                <menu_item_call label="粘贴" name="Paste"/>
+                <menu_item_call label="粘贴" name="Paste"/>
-                <menu_item_call label="删除" name="Delete"/>
+                <menu_item_call label="删除" name="Delete"/>
-                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_separator label="-----------" name="separator2"/>
-                <menu_item_call label="搜索..." name="Search..."/>
+                <menu_item_call label="搜索..." name="Search..."/>
-                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_separator label="-----------" name="separator3"/>
-                <menu_item_call label="全选" name="Select All"/>
+                <menu_item_call label="全选" name="Select All"/>
-                <menu_item_call label="取消选定" name="Deselect"/>
+                <menu_item_call label="取消选定" name="Deselect"/>
-                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_separator label="-----------" name="separator4"/>
-                <menu_item_call label="创建副本" name="Duplicate"/>
+                <menu_item_call label="创建副本" name="Duplicate"/>
-                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_separator label="-----------" name="separator5"/>
-                <menu label="穿上物体" name="Attach Object"/>
+                <menu label="穿上物体" name="Attach Object"/>
-                <menu label="卸下物体" name="Detach Object"/>
+                <menu label="卸下物体" name="Detach Object"/>
-                <menu label="脱下衣着" name="Take Off Clothing">
+                <menu label="脱下衣着" name="Take Off Clothing">
-                        <menu_item_call label="衬衣" name="Shirt"/>
+                        <menu_item_call label="衬衣" name="Shirt"/>
-                        <menu_item_call label="裤子" name="Pants"/>
+                        <menu_item_call label="裤子" name="Pants"/>
-                        <menu_item_call label="鞋子" name="Shoes"/>
+                        <menu_item_call label="鞋子" name="Shoes"/>
-                        <menu_item_call label="袜子" name="Socks"/>
+                        <menu_item_call label="袜子" name="Socks"/>
-                        <menu_item_call label="夹克" name="Jacket"/>
+                        <menu_item_call label="夹克" name="Jacket"/>
-                        <menu_item_call label="手套" name="Gloves"/>
+                        <menu_item_call label="手套" name="Gloves"/>
-                        <menu_item_call label="内衣" name="Menu Undershirt"/>
+                        <menu_item_call label="内衣" name="Menu Undershirt"/>
-                        <menu_item_call label="内裤" name="Menu Underpants"/>
+                        <menu_item_call label="内裤" name="Menu Underpants"/>
-                        <menu_item_call label="裙子" name="Skirt"/>
+                        <menu_item_call label="裙子" name="Skirt"/>
-                        <menu_item_call label="所有服饰" name="All Clothes"/>
+                        <menu_item_call label="所有服饰" name="All Clothes"/>
-                </menu>
+                </menu>
-                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_separator label="-----------" name="separator6"/>
-                <menu_item_call label="动作..." name="Gestures..."/>
+                <menu_item_call label="动作..." name="Gestures..."/>
-                <menu_item_call label="档案..." name="Profile..."/>
+                <menu_item_call label="档案..." name="Profile..."/>
-                <menu_item_call label="外观..." name="Appearance..."/>
+                <menu_item_call label="外观..." name="Appearance..."/>
-                <menu_item_separator label="-----------" name="separator7"/>
+                <menu_item_separator label="-----------" name="separator7"/>
-                <menu_item_check label="朋友..." name="Friends..."/>
+                <menu_item_check label="朋友..." name="Friends..."/>
-                <menu_item_call label="社团..." name="Groups..."/>
+                <menu_item_call label="社团..." name="Groups..."/>
-                <menu_item_separator label="-----------" name="separator8"/>
+                <menu_item_separator label="-----------" name="separator8"/>
-                <menu_item_call label="参数设置..." name="Preferences..."/>
+                <menu_item_call label="参数设置..." name="Preferences..."/>
-        </menu>
+        </menu>
-        <menu label="查看" name="View">
+        <menu label="查看" name="View">
-                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+                <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-                <menu_item_call label="第一人称视角" name="Mouselook"/>
+                <menu_item_call label="第一人称视角" name="Mouselook"/>
-                <menu_item_check label="建造" name="Build"/>
+                <menu_item_check label="建造" name="Build"/>
-                <menu_item_check label="三维浏览手柄" name="Joystick Flycam"/>
+                <menu_item_check label="三维浏览手柄" name="Joystick Flycam"/>
-                <menu_item_call label="重新设置视角" name="Reset View"/>
+                <menu_item_call label="重新设置视角" name="Reset View"/>
-                <menu_item_call label="查看最后一次聊天者" name="Look at Last Chatter"/>
+                <menu_item_call label="查看最后一次聊天者" name="Look at Last Chatter"/>
-                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_check label="工具栏" name="Toolbar"/>
+                <menu_item_check label="工具栏" name="Toolbar"/>
-                <menu_item_check label="聊天记录" name="Chat History"/>
+                <menu_item_check label="聊天记录" name="Chat History"/>
-                <menu_item_check label="即时消息" name="Instant Message"/>
+                <menu_item_check label="即时消息" name="Instant Message"/>
-                <menu_item_check label="库存" name="Inventory"/>
+                <menu_item_check label="库存" name="Inventory"/>
-                <menu_item_check label="活跃的说话人" name="Active Speakers"/>
+                <menu_item_check label="活跃的说话人" name="Active Speakers"/>
-                <menu_item_check label="屏蔽名单" name="Mute List"/>
+                <menu_item_check label="屏蔽名单" name="Mute List"/>
-                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_separator label="-----------" name="separator2"/>
-                <menu_item_check label="摄像头控制" name="Camera Controls"/>
+                <menu_item_check label="摄像头控制" name="Camera Controls"/>
-                <menu_item_check label="移动控制" name="Movement Controls"/>
+                <menu_item_check label="移动控制" name="Movement Controls"/>
-                <menu_item_check label="世界地图" name="World Map"/>
+                <menu_item_check label="世界地图" name="World Map"/>
-                <menu_item_check label="迷你地图" name="Mini-Map"/>
+                <menu_item_check label="迷你地图" name="Mini-Map"/>
-                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_separator label="-----------" name="separator3"/>
-                <menu_item_check label="统计条" name="Statistics Bar"/>
+                <menu_item_check label="统计条" name="Statistics Bar"/>
-                <menu_item_check label="地块边线" name="Property Lines"/>
+                <menu_item_check label="地块边线" name="Property Lines"/>
-                <menu_item_check label="隔离线" name="Banlines"/>
+                <menu_item_check label="隔离线" name="Banlines"/>
-                <menu_item_check label="土地所有者" name="Land Owners"/>
+                <menu_item_check label="土地所有者" name="Land Owners"/>
-                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_separator label="-----------" name="separator4"/>
-                <menu label="悬停提示" name="Hover Tips">
+                <menu label="悬停提示" name="Hover Tips">
-                        <menu_item_check label="显示提示" name="Show Tips"/>
+                        <menu_item_check label="显示提示" name="Show Tips"/>
-                        <menu_item_separator label="-----------" name="separator"/>
+                        <menu_item_separator label="-----------" name="separator"/>
-                        <menu_item_check label="关于土地的提示" name="Land Tips"/>
+                        <menu_item_check label="关于土地的提示" name="Land Tips"/>
-                        <menu_item_check label="所有物体的提示" name="Tips On All Objects"/>
+                        <menu_item_check label="所有物体的提示" name="Tips On All Objects"/>
-                </menu>
+                </menu>
-                <menu_item_check label="高亮透明物体" name="Highlight Transparent"/>
+                <menu_item_check label="高亮透明物体" name="Highlight Transparent"/>
-                <menu_item_check label="信标" name="beacons"/>
+                <menu_item_check label="信标" name="beacons"/>
-                <menu_item_check label="隐藏粒子" name="Hide Particles"/>
+                <menu_item_check label="隐藏粒子" name="Hide Particles"/>
-                <menu_item_check label="显示界面附件" name="Show HUD Attachments"/>
+                <menu_item_check label="显示界面附件" name="Show HUD Attachments"/>
-                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_separator label="-----------" name="separator5"/>
-                <menu_item_call label="缩小" name="Zoom In"/>
+                <menu_item_call label="缩小" name="Zoom In"/>
-                <menu_item_call label="默认缩放" name="Zoom Default"/>
+                <menu_item_call label="默认缩放" name="Zoom Default"/>
-                <menu_item_call label="放大" name="Zoom Out"/>
+                <menu_item_call label="放大" name="Zoom Out"/>
-                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_separator label="-----------" name="separator6"/>
-                <menu_item_call label="切换全屏状态" name="Toggle Fullscreen"/>
+                <menu_item_call label="切换全屏状态" name="Toggle Fullscreen"/>
-                <menu_item_call label="设置用户界面尺寸为默认值" name="Set UI Size to Default"/>
+                <menu_item_call label="设置用户界面尺寸为默认值" name="Set UI Size to Default"/>
-        </menu>
+        </menu>
-        <menu label="世界" name="World">
+        <menu label="世界" name="World">
-                <menu_item_call label="聊天" name="Chat"/>
+                <menu_item_call label="聊天" name="Chat"/>
-                <menu_item_check label="总是奔跑" name="Always Run"/>
+                <menu_item_check label="总是奔跑" name="Always Run"/>
-                <menu_item_check label="飞翔" name="Fly"/>
+                <menu_item_check label="飞翔" name="Fly"/>
-                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_call label="在这里创建地标" name="Create Landmark Here"/>
+                <menu_item_call label="在这里创建地标" name="Create Landmark Here"/>
-                <menu_item_call label="将家设置到这里" name="Set Home to Here"/>
+                <menu_item_call label="将家设置到这里" name="Set Home to Here"/>
-                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_separator label="-----------" name="separator2"/>
-                <menu_item_call label="瞬间移动回家" name="Teleport Home"/>
+                <menu_item_call label="瞬间移动回家" name="Teleport Home"/>
-                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_separator label="-----------" name="separator3"/>
-                <menu_item_call label="设成离开状态" name="Set Away"/>
+                <menu_item_call label="设成离开状态" name="Set Away"/>
-                <menu_item_call label="设成繁忙状态" name="Set Busy"/>
+                <menu_item_call label="设成繁忙状态" name="Set Busy"/>
-                <menu_item_call label="停止化身动画" name="Stop Animating My Avatar"/>
+                <menu_item_call label="停止化身动画" name="Stop Animating My Avatar"/>
-                <menu_item_call label="释放按键" name="Release Keys"/>
+                <menu_item_call label="释放按键" name="Release Keys"/>
-                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_separator label="-----------" name="separator4"/>
-                <menu_item_call label="帐户历史纪录..." name="Account History..."/>
+                <menu_item_call label="帐户历史纪录..." name="Account History..."/>
-                <menu_item_call label="管理我的帐户..." name="Manage My Account..."/>
+                <menu_item_call label="管理我的帐户..." name="Manage My Account..."/>
-                <menu_item_call label="购买 L$..." name="Buy and Sell L$..."/>
+                <menu_item_call label="购买 L$..." name="Buy and Sell L$..."/>
-                <menu_item_separator label="-----------" name="separator5"/>
+                <menu_item_separator label="-----------" name="separator5"/>
-                <menu_item_call label="我的土地..." name="My Land..."/>
+                <menu_item_call label="我的土地..." name="My Land..."/>
-                <menu_item_call label="关于土地..." name="About Land..."/>
+                <menu_item_call label="关于土地..." name="About Land..."/>
-                <menu_item_call label="购买土地..." name="Buy Land..."/>
+                <menu_item_call label="购买土地..." name="Buy Land..."/>
-                <menu_item_call label="地区/地产..." name="Region/Estate..."/>
+                <menu_item_call label="地区/地产..." name="Region/Estate..."/>
-                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_separator label="-----------" name="separator6"/>
-                <menu label="环境设置" name="Environment Settings">
+                <menu label="环境设置" name="Environment Settings">
-                        <menu_item_call label="日出" name="Sunrise"/>
+                        <menu_item_call label="日出" name="Sunrise"/>
-                        <menu_item_call label="中午" name="Noon"/>
+                        <menu_item_call label="中午" name="Noon"/>
-                        <menu_item_call label="日落" name="Sunset" shortcut="control|shift|N"/>
+                        <menu_item_call label="日落" name="Sunset" shortcut="control|shift|N"/>
-                        <menu_item_call label="半夜" name="Midnight"/>
+                        <menu_item_call label="半夜" name="Midnight"/>
-                        <menu_item_call label="恢复地区默认值" name="Revert to Region Default"/>
+                        <menu_item_call label="恢复地区默认值" name="Revert to Region Default"/>
-                        <menu_item_call label="环境编辑器" name="Environment Editor"/>
+                        <menu_item_call label="环境编辑器" name="Environment Editor"/>
-                </menu>
+                </menu>
-        </menu>
+        </menu>
-        <menu label="工具" name="Tools">
+        <menu label="工具" name="Tools">
-                <menu label="选择工具" name="Select Tool">
+                <menu label="选择工具" name="Select Tool">
-                        <menu_item_call label="焦点" name="Focus"/>
+                        <menu_item_call label="焦点" name="Focus"/>
-                        <menu_item_call label="移动" name="Move"/>
+                        <menu_item_call label="移动" name="Move"/>
-                        <menu_item_call label="编辑" name="Edit"/>
+                        <menu_item_call label="编辑" name="Edit"/>
-                        <menu_item_call label="创造" name="Create"/>
+                        <menu_item_call label="创造" name="Create"/>
-                        <menu_item_call label="土地" name="Land"/>
+                        <menu_item_call label="土地" name="Land"/>
-                </menu>
+                </menu>
-                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_check label="只选择我的物体" name="Select Only My Objects"/>
+                <menu_item_check label="只选择我的物体" name="Select Only My Objects"/>
-                <menu_item_check label="只选择可移动的物体" name="Select Only Movable Objects"/>
+                <menu_item_check label="只选择可移动的物体" name="Select Only Movable Objects"/>
-                <menu_item_check label="选中包围区域" name="Select By Surrounding"/>
+                <menu_item_check label="选中包围区域" name="Select By Surrounding"/>
-                <menu_item_check label="显示隐藏的选中项" name="Show Hidden Selection"/>
+                <menu_item_check label="显示隐藏的选中项" name="Show Hidden Selection"/>
-                <menu_item_check label="显示选择项的光照半径" name="Show Light Radius for Selection"/>
+                <menu_item_check label="显示选择项的光照半径" name="Show Light Radius for Selection"/>
-                <menu_item_check label="显示选择导引" name="Show Selection Beam"/>
+                <menu_item_check label="显示选择导引" name="Show Selection Beam"/>
-                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_separator label="-----------" name="separator2"/>
-                <menu_item_check label="对齐到网格" name="Snap to Grid"/>
+                <menu_item_check label="对齐到网格" name="Snap to Grid"/>
-                <menu_item_call label="在 XY 面上对齐网格" name="Snap Object XY to Grid"/>
+                <menu_item_call label="在 XY 面上对齐网格" name="Snap Object XY to Grid"/>
-                <menu_item_call label="以选项作为网格" name="Use Selection for Grid"/>
+                <menu_item_call label="以选项作为网格" name="Use Selection for Grid"/>
-                <menu_item_call label="网格选项..." name="Grid Options..."/>
+                <menu_item_call label="网格选项..." name="Grid Options..."/>
-                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_separator label="-----------" name="separator3"/>
-                <menu_item_check label="编辑链接部件" name="Edit Linked Parts" shortcut=""/>
+                <menu_item_check label="编辑链接部件" name="Edit Linked Parts" shortcut=""/>
-                <menu_item_call label="链接" name="Link"/>
+                <menu_item_call label="链接" name="Link"/>
-                <menu_item_call label="解除链接" name="Unlink"/>
+                <menu_item_call label="解除链接" name="Unlink"/>
-                <menu_item_separator label="-----------" name="separator4"/>
+                <menu_item_separator label="-----------" name="separator4"/>
-                <menu_item_call label="聚焦于所选物体" name="Focus on Selection"/>
+                <menu_item_call label="聚焦于所选物体" name="Focus on Selection"/>
-                <menu_item_call label="缩放到所选物体" name="Zoom to Selection"/>
+                <menu_item_call label="缩放到所选物体" name="Zoom to Selection"/>
-                <menu_item_call label="购买物体" name="Menu Object Take">
+                <menu_item_call label="购买物体" name="Menu Object Take">
-                        <on_enable userdata="购买,拿走" name="EnableBuyOrTake"/>
+                        <on_enable userdata="购买,拿走" name="EnableBuyOrTake"/>
-                </menu_item_call>
+                </menu_item_call>
-                <menu_item_call label="拿走副本" name="Take Copy"/>
+                <menu_item_call label="拿走副本" name="Take Copy"/>
-                <menu_item_call label="将物体存回至物体内容" name="Save Object Back to Object Contents"/>
+                <menu_item_call label="将物体存回至物体内容" name="Save Object Back to Object Contents"/>
-                <menu_item_separator label="-----------" name="separator6"/>
+                <menu_item_separator label="-----------" name="separator6"/>
-                <menu_item_call label="显示脚本警告/错误窗口" name="Show Script Warning/Error Window"/>
+                <menu_item_call label="显示脚本警告/错误窗口" name="Show Script Warning/Error Window"/>
-                <menu label="重新编译所选项中脚本为" name="Recompile Scripts in Selection">
+                <menu label="重新编译所选项中脚本为" name="Recompile Scripts in Selection">
-                        <menu_item_call label="Mono" name="Mono"/>
+                        <menu_item_call label="Mono" name="Mono"/>
-                        <menu_item_call label="LSL" name="LSL"/>
+                        <menu_item_call label="LSL" name="LSL"/>
-                </menu>
+                </menu>
-                <menu_item_call label="重置所选项中脚本" name="Reset Scripts in Selection"/>
+                <menu_item_call label="重置所选项中脚本" name="Reset Scripts in Selection"/>
-                <menu_item_call label="设置所选项中脚本运行" name="Set Scripts to Running in Selection"/>
+                <menu_item_call label="设置所选项中脚本运行" name="Set Scripts to Running in Selection"/>
-                <menu_item_call label="设置所选项中脚本不运行" name="Set Scripts to Not Running in Selection"/>
+                <menu_item_call label="设置所选项中脚本不运行" name="Set Scripts to Not Running in Selection"/>
-        </menu>
+        </menu>
-        <menu label="帮助" name="Help">
+        <menu label="帮助" name="Help">
-                <menu_item_call label="第二人生帮助" name="Second Life Help"/>
+                <menu_item_call label="第二人生帮助" name="Second Life Help"/>
-                <menu_item_call label="教程" name="Tutorial"/>
+                <menu_item_call label="教程" name="Tutorial"/>
-                <menu_item_separator label="-----------" name="separator"/>
+                <menu_item_separator label="-----------" name="separator"/>
-                <menu_item_call label="官方林登博客..." name="Official Linden Blog..."/>
+                <menu_item_call label="官方林登博客..." name="Official Linden Blog..."/>
-                <menu_item_separator label="-----------" name="separator2"/>
+                <menu_item_separator label="-----------" name="separator2"/>
-                <menu_item_call label="脚本 Wiki 门户..." name="Scripting Portal..."/>
+                <menu_item_call label="脚本 Wiki 门户..." name="Scripting Portal..."/>
-                <menu_item_separator label="-----------" name="separator3"/>
+                <menu_item_separator label="-----------" name="separator3"/>
-                <menu_item_call label="报告不良行为..." name="Report Abuse..."/>
+                <menu_item_call label="报告不良行为..." name="Report Abuse..."/>
-                <menu_item_call label="颠簸，推动和碰撞..." name="Bumps, Pushes &amp;amp; Hits..."/>
+                <menu_item_call label="颠簸，推动和碰撞..." name="Bumps, Pushes &amp;amp; Hits..."/>
-                <menu_item_call label="延迟计量器" name="Lag Meter"/>
+                <menu_item_call label="延迟计量器" name="Lag Meter"/>
-                <menu create_jump_keys="true" drop_shadow="true" label="错误汇报" name="Bug Reporting" opaque="true" tear_off="true">
+                <menu create_jump_keys="true" drop_shadow="true" label="错误汇报" name="Bug Reporting" opaque="true" tear_off="true">
-                        <menu_item_call label="公开 Issue Tracker..." name="Public Issue Tracker..."/>
+                        <menu_item_call label="公开 Issue Tracker..." name="Public Issue Tracker..."/>
-                        <menu_item_call label="公开 Issue Tracker 帮助..." name="Publc Issue Tracker Help..."/>
+                        <menu_item_call label="公开 Issue Tracker 帮助..." name="Publc Issue Tracker Help..."/>
-                        <menu_item_separator label="-----------" name="separator7"/>
+                        <menu_item_separator label="-----------" name="separator7"/>
-                        <menu_item_call label="Bug报告 101..." name="Bug Reporing 101..."/>
+                        <menu_item_call label="Bug报告 101..." name="Bug Reporing 101..."/>
-                        <menu_item_call label="安全问题..." name="Security Issues..."/>
+                        <menu_item_call label="安全问题..." name="Security Issues..."/>
-                        <menu_item_call label="质量保证 Wiki..." name="QA Wiki..."/>
+                        <menu_item_call label="质量保证 Wiki..." name="QA Wiki..."/>
-                        <menu_item_call label="汇报错误..." name="Report Bug..."/>
+                        <menu_item_call label="汇报错误..." name="Report Bug..."/>
-                </menu>
+                </menu>
-                <menu_item_call label="关于第二人生..." name="About Second Life..."/>
+                <menu_item_call label="关于第二人生..." name="About Second Life..."/>
-        </menu>
+        </menu>
-</menu_bar>
+</menu_bar>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 76a176d..f57b3b8 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -824,10 +824,26 @@ class Linux_i686Manifest(LinuxManifest):
            self.path("libSDL-1.2.so.0")
            self.path("libELFIO.so")
            self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
+            self.path("libz.so.1")
+            # OpenAL
            self.path("libopenal.so.1")
            self.path("libalut.so.0")
+            # GTK+ and dependencies
+            self.path("libatk-1.0.so.0")
+            self.path("libcairo.so.2")
+            self.path("libfontconfig.so.1")
+            self.path("libfreetype.so.6")
+            self.path("libgdk_pixbuf-2.0.so.0")
+            self.path("libgdk-x11-2.0.so.0")
+            self.path("libgtk-x11-2.0.so.0")
+            self.path("libpango-1.0.so.0")
+            self.path("libpangoft2-1.0.so.0")
+            self.path("libpangox-1.0.so.0")
+            self.path("libpangoxft-1.0.so.0")
+            self.path("libpixman-1.so.0")
            # Gstreamer libs
            self.path("libgstbase-0.10.so.0")
            self.path("libgstreamer-0.10.so.0")