summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2020-10-19 16:10:30 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2020-10-19 16:10:30 +0100
commitb6b3e30df3c3990c41d7091ae25d456b3bc806a2 (patch)
treea5caa2191bf04ff017205d2407088d54845d5102 /indra/newview/lldrawpoolavatar.cpp
parent96f4571f4c8c22c938f349ca1dc4728d49ba3353 (diff)
parent9618df484b7659ed84285a9c16939b384dbe616c (diff)
merge
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
-rw-r--r--indra/newview/lldrawpoolavatar.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 11f7809574..8abec252a1 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -574,7 +574,7 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
return;
}
LLVOAvatar::AvatarOverallAppearance oa = avatarp->getOverallAppearance();
- BOOL impostor = avatarp->isImpostor();
+ BOOL impostor = !LLPipeline::sImpostorRenderAVVO && avatarp->isImpostor();
if (oa == LLVOAvatar::AOA_INVISIBLE ||
(impostor && oa == LLVOAvatar::AOA_JELLYDOLL))
{
@@ -1511,7 +1511,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
return;
}
- BOOL impostor = avatarp->isImpostor() && !single_avatar;
+ BOOL impostor = !LLPipeline::sImpostorRenderAVVO && avatarp->isImpostor() && !single_avatar;
if (( avatarp->isInMuteList()
|| impostor