From 8729f5d23a52263e55df5574c672c87d00b563bd Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Tue, 13 Oct 2015 16:40:39 -0700
Subject: Bandaid for SL-202 Skin weights with joint offsets.

---
 indra/llprimitive/lldaeloader.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/llprimitive')

diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 6ff9613c80..6db6bc4dc7 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -1368,10 +1368,14 @@ void LLDAELoader::processDomModel(LLModel* model, DAE* dae, daeElement* root, do
 				LLMatrix4 newInverse = model->mSkinInfo.mInvBindMatrix[i];
 				newInverse.setTranslation( mJointList[lookingForJoint].getTranslation() );
 				model->mSkinInfo.mAlternateBindMatrix.push_back( newInverse );
-			}
+            }
 			else
 			{
 				LL_WARNS()<<"Possibly misnamed/missing joint [" <<lookingForJoint.c_str()<<" ] "<<LL_ENDL;
+                //SL-202 15-31-10 Placeholders for the collision volume joints to keep array aligned.
+                LLMatrix4 emptyInverse;
+                emptyInverse.setZero();
+                model->mSkinInfo.mAlternateBindMatrix.push_back( emptyInverse );
 			}
 		}
 
-- 
cgit v1.2.3