From da6635702a7d07ddd3a45090cc74aea671c9a7c0 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 17 Mar 2022 16:26:15 +0200 Subject: 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 --- indra/newview/lldrawpool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') 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; -- cgit v1.2.3