1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index bcd1ee57db..4e3e49ec9f 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -97,7 +97,7 @@ void LLModel::offsetMesh(const LLVector3& pivotPoint)
 
     for (LLVolumeFace& face : mVolumeFaces)
     {
-        for (U32 i = 0; i < face.mNumVertices; ++i)
+        for (S32 i = 0; i < face.mNumVertices; ++i)
         {
             face.mPositions[i].add(pivot);
         }
@@ -1543,6 +1543,13 @@ void LLMeshSkinInfo::fromLLSD(LLSD& skin)
         mLockScaleIfJointPosition = false;
     }
 
+    // combine mBindShapeMatrix and mInvBindMatrix into mBindPoseMatrix
+    mBindPoseMatrix.resize(mInvBindMatrix.size());
+    for (U32 i = 0; i < mInvBindMatrix.size(); ++i)
+    {
+        matMul(mBindShapeMatrix, mInvBindMatrix[i], mBindPoseMatrix[i]);
+    }
+
     updateHash();
 }