diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-06-05 22:44:04 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-06-05 22:44:04 +0100 |
| commit | 2a2046fd074ffd8df8503e4a7197fd74e006f296 (patch) | |
| tree | 3021be5d3e799221ec260408a806f76aab87a862 /indra/llprimitive/llmaterialid.h | |
| parent | f8b9af0216f98a37b4474219b68cad42eaafeb73 (diff) | |
| parent | 40d4e8b2e6d25a625c7a5ef5dd3e94321d18ce82 (diff) | |
merge
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; |