diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-10-16 08:48:50 -0700 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-10-16 08:48:50 -0700 |
| commit | bd9c0a2e658e183bb8a321cdce546f10b6d76afe (patch) | |
| tree | 349b40b0120af086837a44cf7046990568f59a97 /indra/newview/llattachmentsmgr.cpp | |
| parent | 0bfeb74172b172fc3202d67fab04df25e23591b0 (diff) | |
| parent | 71d0603773a0d406560fc6add8a61f7e8d3cdb27 (diff) | |
Merge branch 'DRTVWR-559' into DRTVWR-583
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; |