diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-19 19:56:59 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-19 19:56:59 +0300 |
| commit | 8b8a57a977a407dc1fda052d6a6289b5800f48e8 (patch) | |
| tree | 596a7683290d7aa1a620573062040e3143439c17 /indra/newview/llviewerobject.cpp | |
| parent | d9cdef171a4e33da2d24508a222cb2ae0d32610a (diff) | |
SL-12896 BOM texture settings - replaced isRiggedMesh() call with faster check
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); |