diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-19 22:37:41 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-19 22:37:41 +0300 |
| commit | aaaf3189c400e491c6adc533f8b03dfecddb1dd9 (patch) | |
| tree | 57872267bb777945a568574ee19bcda578738d76 /indra/newview/llviewerobject.cpp | |
| parent | 847cce915dd54166ca3b4fd6bfb8b3c697433abf (diff) | |
| parent | b86fdf1c316a49bab69d7ef6b3751565bedf8f59 (diff) | |
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
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 8fe5a55a4f..9c91cde09a 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 && isRiggedMesh() && !isHUDAttachment()) + 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); |