From a1fcaa38983eb9a497415c9fddf5d1cecde57eb5 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 6 Sep 2021 19:53:43 +0300 Subject: =?UTF-8?q?SL-15944=20Don't=20show=20animeshes=20and=20local=20lig?= =?UTF-8?q?hts=20attached=20to=20the=20avatar=20when=20=20=E2=80=98Hide=20?= =?UTF-8?q?all=20avatars'=20is=20enabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- indra/newview/lldrawpoolavatar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/lldrawpoolavatar.cpp') 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; -- cgit v1.2.3