summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-09-08 15:32:10 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-09-08 15:32:10 +0300
commit81170e9fc138232f94c12a3cdd9e7f10e35868dd (patch)
tree2ad8b8264be05eaf61d51ec756ef99faa3a64049 /indra
parentfa57d7a39b0f531abfb464a42023055eca7c59c4 (diff)
SL-15954 FIXED 'Hide avatars completely' doesn't hide attached animeshes
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lldrawpoolavatar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 687b13d2c8..eb0bd0de4e 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1526,7 +1526,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
}
LLVOAvatar *attached_av = avatarp->getAttachedAvatar();
- if (attached_av && LLVOAvatar::AOA_NORMAL != attached_av->getOverallAppearance())
+ if (attached_av && (LLVOAvatar::AOA_NORMAL != attached_av->getOverallAppearance() || !gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_AVATAR)))
{
// Animesh attachment of a jellydolled or invisible parent - don't show
return;