summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2024-08-29 14:49:59 +0200
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2026-03-15 21:55:33 +0200
commit8b0d042ed9fc58b8e346eb813374549ec71db704 (patch)
tree87005d8dd8ce03ba170793a3ce9c9c36bd1a2649
parentd44da708b5b5bb5d761520fc07816f0b86085bf9 (diff)
LLViewerObject::getAttachmentItemID() sometimes returns the NULL UUID for the avatar's own attachments
-rw-r--r--indra/newview/llviewerjointattachment.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp
index 511fac9788..cad96afd98 100644
--- a/indra/newview/llviewerjointattachment.cpp
+++ b/indra/newview/llviewerjointattachment.cpp
@@ -168,7 +168,6 @@ void LLViewerJointAttachment::setupDrawable(LLViewerObject *object)
//-----------------------------------------------------------------------------
bool LLViewerJointAttachment::addObject(LLViewerObject* object)
{
- object->extractAttachmentItemID();
// Same object reattached
if (isObjectAttached(object))
@@ -179,6 +178,8 @@ bool LLViewerJointAttachment::addObject(LLViewerObject* object)
// re-connect object to the joint correctly
}
+ object->extractAttachmentItemID();
+
// Two instances of the same inventory item attached --
// Request detach, and kill the object in the meantime.
if (getAttachedObject(object->getAttachmentItemID()))