diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:35:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-05-31 17:35:35 -0400 |
| commit | c0e00cc61750d2b1bba3ada6622023df4725b1a4 (patch) | |
| tree | f0cc704c8af726f27164cb569cc77e6f55e533d2 /indra/llprimitive/llmaterialid.h | |
| parent | e56be73dc646d414c7a10621ac489add6762267b (diff) | |
| parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) | |
merge changes for 5.1.5-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; |