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

KittyBarnett · KittyBarnett · commit 241631b92de8 · 2024-08-29T14:50:16.000+02:00
diff --git a/indra/newview/llviewerjointattachment.cpp b/indra/newview/llviewerjointattachment.cpp
@@ -164,7 +164,6 @@ void LLViewerJointAttachment::setupDrawable(LLViewerObject *object)
 //-----------------------------------------------------------------------------
 bool LLViewerJointAttachment::addObject(LLViewerObject* object)
 {
-    object->extractAttachmentItemID();
 
     // Same object reattached
     if (isObjectAttached(object))
@@ -175,6 +174,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
`@@ -164,7 +164,6 @@ void LLViewerJointAttachment::setupDrawable(LLViewerObject *object)`
`164`	`164`	`//-----------------------------------------------------------------------------`
`165`	`165`	`bool LLViewerJointAttachment::addObject(LLViewerObject* object)`
`166`	`166`	`{`
`167`		`- object->extractAttachmentItemID();`
`168`	`167`
`169`	`168`	`// Same object reattached`
`170`	`169`	`if (isObjectAttached(object))`
`@@ -175,6 +174,8 @@ bool LLViewerJointAttachment::addObject(LLViewerObject* object)`
`175`	`174`	`// re-connect object to the joint correctly`
`176`	`175`	`}`
`177`	`176`
	`177`	`+ object->extractAttachmentItemID();`
	`178`	`+`
`178`	`179`	`// Two instances of the same inventory item attached --`
`179`	`180`	`// Request detach, and kill the object in the meantime.`
`180`	`181`	`if (getAttachedObject(object->getAttachmentItemID()))`