1 files changed, 84 insertions, 2 deletions

diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index c53395d..7ab850f 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -81,6 +81,10 @@
 #include "llviewerwindow.h"
 #include "llwearable.h"
 
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+#include "llvoavatar.h"
+// [/RLVa:KB]
+
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -364,8 +368,16 @@ void LLTaskInvFVBridge::previewItem()
 
 BOOL LLTaskInvFVBridge::isItemRenameable() const
 {
-        if(gAgent.isGodlike()) return TRUE;
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
         LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
+        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        {
+                return FALSE;
+        }
+// [/RLVa:KB]
+
+        if(gAgent.isGodlike()) return TRUE;
+//      LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
         if(object)
         {
                 LLInventoryItem* item;
@@ -382,6 +394,12 @@ BOOL LLTaskInvFVBridge::isItemRenameable() const
 BOOL LLTaskInvFVBridge::renameItem(const std::string& new_name)
 {
         LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        {
+                return TRUE; // Fallback code [see LLTaskInvFVBridge::isItemRenameable()]
+        }
+// [/RLVa:KB]
         if(object)
         {
                 LLViewerInventoryItem* item = NULL;
@@ -408,12 +426,47 @@ BOOL LLTaskInvFVBridge::isItemMovable()
         //      return TRUE;
         //}
         //return FALSE;
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0g
+        if (rlv_handler_t::isEnabled())
+        {
+                LLViewerObject* pObj = gObjectList.findObject(mPanel->getTaskUUID());
+                if (pObj)
+                {
+                        if (!gRlvHandler.isDetachable(pObj))
+                        {
+                                return FALSE;
+                        }
+                        else if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) )
+                        {
+                                LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                                if ( (pAvatar) && (pAvatar->mIsSitting) && (pAvatar->getRoot() == pObj->getRootEdit()) )
+                                        return FALSE;
+                        }
+                }
+        }
+// [/RLVa:KB]
         return TRUE;
 }
 
 BOOL LLTaskInvFVBridge::isItemRemovable()
 {
         LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c) | Modified: RLVa-0.2.0g
+        if ( (object) && (rlv_handler_t::isEnabled()) )
+        {
+                if (!gRlvHandler.isDetachable(object))
+                {
+                        return FALSE;
+                }
+                else if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SITTP)) )
+                {
+                        LLVOAvatar* pAvatar = gAgent.getAvatarObject();
+                        if ( (pAvatar) && (pAvatar->mIsSitting) && (pAvatar->getRoot() == object->getRootEdit()) )
+                                return FALSE;
+                }
+        }
+// [/RLVa:KB]
+
         if(object
            && (object->permModify() || object->permYouOwner()))
         {
@@ -558,6 +611,13 @@ BOOL LLTaskInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
                                 const LLPermissions& perm = inv->getPermissions();
                                 bool can_copy = gAgent.allowOperation(PERM_COPY, perm,
                                                                                                                 GP_OBJECT_MANIPULATE);
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                                // Kind of redundant due to the note below, but in case that ever gets fixed
+                                if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+                                {
+                                        return FALSE;
+                                }
+// [/RLVa:KB]
                                 if (object->isAttachment() && !can_copy)
                                 {
                     //RN: no copy contents of attachments cannot be dragged out
@@ -675,6 +735,14 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                 {
                         disabled_items.push_back(std::string("Task Open"));
                 }
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+                else if ( (rlv_handler_t::isEnabled()) && 
+                                  ((LLAssetType::AT_LSL_TEXT == item->getType()) || (LLAssetType::AT_NOTECARD == item->getType())) && 
+                                  (!gRlvHandler.isDetachable(gObjectList.findObject(mPanel->getTaskUUID()))) )
+                {
+                        disabled_items.push_back(std::string("Task Open"));
+                }
+// [/RLVa:KB]
         }
         items.push_back(std::string("Task Properties"));
         if(isItemRenameable())
@@ -1180,12 +1248,20 @@ LLTaskLSLBridge::LLTaskLSLBridge(
 
 void LLTaskLSLBridge::openItem()
 {
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
+        if ( (rlv_handler_t::isEnabled()) && (!gRlvHandler.isDetachable(object)) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         llinfos << "LLTaskLSLBridge::openItem() " << mUUID << llendl;
         if(LLLiveLSLEditor::show(mUUID, mPanel->getTaskUUID()))
         {
                 return;
         }
-        LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
+//      LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
         if(!object || object->isInventoryPending())
         {
                 return;
@@ -1300,6 +1376,12 @@ void LLTaskNotecardBridge::openItem()
         {
                 return;
         }
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+        if ( (rlv_handler_t::isEnabled()) && ((gRlvHandler.hasBehaviour("viewnote")) || (!gRlvHandler.isDetachable(object))) )
+        {
+                return;
+        }
+// [/RLVa:KB]
         if(object->permModify() || gAgent.isGodlike())
         {
                 S32 left, top;