diff --git a/doc/contributions.txt b/doc/contributions.txt
index a8deb9c2aeb05de1873bf57897478f8ba5921642..537df59c8cdb5b9d44c2b7f0bfaa0e0cab3d9797 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 c7aa104ca53ee6034a39748118c158fb7889437f..d8491d60ee8b2f2cd7b775fd52c077949cf24348 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;
         }