From 45b5060e09e748fdae77bc1bd7cb15c15a44c8c4 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 11 Nov 2017 21:33:14 +0100
Subject: [PATCH] Pull fix for MAINT-MAINT-6125 - Mesh avatar deforms
 constantly

---
 indra/newview/llvovolume.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index fd209b039a..1e7db7bda1 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1930,6 +1930,12 @@ BOOL LLVOVolume::updateGeometry(LLDrawable *drawable)
 		dirtySpatialGroup(drawable->isState(LLDrawable::IN_REBUILD_Q1));
 		compiled = TRUE;
 		lodOrSculptChanged(drawable, compiled);
+		// <FS:Ansariel> Pull fix for MAINT-MAINT-6125 - Mesh avatar deforms constantly
+		if(drawable->isState(LLDrawable::REBUILD_RIGGED | LLDrawable::RIGGED)) 
+		{
+			updateRiggedVolume(false);
+		}
+		// </FS:Ansariel>
 		genBBoxes(FALSE);
 	}
 	// it has its own drawable (it's moved) or it has changed UVs or it has changed xforms from global<->local