diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-02-20 17:29:20 +0000 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2018-02-20 17:29:20 +0000 |
| commit | ea4ebc9a1618a64259895232bf624bef37c54577 (patch) | |
| tree | 25e7d5835427f99c85288c1a7a85c04a93d2f1f2 /indra/llprimitive/llmaterialid.cpp | |
| parent | d0811218381cfa9d201d7b72532e19d98bda250a (diff) | |
| parent | 84e5dc37b60a9aa44139084c3d19b29f98527199 (diff) | |
Merged in ruslantproductengine/viewer-cougar-4cr-2 (pull request #5)
MAINT-7847 The presence of certain Avatars stops local specular textures from "sticking". Yes really.
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Approved-by: Simon Linden <simon@lindenlab.com>
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() { } |