Applied RLVa-1.0.2c_20091005_Imprudence-1.2.0-diff.patch

1 files changed, 9 insertions, 0 deletions

diff --git a/linden/indra/newview/rlvhandler.h b/linden/indra/newview/rlvhandler.h
index df3ff9b..505bfd5 100644
--- a/linden/indra/newview/rlvhandler.h
+++ b/linden/indra/newview/rlvhandler.h
@@ -73,6 +73,7 @@ public:
         // Returns TRUE if the specified attachment point is detachable
         bool isDetachable(S32 idxAttachPt) const { return (idxAttachPt) && (m_Attachments.find(idxAttachPt) == m_Attachments.end()); }
         bool isDetachable(const LLInventoryItem* pItem) const;
+        bool isDetachable(LLViewerJointAttachment* pAttachPt) const;
         bool isDetachable(LLViewerObject* pObj) const;
         // Returns TRUE if the specified attachment point is set undetachable by anything other than pObj (or one of its children)
         bool isDetachableExcept(S32 idxAttachPt, LLViewerObject* pObj) const;
@@ -370,6 +371,14 @@ 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
 {