1 files changed, 38 insertions, 0 deletions

diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index d91790e..e13ec46 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -66,6 +66,10 @@
 #include "lltoolcomp.h"
 #include "llpanelinventory.h"
 
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+#include "llvoavatar.h"
+// [/RLVa:KB]
+
 //
 // Imported globals
 //
@@ -117,6 +121,24 @@ void LLPanelContents::getState(LLViewerObject *objectp )
                                                && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) )));  // solves SL-23488
         BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME );
 
+// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0g
+        if ( (rlv_handler_t::isEnabled()) && (editable) )
+        {
+                // Don't allow creation of new scripts if it's undetachable
+                editable = gRlvHandler.isDetachable(objectp);
+
+                // Don't allow creation of new scripts if we're @unsit=n or @sittp=n restricted and we're sitting on the selection
+                if ( (editable) && ((gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP))) )
+                {
+                        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                        // Only check the first (non-)root object because nothing else would result in enabling the button (see below)
+                        LLViewerObject* pObj = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(TRUE);
+
+                        editable = (pObj) && (pAvatar) && ((!pAvatar->mIsSitting) || (pAvatar->getRoot() != pObj->getRootEdit()));
+                }
+        }
+// [/RLVa:KB]
+
         // Edit script button - ok if object is editable and there's an
         // unambiguous destination for the object.
         if(     editable &&
@@ -160,6 +182,22 @@ void LLPanelContents::onClickNewScript(void *userdata)
         LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
         if(object)
         {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                if (rlv_handler_t::isEnabled()) // Fallback code [see LLPanelContents::getState()]
+                {
+                        if (!gRlvHandler.isDetachable(object))
+                        {
+                                return;                                 // Disallow creating new scripts in a locked attachment
+                        }
+                        else if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) )
+                        {
+                                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                                if ( (pAvatar) && (pAvatar->mIsSitting) && (pAvatar->getRoot() == object->getRootEdit()) )
+                                        return;                         // .. or in a linkset the avie is sitting on under @unsit=n/@sittp=n
+                        }
+                }
+// [/RLVa:KB]
+
                 LLPermissions perm;
                 perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, LLUUID::null);
                 perm.initMasks(