merge

1 files changed, 9 insertions, 3 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 43a9bd2b2f..33ea0199b6 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -3730,8 +3730,8 @@ U32 LLVOAvatar::renderSkinnedAttachments()
 										LLJoint* joint = getJoint(skin->mJointNames[i]);
 										if (joint)
 										{
-											mat[i] = skin->mInvBindMatrix[i];
-											mat[i] *= joint->getWorldMatrix();
+											mat[i*2+0] = skin->mInvBindMatrix[i];
+											mat[i*2+1] = joint->getWorldMatrix();
 										}
 									}
 									
@@ -3739,6 +3739,10 @@ U32 LLVOAvatar::renderSkinnedAttachments()
 										skin->mJointNames.size(),
 										FALSE,
 										(GLfloat*) mat[0].mMatrix);
+									gSkinnedObjectSimpleProgram.uniformMatrix4fv("matrixPalette[0]", 
+										skin->mJointNames.size(),
+										FALSE,
+										(GLfloat*) mat[0].mMatrix);
 
 									buff->setBuffer(data_mask);
 
@@ -3747,7 +3751,9 @@ U32 LLVOAvatar::renderSkinnedAttachments()
 									S32 offset = face->getIndicesStart();
 									U32 count = face->getIndicesCount();
 
-									buff->drawRange(LLRender::TRIANGLES, start, end, count, offset);
+									glPointSize(8.f);
+									buff->drawRange(LLRender::POINTS, start, end, count, offset);
+									glPointSize(1.f);
 								}
 							}
 						}