- 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
master
Kitty Barnett 2015-06-25 02:15:18 +02:00
parent d933e6ea73
commit d2665cabbf
2 changed files with 6 additions and 1 deletions

View File

@ -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;

View File

@ -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