summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2020-11-04 18:32:26 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2020-11-04 18:32:26 +0000
commit2c2578213eda4b0fe2dc3517d09b152a5e028a38 (patch)
treee2c0aa68ab907e0798ea7a1f776d3628a55aa8a9 /indra/newview
parenta2c8c8238cfb109e0da81363995e08e99173426f (diff)
SL-14264 - BOM texture
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerobject.cpp4
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);