1 files changed, 24 insertions, 0 deletions
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp
index a219ac1450..0ab97a0df3 100644
--- a/indra/llprimitive/llmaterial.cpp
+++ b/indra/llprimitive/llmaterial.cpp
@@ -27,6 +27,7 @@
 #include "linden_common.h"
 
 #include "llmaterial.h"
+#include "llmd5.h"
 
 /**
  * Materials cap parameters
@@ -331,6 +332,17 @@ void LLMaterial::setAlphaMaskCutoff(U8 cutoff)
     mAlphaMaskCutoff = cutoff;
 }
 
+LLUUID LLMaterial::getMaterialID() const
+{
+    // TODO - not null
+    return LLUUID::null;
+}
+
+void LLMaterial::setMaterialID(const LLUUID &material_id)
+{
+    // TODO - set
+}
+
 LLSD LLMaterial::asLLSD() const
 {
     LLSD material_data;
@@ -464,4 +476,16 @@ U32 LLMaterial::getShaderMask(U32 alpha_mode)
     return ret;
 }
 
+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
+    return id;
+}