diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-05-31 11:49:27 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-05-31 11:49:27 -0700 |
| commit | bd84cbfa11fbe2b3aa5ceba5978841310488b8e4 (patch) | |
| tree | cd4ddab644af5f7a560a4ee53db9d36033e8e0ad /indra/llprimitive/llmaterialid.cpp | |
| parent | 460d944b082ae73bbad3cf1d72a47ffa88970fb9 (diff) | |
| parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) | |
Merge
Diffstat (limited to 'indra/llprimitive/llmaterialid.cpp')
| -rw-r--r-- | indra/llprimitive/llmaterialid.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llprimitive/llmaterialid.cpp b/indra/llprimitive/llmaterialid.cpp index 820f62c43c..f88a607c4f 100644 --- a/indra/llprimitive/llmaterialid.cpp +++ b/indra/llprimitive/llmaterialid.cpp @@ -61,6 +61,11 @@ LLMaterialID::LLMaterialID(const LLMaterialID& pOtherMaterialID) copyFromOtherMaterialID(pOtherMaterialID); } +LLMaterialID::LLMaterialID(const LLUUID& lluid) +{ + set(lluid.mData); +} + LLMaterialID::~LLMaterialID() { } |