5 files changed, 23 insertions, 15 deletions
diff --git a/indra/llprimitive/llgltfloader.cpp b/indra/llprimitive/llgltfloader.cpp
index 6041c9c273..fd304f7bc9 100644
--- a/indra/llprimitive/llgltfloader.cpp
+++ b/indra/llprimitive/llgltfloader.cpp
@@ -167,7 +167,7 @@ bool LLGLTFLoader::parseMeshes()
 bool LLGLTFLoader::populateModelFromMesh(LLModel* pModel, const tinygltf::Mesh &mesh)
 {
     pModel->mLabel = mesh.name;
-    int pos_idx, norm_idx, tan_idx, uv0_idx, uv1_idx, color0_idx, color1_idx;
+    int pos_idx;
     tinygltf::Accessor indices_a, positions_a, normals_a, uv0_a, color0_a;
 
     auto prims = mesh.primitives;
@@ -187,12 +187,15 @@ bool LLGLTFLoader::populateModelFromMesh(LLModel* pModel, const tinygltf::Mesh &
             //if (positions_buf.name
         }
 
+#if 0
+        int norm_idx, tan_idx, uv0_idx, uv1_idx, color0_idx, color1_idx;
         norm_idx = (prim.attributes.count("NORMAL") > 0) ? prim.attributes.at("NORMAL") : -1;
         tan_idx = (prim.attributes.count("TANGENT") > 0) ? prim.attributes.at("TANGENT") : -1;
         uv0_idx = (prim.attributes.count("TEXCOORDS_0") > 0) ? prim.attributes.at("TEXCOORDS_0") : -1;
         uv1_idx = (prim.attributes.count("TEXCOORDS_1") > 0) ? prim.attributes.at("TEXCOORDS_1") : -1;
         color0_idx = (prim.attributes.count("COLOR_0") > 0) ? prim.attributes.at("COLOR_0") : -1;
         color1_idx = (prim.attributes.count("COLOR_1") > 0) ? prim.attributes.at("COLOR_1") : -1;
+#endif
 
         if (prim.mode == TINYGLTF_MODE_TRIANGLES)
         {
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h
index 89c7f75c44..a3e0c0d9ca 100644
--- a/indra/llprimitive/llgltfmaterial.h
+++ b/indra/llprimitive/llgltfmaterial.h
@@ -33,7 +33,7 @@
 #include "v3color.h"
 #include "v2math.h"
 #include "lluuid.h"
-#include "llmd5.h"
+#include "hbxxh.h"
 
 #include <string>
 
@@ -118,12 +118,10 @@ public:
     LLUUID getHash() const
     {
         LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
-        LLMD5 md5;
-        md5.update((unsigned char*)this, sizeof(this));
-        md5.finalize();
-        LLUUID id;
-        md5.raw_digest(id.mData);
-        return id;
+        // HACK - hash the bytes of this object but don't include the ref count
+        LLUUID hash;
+        HBXXH128::digest(hash, (unsigned char*)this + sizeof(S32), sizeof(this) - sizeof(S32));
+        return hash;
     }
 
     //setters for various members (will clamp to acceptable ranges)
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp
index 0ab97a0df3..a694a666c6 100644
--- a/indra/llprimitive/llmaterial.cpp
+++ b/indra/llprimitive/llmaterial.cpp
@@ -27,7 +27,7 @@
 #include "linden_common.h"
 
 #include "llmaterial.h"
-#include "llmd5.h"
+#include "hbxxh.h"
 
 /**
  * Materials cap parameters
@@ -479,13 +479,9 @@ U32 LLMaterial::getShaderMask(U32 alpha_mode)
 LLUUID LLMaterial::getHash() const
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
-    LLMD5 md5;
     // HACK - hash the bytes of this LLMaterial, but trim off the S32 in LLRefCount
-    md5.update((unsigned char*)this + sizeof(S32), sizeof(this) - sizeof(S32));
-    md5.finalize();
     LLUUID id;
-    md5.raw_digest(id.mData);
-    // *TODO: Hash the overrides
+    HBXXH128::digest(id, (unsigned char*)this + sizeof(S32), sizeof(this) - sizeof(S32));
     return id;
 }
 
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 52fb8e3802..dba4bee6e2 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1429,6 +1429,16 @@ LLMeshSkinInfo::LLMeshSkinInfo(LLSD& skin):
 	fromLLSD(skin);
 }
 
+LLMeshSkinInfo::LLMeshSkinInfo(const LLUUID& mesh_id, LLSD& skin) :
+	mMeshID(mesh_id),
+	mPelvisOffset(0.0),
+	mLockScaleIfJointPosition(false),
+	mInvalidJointsScrubbed(false),
+	mJointNumsInitialized(false)
+{
+	fromLLSD(skin);
+}
+
 void LLMeshSkinInfo::fromLLSD(LLSD& skin)
 {
 	if (skin.has("joint_names"))
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index 2aaaa4e8c1..4505d6b3b9 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -41,12 +41,13 @@ class domMesh;
 #define MAX_MODEL_FACES 8
 
 LL_ALIGN_PREFIX(16)
-class LLMeshSkinInfo 
+class LLMeshSkinInfo : public LLRefCount
 {
     LL_ALIGN_NEW
 public:
 	LLMeshSkinInfo();
 	LLMeshSkinInfo(LLSD& data);
+	LLMeshSkinInfo(const LLUUID& mesh_id, LLSD& data);
 	void fromLLSD(LLSD& data);
 	LLSD asLLSD(bool include_joints, bool lock_scale_if_joint_position) const;
     void updateHash();