livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer

master
Ansariel 2021-09-20 12:30:49 +02:00
parent 1bc442ac0b bbd5a9c62b
commit 5ec4c0d022
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -272,6 +272,7 @@ Beq Janus
SL-13583
SL-14766
SL-14927
SL-16021
Beth Walcher
Bezilon Kasei
Biancaluce Robbiani

9
indra/newview/lldrawpoolavatar.cpp
View File

@ -581,14 +581,9 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
}
LLVOAvatar::AvatarOverallAppearance oa = avatarp->getOverallAppearance();
BOOL impostor = !LLPipeline::sImpostorRender && avatarp->isImpostor();
// <FS:Beq> plain old impostors are passing through the shadow pipeline
// if (oa == LLVOAvatar::AOA_INVISIBLE ||
// (impostor && oa == LLVOAvatar::AOA_JELLYDOLL))
// Note: Impostors should not cast shadows, also all JDs are impostor nowadays so we do not need the extra check at all.
if (impostor || (oa == LLVOAvatar::AOA_INVISIBLE) )
// </FS:Beq>
if (impostor || (oa == LLVOAvatar::AOA_INVISIBLE))
{
// No shadows for jellydolled or invisible avs.
// No shadows for impostored (including jellydolled) or invisible avs.
return;
}