diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-06-05 23:21:30 +0530 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-06-05 23:21:30 +0530 |
| commit | 6e1cbd04b43ad779afcd562cdaefe8a8c179ed06 (patch) | |
| tree | 2cb1b5ba8ab5d73f9d96bc804bdb006afda6a7f6 /indra/llprimitive/llmaterialid.cpp | |
| parent | 809e5563db244a8d1af617b6dcf90f3eebb7f691 (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() { } |