summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmaterialid.h
diff options
context:
space:
mode:
authorruslantproductengine <ruslantproductengine@lindenlab.com>2018-02-14 20:52:31 +0200
committerruslantproductengine <ruslantproductengine@lindenlab.com>2018-02-14 20:52:31 +0200
commit84e5dc37b60a9aa44139084c3d19b29f98527199 (patch)
tree56a067c64941f15e9a48d30f226c3444d62d6b9b /indra/llprimitive/llmaterialid.h
parentcc30a9e2f5b9410dcdf323d3ecdd3f6f1e2985db (diff)
MAINT-7847 The presence of certain Avatars stops local specular textures from "sticking". Yes really.
FIXED. Allows set material explicitly to material manager.
Diffstat (limited to 'indra/llprimitive/llmaterialid.h')
-rw-r--r--indra/llprimitive/llmaterialid.h1
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;