From d2665cabbfa136a26ba74444ec1f5f72d9911d23 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Thu, 25 Jun 2015 02:15:18 +0200 Subject: [PATCH] - fixed : attaching a rezzed object delays attachment link creation by 5 seconds -> LLSelectNode::mItemID is NULL for a newly created in-world object or the old inventory item UUID if it was rezzed from inventory -> a new inventory UUID will be assigned so there's no use in waiting for an item that will never come (and we should never wait on the NULL UUID) --HG-- branch : Appearance-Misc --- indra/newview/llattachmentsmgr.cpp | 5 +++++ indra/newview/llselectmgr.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp index 813b58931b..1755d29edc 100755 --- a/indra/newview/llattachmentsmgr.cpp +++ b/indra/newview/llattachmentsmgr.cpp @@ -79,6 +79,11 @@ void LLAttachmentsMgr::addAttachmentRequest(const LLUUID& item_id, void LLAttachmentsMgr::onAttachmentRequested(const LLUUID& item_id) { +// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2015-06-24 (Catznip-3.7) + if (item_id.isNull()) + return; +// [/SL:KB] + LLViewerInventoryItem *item = gInventory.getItem(item_id); LL_DEBUGS("Avatar") << "ATT attachment was requested " << (item ? item->getName() : "UNKNOWN") << " id " << item_id << LL_ENDL; diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 69c577f445..616f5d9a90 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -2466,7 +2466,7 @@ void LLSelectMgr::logNoOp(LLSelectNode* node, void *) // static void LLSelectMgr::logAttachmentRequest(LLSelectNode* node, void *) { - LLAttachmentsMgr::instance().onAttachmentRequested(node->mItemID); +// LLAttachmentsMgr::instance().onAttachmentRequested(node->mItemID); } // static