Merge branch 'DRTVWR-559' into DRTVWR-592

1 files changed, 14 insertions, 2 deletions

diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index d43048a8b6..d3fce306bc 100644
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -31,6 +31,7 @@
 #include "llagent.h"
 #include "llappearancemgr.h"
 #include "llinventorymodel.h"
+#include "llstartup.h"
 #include "lltooldraganddrop.h" // pack_permissions_slam
 #include "llviewerinventory.h"
 #include "llviewerregion.h"
@@ -239,6 +240,13 @@ void LLAttachmentsMgr::linkRecentlyArrivedAttachments()
             return;
         }
 
+        if (LLAppearanceMgr::instance().getCOFVersion() == LLViewerInventoryCategory::VERSION_UNKNOWN)
+        {
+            // Wait for cof to load
+            LL_DEBUGS_ONCE("Avatar") << "Received atachments, but cof isn't loaded yet, postponing processing" << LL_ENDL;
+            return;
+        }
+
         LL_DEBUGS("Avatar") << "ATT checking COF linkability for " << mRecentlyArrivedAttachments.size()
                             << " recently arrived items" << LL_ENDL;
 
@@ -372,7 +380,7 @@ void LLAttachmentsMgr::onAttachmentArrived(const LLUUID& inv_item_id)
 {
     LLTimer timer;
     bool expected = mAttachmentRequests.getTime(inv_item_id, timer);
-    if (!expected)
+    if (!expected && LLStartUp::getStartupState() > STATE_WEARABLES_WAIT)
     {
         LLInventoryItem *item = gInventory.getItem(inv_item_id);
         LL_WARNS() << "ATT Attachment was unexpected or arrived after " << MAX_ATTACHMENT_REQUEST_LIFETIME << " seconds: "
@@ -411,11 +419,15 @@ void LLAttachmentsMgr::onDetachCompleted(const LLUUID& inv_item_id)
             LL_DEBUGS("Avatar") << "ATT all detach requests have completed" << LL_ENDL;
         }
     }
-    else
+    else if (!LLApp::isExiting())
     {
         LL_WARNS() << "ATT unexpected detach for "
                    << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;
     }
+    else
+    {
+        LL_DEBUGS("Avatar") << "ATT detach on shutdown for " << (item ? item->getName() : "UNKNOWN") << " " << inv_item_id << LL_ENDL;
+    }
 
     LL_DEBUGS("Avatar") << "ATT detached item flagging as questionable for COF link checking "
                         << (item ? item->getName() : "UNKNOWN") << " id " << inv_item_id << LL_ENDL;