From dc733d2c80afecb77ae27bf4f1a9b91510c888fb Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Mon, 5 Oct 2020 14:29:05 +0100
Subject: [PATCH] SL-14046 - jellydoll impostor extents should be based only on
 system avatar

---
 indra/newview/llvoavatar.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index d3a9cebafbd..f45c3c86a12 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
-- 
GitLab