diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:36:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:36:30 -0400 |
| commit | 176b8861742e3f80eddbf4d15b9cb21390b21088 (patch) | |
| tree | 783fad5e2fdb9737652b791ec4b97ed1eeec35ca /indra/llprimitive/llmaterialid.cpp | |
| parent | d2fa5a53e8b91bd0aba10ab3917c722dc360b610 (diff) | |
| parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) | |
merge changes for 5.1.5-release
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() { } |