Attaching a rezzed object incorrectly delays attachment link creation by 5 seconds

Author: KittyBarnett

indra/newview/llattachmentsmgr.cpp

@@ -89,6 +89,9 @@ void LLAttachmentsMgr::addAttachmentRequest(const LLUUID& item_id,
 
 void LLAttachmentsMgr::onAttachmentRequested(const LLUUID& item_id)
 {
+    if (item_id.isNull())
+        return;
+
     LLViewerInventoryItem *item = gInventory.getItem(item_id);
     LL_DEBUGS("Avatar") << "ATT attachment was requested "
                         << (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL;

indra/newview/llselectmgr.cpp

@@ -2971,7 +2971,6 @@ void LLSelectMgr::logNoOp(LLSelectNode* node, void *)
 // static
 void LLSelectMgr::logAttachmentRequest(LLSelectNode* node, void *)
 {
-    LLAttachmentsMgr::instance().onAttachmentRequested(node->mItemID);
 }
 
 // static