Merge

1 files changed, 13 insertions, 10 deletions

diff --git a/indra/newview/llskinningutil.h b/indra/newview/llskinningutil.h
index 135b25d4d2..ccc501adc0 100644
--- a/indra/newview/llskinningutil.h
+++ b/indra/newview/llskinningutil.h
@@ -30,18 +30,21 @@
 class LLVOAvatar;
 class LLMeshSkinInfo;
 class LLMatrix4a;
+class LLVolumeFace;
 
-class LLSkinningUtil
+namespace LLSkinningUtil
 {
-public:
-    static void initClass();
-    static U32 getMaxJointCount();
-    static U32 getMeshJointCount(const LLMeshSkinInfo *skin);
-    static void scrubInvalidJoints(LLVOAvatar *avatar, LLMeshSkinInfo* skin);
-    static void initSkinningMatrixPalette(LLMatrix4* mat, S32 count, const LLMeshSkinInfo* skin, LLVOAvatar *avatar);
-    static void checkSkinWeights(LLVector4a* weights, U32 num_vertices, const LLMeshSkinInfo* skin);
-    static void scrubSkinWeights(LLVector4a* weights, U32 num_vertices, const LLMeshSkinInfo* skin);
-    static void getPerVertexSkinMatrix(F32* weights, LLMatrix4a* mat, bool handle_bad_scale, LLMatrix4a& final_mat, U32 max_joints);
+    void initClass();
+    U32 getMaxJointCount();
+    U32 getMeshJointCount(const LLMeshSkinInfo *skin);
+    void scrubInvalidJoints(LLVOAvatar *avatar, LLMeshSkinInfo* skin);
+    void initSkinningMatrixPalette(LLMatrix4* mat, S32 count, const LLMeshSkinInfo* skin, LLVOAvatar *avatar);
+    void checkSkinWeights(LLVector4a* weights, U32 num_vertices, const LLMeshSkinInfo* skin);
+    void scrubSkinWeights(LLVector4a* weights, U32 num_vertices, const LLMeshSkinInfo* skin);
+    void getPerVertexSkinMatrix(F32* weights, LLMatrix4a* mat, bool handle_bad_scale, LLMatrix4a& final_mat, U32 max_joints);
+    void initJointNums(LLMeshSkinInfo* skin, LLVOAvatar *avatar);
+    void updateRiggingInfo(const LLMeshSkinInfo* skin, LLVOAvatar *avatar, LLVolumeFace& vol_face);
+	LLQuaternion getUnscaledQuaternion(const LLMatrix4& mat4);
 };
 
 #endif