diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 20:24:25 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 20:24:25 +0000 |
| commit | 60eaa353a9e6acd9bec032cd408c570c28024e09 (patch) | |
| tree | 123671904c3b349b3f557483a4a98781ce03943a /indra/newview/llviewerobject.cpp | |
| parent | 2c964e82f5ac42fbb86f551783dfb04fcdfaf460 (diff) | |
| parent | 9f0da75332fcbb1bc97812baf67900702d6ced85 (diff) | |
Merged in DV497-merge-6.4.8 (pull request #244)
Merge master 6.4.8 into DRTVWR-497
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 8c4b359754..aa775b2bab 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4800,7 +4800,9 @@ LLViewerTexture* LLViewerObject::getBakedTextureForMagicId(const LLUUID& id) } LLVOAvatar* avatar = getAvatar(); - if (avatar) + if (avatar && !isHUDAttachment() + && isMesh() + && getVolume() && getVolume()->getParams().getSculptID().notNull()) // checking for the rigged mesh by params instead of using isRiggedMesh() to avoid false negatives when skin info isn't ready { LLAvatarAppearanceDefines::EBakedTextureIndex texIndex = LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::assetIdToBakedTextureIndex(id); LLViewerTexture* bakedTexture = avatar->getBakedTexture(texIndex); |