summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2025-01-30 00:13:12 +0100
committerAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2026-03-15 21:55:33 +0200
commit5bc81c9decd000d0218d80319f1fa307c0acb7f4 (patch)
treed7fbbacf475a4e06274e95435173f7d85d4a83c6
parentf6d0b361d5b79ef023506f95e4ed6f8f2ebdc1dd (diff)
Attaching a rezzed object incorrectly delays attachment link creation by 5 seconds
-rw-r--r--indra/newview/llattachmentsmgr.cpp3
-rw-r--r--indra/newview/llselectmgr.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index e27d6fb1f5..f73d4241c9 100644
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/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;
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 415e6cfa72..1b64eab3c0 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -3054,7 +3054,6 @@ void LLSelectMgr::logNoOp(LLSelectNode* node, void *)
// static
void LLSelectMgr::logAttachmentRequest(LLSelectNode* node, void *)
{
- LLAttachmentsMgr::instance().onAttachmentRequested(node->mItemID);
}
// static