summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolavatar.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2020-11-04 16:07:10 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2020-11-04 16:07:10 +0000
commitc79e648aac9bb32cc1d49d39973b5e96f25828f0 (patch)
treec715b4cf107cdf0e9d177857510a7a81010f0581 /indra/newview/lldrawpoolavatar.cpp
parent8b9ed94a35d7e1cc3ced562eb9e6d303ce016ec6 (diff)
SL-14015 - possible fix for phantom animesh attachments on mac
Diffstat (limited to 'indra/newview/lldrawpoolavatar.cpp')
-rw-r--r--indra/newview/lldrawpoolavatar.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index ff036e1934..e2ca9e4097 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1526,6 +1526,13 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
return;
}
+ LLVOAvatar *attached_av = avatarp->getAttachedAvatar();
+ if (attached_av && LLVOAvatar::AOA_NORMAL != attached_av->getOverallAppearance())
+ {
+ // Animesh attachment of a jellydolled or invisible parent - don't show
+ return;
+ }
+
if (pass == 0)
{
if (!LLPipeline::sReflectionRender)