1 files changed, 26 insertions, 9 deletions

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 4aef6480cb..8d86623665 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -80,13 +80,14 @@
 
 const F32 FORCE_SIMPLE_RENDER_AREA = 512.f;
 const F32 FORCE_CULL_AREA = 8.f;
+static const F32 MINIMUM_RIGGED_RADIUS = 0.05f;
 U32 JOINT_COUNT_REQUIRED_FOR_FULLRIG = 20;
 
 BOOL gAnimateTextures = TRUE;
 //extern BOOL gHideSelectedObjects;
 
 F32 LLVOVolume::sLODFactor = 1.f;
-F32 LLVOVolume::sRiggedFactorMultiplier = 6.f;
+F32 LLVOVolume::sRiggedLODCompensation = 6.5f;
 F32	LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop 
 F32 LLVOVolume::sDistanceFactor = 1.0f;
 S32 LLVOVolume::sNumLODChanges = 0;
@@ -1254,23 +1255,39 @@ BOOL LLVOVolume::calcLOD()
 		}
 
 		// Note: when changing, take note that a lot of rigged meshes have only one LOD.
-		lod_factor *= LLVOVolume::sRiggedFactorMultiplier;
 		distance = avatar->mDrawable->mDistanceWRTCamera;
 		F32 avatar_radius = avatar->getBinRadius();
-		F32 object_radius;
-		if (mDrawable.notNull() && !mDrawable->isDead())
+		F32 object_radius = 0;
+
+		LLDrawable* drawablep = mDrawable.get();
+		while (!drawablep->isRoot())
 		{
-			const LLVector4a* ext = mDrawable->getSpatialExtents();
+			drawablep = drawablep->getParent();
+		}
+
+		// Mesh can consist of multiple objects that have to be treated as one item or we will
+		// get strange deformations or partially missing meshes (smallest elements will disappear)
+		LLSpatialBridge* bridge = drawablep->getSpatialBridge();
+		if (bridge)
+		{
+			const LLVector4a* ext = bridge->getSpatialExtents();
 			LLVector4a diff;
 			diff.setSub(ext[1], ext[0]);
 			object_radius = diff.getLength3().getF32();
 		}
-		else
+
+		if (object_radius <= 0)
 		{
-			object_radius = getVolume() ? getVolume()->mLODScaleBias.scaledVec(getScale()).length() : getScale().length();
+			// bridge missing or somehow not updated
+			const LLVector4a* ext = mDrawable->getSpatialExtents();
+			LLVector4a diff;
+			diff.setSub(ext[1], ext[0]);
+			object_radius = diff.getLength3().getF32();
 		}
-		radius = object_radius * LLVOVolume::sRiggedFactorMultiplier;
-		radius = llmin(radius, avatar_radius);
+
+		// sRiggedLODCompensation is made to compensate for missing lower lods
+		radius = object_radius * LLVOVolume::sRiggedLODCompensation;
+		radius = llclamp(radius, MINIMUM_RIGGED_RADIUS, avatar_radius);
 	}
 	else
 	{