From d933e6ea73d6ef878e111f67d88a9428b1bd9c20 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Thu, 25 Jun 2015 02:00:10 +0200 Subject: [PATCH] - fixed : don't start creating links to attachments until LLAppearanceMgr::setAttachmentInvLinkEnable has been called --HG-- branch : Appearance-Misc --- indra/newview/llappearancemgr.h | 3 +++ indra/newview/llattachmentsmgr.cpp | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 11f23ba52b..0e814757ad 100755 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -147,6 +147,9 @@ public: // Attachment link management void unregisterAttachment(const LLUUID& item_id); void registerAttachment(const LLUUID& item_id); +// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2015-06-24 (Catznip-3.7) + bool getAttachmentInvLinkEnable() { return mAttachmentInvLinkEnabled; } +// [/SL:KB] void setAttachmentInvLinkEnable(bool val); // Add COF link to individual item. diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp index 2a137cc39b..813b58931b 100755 --- a/indra/newview/llattachmentsmgr.cpp +++ b/indra/newview/llattachmentsmgr.cpp @@ -219,6 +219,13 @@ void LLAttachmentsMgr::requestAttachments(attachments_vec_t& attachment_requests void LLAttachmentsMgr::linkRecentlyArrivedAttachments() { +// [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2015-06-24 (Catznip-3.7) + if (!LLAppearanceMgr::instance().getAttachmentInvLinkEnable()) + { + return; + } +// [/SL:KB] + if (mRecentlyArrivedAttachments.size()) { // One or more attachments have arrived but have not yet been