diff options
| -rwxr-xr-x | indra/newview/llappearancemgr.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/llattachmentsmgr.cpp | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index f8c964cb9a..24169c152b 100755 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -3948,13 +3948,13 @@ void LLAppearanceMgr::registerAttachment(const LLUUID& item_id) void LLAppearanceMgr::unregisterAttachment(const LLUUID& item_id) { LLViewerInventoryItem *item = gInventory.getItem(item_id); - LL_DEBUGS("Avatar") << "unregistering attachment " + LL_DEBUGS("Avatar") << "ATT unregistering attachment " << (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL; gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id); if (mAttachmentInvLinkEnabled) { - LL_DEBUGS("Avatar") << "removing COF link for attachment " + LL_DEBUGS("Avatar") << "ATT removing COF link for attachment " << (item ? item->getName() : "UNKNOWN") << " " << item_id << LL_ENDL; LLAppearanceMgr::removeCOFItemLinks(item_id); } diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp index e64ed6563a..64dcaab6c0 100755 --- a/indra/newview/llattachmentsmgr.cpp +++ b/indra/newview/llattachmentsmgr.cpp @@ -111,10 +111,13 @@ private: LLAttachmentsMgr::attachments_vec_t mToLinkAndAttach; }; +//#define COF_LINK_FIRST + void LLAttachmentsMgr::linkPendingAttachments() { if (mPendingAttachments.size()) { +#ifdef COF_LINK_FIRST LLPointer<LLInventoryCallback> cb = new LLAttachAfterLinkCallback(mPendingAttachments); LLInventoryObject::const_object_list_t inv_items_to_link; LL_DEBUGS("Avatar") << "ATT requesting COF links for " << mPendingAttachments.size() << " object(s):" << LL_ENDL; @@ -135,7 +138,9 @@ void LLAttachmentsMgr::linkPendingAttachments() } } link_inventory_array(LLAppearanceMgr::instance().getCOF(), inv_items_to_link, cb); - +#else + requestAttachments(mPendingAttachments); +#endif mPendingAttachments.clear(); } |