From 4174e9be5ea6262d7ad27ab64805990fd13670ee Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Thu, 11 Oct 2012 11:51:16 -0700
Subject: Adding an additional conversion constructor.

---
 indra/llprimitive/llmaterialid.cpp | 5 +++++
 indra/llprimitive/llmaterialid.h   | 1 +
 2 files changed, 6 insertions(+)

(limited to 'indra/llprimitive')

diff --git a/indra/llprimitive/llmaterialid.cpp b/indra/llprimitive/llmaterialid.cpp
index 4355a8ea3f..8122b70c2d 100644
--- a/indra/llprimitive/llmaterialid.cpp
+++ b/indra/llprimitive/llmaterialid.cpp
@@ -47,6 +47,11 @@ LLMaterialID::LLMaterialID(const LLSD::Binary& pMaterialID)
 	parseFromBinary(pMaterialID);
 }
 
+LLMaterialID::LLMaterialID(const void* pMemory)
+{
+	set(pMemory);
+}
+
 LLMaterialID::LLMaterialID(const LLMaterialID& pOtherMaterialID)
 {
 	copyFromOtherMaterialID(pOtherMaterialID);
diff --git a/indra/llprimitive/llmaterialid.h b/indra/llprimitive/llmaterialid.h
index 4551550db5..71c6e72478 100644
--- a/indra/llprimitive/llmaterialid.h
+++ b/indra/llprimitive/llmaterialid.h
@@ -35,6 +35,7 @@ public:
 	LLMaterialID();
 	LLMaterialID(const LLSD& pMaterialID);
 	LLMaterialID(const LLSD::Binary& pMaterialID);
+	LLMaterialID(const void* pMemory);
 	LLMaterialID(const LLMaterialID& pOtherMaterialID);
 	~LLMaterialID();
 
-- 
cgit v1.2.3