diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-03-03 17:08:34 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-03-03 17:08:34 -0500 |
| commit | 8169cde890f70320340a08cbfa29d16033572a9b (patch) | |
| tree | 34b9b30dfa010bb6a0b241c1d029d8e0ef3c882f /indra/newview/llattachmentsmgr.cpp | |
| parent | a07127ee7caf4ccdd4137fbecf79b4650decb0c2 (diff) | |
MAINT-4653 WIP
Diffstat (limited to 'indra/newview/llattachmentsmgr.cpp')
| -rwxr-xr-x | indra/newview/llattachmentsmgr.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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(); } |