LLViewerObject::getAttachmentItemID() sometimes returns the NULL UUID for the avatar's own attachments

KittyBarnett · KittyBarnett · commit c1f0f577f6cf · 2024-08-29T14:49:59.000+02:00
diff --git 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()))

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,6 @@ void LLViewerJointAttachment::setupDrawable(LLViewerObject *object)`
`168`	`168`	`//-----------------------------------------------------------------------------`
`169`	`169`	`bool LLViewerJointAttachment::addObject(LLViewerObject* object)`
`170`	`170`	`{`
`171`		`- object->extractAttachmentItemID();`
`172`	`171`
`173`	`172`	`// Same object reattached`
`174`	`173`	`if (isObjectAttached(object))`
`@@ -179,6 +178,8 @@ bool LLViewerJointAttachment::addObject(LLViewerObject* object)`
`179`	`178`	`// re-connect object to the joint correctly`
`180`	`179`	`}`
`181`	`180`
	`181`	`+ object->extractAttachmentItemID();`
	`182`	`+`
`182`	`183`	`// Two instances of the same inventory item attached --`
`183`	`184`	`// Request detach, and kill the object in the meantime.`
`184`	`185`	`if (getAttachedObject(object->getAttachmentItemID()))`