diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-03-17 16:26:15 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-03-17 17:18:05 +0200 |
| commit | da6635702a7d07ddd3a45090cc74aea671c9a7c0 (patch) | |
| tree | a1a29f374343f4adb17a3195d96569b6186818f9 | |
| parent | 6835574363192dc0af8c8abe7f25e5c920202b02 (diff) | |
SL-16907 Crash at updateSkinInfoMatrixPalette
When animesh stops being an animesh it might still be in a list, but will no longer have an avatar
| -rw-r--r-- | indra/newview/lldrawpool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index faa5f71da4..5c291b69fc 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -451,7 +451,7 @@ void LLRenderPass::pushRiggedBatches(U32 type, U32 mask, BOOL texture, BOOL batc LLDrawInfo* pparams = *i; if (pparams) { - if (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash) + if (pparams->mAvatar.notNull() && (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash)) { uploadMatrixPalette(*pparams); lastAvatar = pparams->mAvatar; |