diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-06-01 01:18:47 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-06-01 01:18:47 +0300 |
| commit | 9437d1511e2c4b73a58abc823b1ca2a29a8a4d04 (patch) | |
| tree | e6b24dafcbf54d6145a44784ed4defdbbd3335c8 /indra/llprimitive/llmaterialid.h | |
| parent | fadb6c7c65f4d531f513d5d896ca25b9bb22b48f (diff) | |
| parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/llprimitive/llmaterialid.h')
| -rw-r--r-- | indra/llprimitive/llmaterialid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llprimitive/llmaterialid.h b/indra/llprimitive/llmaterialid.h index b4c82d3b7b..ee663f8f99 100644 --- a/indra/llprimitive/llmaterialid.h +++ b/indra/llprimitive/llmaterialid.h @@ -40,6 +40,7 @@ public: LLMaterialID(const LLSD::Binary& pMaterialID); LLMaterialID(const void* pMemory); LLMaterialID(const LLMaterialID& pOtherMaterialID); + LLMaterialID(const LLUUID& lluid); ~LLMaterialID(); bool operator == (const LLMaterialID& pOtherMaterialID) const; |