diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-10-04 06:08:09 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-10-04 06:08:09 +0800 |
| commit | a332b8faefef8a044a2409957b415b62d6a85181 (patch) | |
| tree | e76c2d8c9500c700d2d45ea1b4708747854f2f7d /indra/newview/llattachmentsmgr.cpp | |
| parent | bdfd8198eb8fe7128230d562fe37eafac5c52bec (diff) | |
| parent | f352fd1090ce4d50db349cdadfa61d66783a20e8 (diff) | |
Merge tag '6.6.15-release'
source for viewer 6.6.15.581961
Diffstat (limited to 'indra/newview/llattachmentsmgr.cpp')
| -rw-r--r-- | indra/newview/llattachmentsmgr.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp index 1feefc3ef8..d3fce306bc 100644 --- a/indra/newview/llattachmentsmgr.cpp +++ b/indra/newview/llattachmentsmgr.cpp @@ -240,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; |