1 files changed, 22 insertions, 0 deletions

diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index cbd0472..1b79cd6 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -98,6 +98,10 @@
 #include "llvowlsky.h"
 #include "llmanip.h"
 
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 //#define DEBUG_UPDATE_TYPE
 
 BOOL gVelocityInterpolate = TRUE;
@@ -1616,6 +1620,24 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                                                 gObjectList.killObject(this);
                                                                 return retval;
                                                         }
+// [RLVa:KB] - Checked: 2009-12-27 (RLVa-1.1.0k) | Added: RLVa-1.1.0k
+                                                        if ( (rlv_handler_t::isEnabled()) && (sent_parentp->isAvatar()) && (sent_parentp->getID() == gAgent.getID()) )
+                                                        {
+                                                                // Rezzed object that's being worn as an attachment (we're assuming this will be due to llAttachToAvatar())
+                                                                S32 idxAttachPt = ATTACHMENT_ID_FROM_STATE(getState());
+                                                                if (gRlvHandler.isLockedAttachment(idxAttachPt, RLV_LOCK_ANY))
+                                                                {
+                                                                        // If this will end up on an "add locked" attachment point then treat the attach as a user action
+                                                                        LLNameValue* nvItem = getNVPair("AttachItemID");
+                                                                        if (nvItem)
+                                                                        {
+                                                                                LLUUID idItem(nvItem->getString());
+                                                                                if (idItem.notNull())
+                                                                                        gRlvHandler.onWearAttachment(idItem);
+                                                                        }
+                                                                }
+                                                        }
+// [/RLVa:KB]
                                                         sent_parentp->addChild(this);
                                                         // make sure this object gets a non-damped update
                                                         if (sent_parentp->mDrawable.notNull())