diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-09-12 11:08:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-12 11:08:27 -0500 |
| commit | 3c5e8ded9399dc1419b8596c99f2a1ef9656b7bb (patch) | |
| tree | 84cbb5d1fe96a05e26e982fd85eaa95d3bfa88d4 /indra | |
| parent | 61990bfd6992ca1c4ee2df2795a469f67b085968 (diff) | |
| parent | 264c57831bc6ca9be1c465c10a2558c3d28b936e (diff) | |
Merge branch 'develop' into davep-fix-mac-vb
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llattachmentsmgr.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index de727eec7b..adf8bf868e 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -1597,7 +1597,7 @@ void LLVertexBuffer::setBuffer() if (mMapped) { - LL_WARNS() << "Missing call to unmapBuffer or flushBuffers" << LL_ENDL; + LL_WARNS_ONCE() << "Missing call to unmapBuffer or flushBuffers" << LL_ENDL; _unmapBuffer(); } diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp index deabcd9f42..8b5db2c0fa 100644 --- a/indra/newview/llattachmentsmgr.cpp +++ b/indra/newview/llattachmentsmgr.cpp @@ -465,7 +465,7 @@ bool LLAttachmentsMgr::isAttachmentStateComplete() const // void LLAttachmentsMgr::checkInvalidCOFLinks() { - if (!gInventory.isInventoryUsable()) + if (!gInventory.isInventoryUsable() || mQuestionableCOFLinks.empty()) { return; } |