diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-11 11:51:16 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-11 11:51:16 -0700 |
| commit | 4174e9be5ea6262d7ad27ab64805990fd13670ee (patch) | |
| tree | 22ffed3a03bce39c353061ae2fd85e97f2d732ed | |
| parent | 828bfc2adef4ceefa2300fc127250b5b7210fccf (diff) | |
Adding an additional conversion constructor.
| -rw-r--r-- | indra/llprimitive/llmaterialid.cpp | 5 | ||||
| -rw-r--r-- | indra/llprimitive/llmaterialid.h | 1 |
2 files changed, 6 insertions, 0 deletions
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(); |