diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-02 02:18:57 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-06-02 02:18:57 +0300 |
| commit | 1fe32c16fb299c1eb6a47e6860198f07b0c806c4 (patch) | |
| tree | 04a3c93faa058e547140c9d43d15fb9b1467f2a6 /indra/llprimitive/llmaterialid.cpp | |
| parent | 18bb3f6b86b32c4ca22f0466ee175d68969a03fd (diff) | |
| parent | 9437d1511e2c4b73a58abc823b1ca2a29a8a4d04 (diff) | |
Merged in lindenlab/viewer-bear
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() { } |