summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2020-10-05 14:29:05 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2020-10-05 14:29:05 +0100
commitdc733d2c80afecb77ae27bf4f1a9b91510c888fb (patch)
treeeb913874c767343939978062878ebbd3654a1451 /indra
parent8e1dabbc992e9ee74f0ff7a915d53ed070c7ced3 (diff)
SL-14046 - jellydoll impostor extents should be based only on system avatar
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvoavatar.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index d3a9cebafb..f45c3c86a1 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1322,6 +1322,11 @@ void LLVOAvatar::calculateSpatialExtents(LLVector4a& newMin, LLVector4a& newMax)
LL_RECORD_BLOCK_TIME(FTM_AVATAR_EXTENT_UPDATE);
S32 box_detail = gSavedSettings.getS32("AvatarBoundingBoxComplexity");
+ if (getOverallAppearance() != AOA_NORMAL)
+ {
+ // Jellydolls ignore attachments, etc, use only system avatar.
+ box_detail = 1;
+ }
// FIXME the update_min_max function used below assumes there is a
// known starting point, but in general there isn't. Ideally the