diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-04 22:42:16 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-11-04 22:42:16 +0200 |
| commit | 87ef00bf9bca6f543fe059fd82f88918d05a5816 (patch) | |
| tree | 2d99a60430e68daddbdb3828acf80bf6bfd922b5 | |
| parent | 597d777c9f21cefa9f468b6f9040a2cca59dd27d (diff) | |
| parent | 2c2578213eda4b0fe2dc3517d09b152a5e028a38 (diff) | |
Merge branch 'SL-14264' into DRTVWR-507-maint
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index aa775b2bab..b88baf6aa7 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4800,9 +4800,7 @@ LLViewerTexture* LLViewerObject::getBakedTextureForMagicId(const LLUUID& id) } LLVOAvatar* avatar = getAvatar(); - 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 + if (avatar && !isHUDAttachment()) { LLAvatarAppearanceDefines::EBakedTextureIndex texIndex = LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::assetIdToBakedTextureIndex(id); LLViewerTexture* bakedTexture = avatar->getBakedTexture(texIndex); |