summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2021-09-17 15:29:00 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2021-09-22 17:51:00 +0300
commita68ca665ade56d21a8c939a7e26332f1de413698 (patch)
tree3e2865f2c329e3d999cdf27cf55d02c859e2c235
parent014dd037dde0a93f6c591618e4c111c6b598b60e (diff)
SL-15958 Stop impostored avatars from casting shadows
-rwxr-xr-xdoc/contributions.txt1
-rw-r--r--indra/newview/lldrawpoolavatar.cpp5
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index a8deb9c2ae..537df59c8c 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -271,6 +271,7 @@ Beq Janus
SL-14766
SL-14927
SL-15709
+ SL-16021
Beth Walcher
Bezilon Kasei
Biancaluce Robbiani
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index c7aa104ca5..d8491d60ee 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -583,10 +583,9 @@ void LLDrawPoolAvatar::renderShadow(S32 pass)
}
LLVOAvatar::AvatarOverallAppearance oa = avatarp->getOverallAppearance();
BOOL impostor = !LLPipeline::sImpostorRender && avatarp->isImpostor();
- if (oa == LLVOAvatar::AOA_INVISIBLE ||
- (impostor && oa == LLVOAvatar::AOA_JELLYDOLL))
+ if (impostor || (oa == LLVOAvatar::AOA_INVISIBLE))
{
- // No shadows for jellydolled or invisible avs.
+ // No shadows for impostored (including jellydolled) or invisible avs.
return;
}