diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-04-29 18:02:45 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-04-29 18:02:45 +0000 |
| commit | 0e0c156bd00a01b38edee803e38b956d4f786701 (patch) | |
| tree | 41dabc7b9c53a17591c8c4d6da93207a52a1b793 /indra/llprimitive/llmaterial.cpp | |
| parent | b08742d0b3e0000430b8ae772c7c4d25cfe084fa (diff) | |
| parent | cc04903379c3a5dc094e0c9582cf41f022406ef5 (diff) | |
Merged in brad/SL-17116-material-messaging (pull request #958)
brad/SL-17116 material messaging
Approved-by: Euclid Linden
Diffstat (limited to 'indra/llprimitive/llmaterial.cpp')
| -rw-r--r-- | indra/llprimitive/llmaterial.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp index a219ac1450..f546ac1645 100644 --- a/indra/llprimitive/llmaterial.cpp +++ b/indra/llprimitive/llmaterial.cpp @@ -331,6 +331,17 @@ void LLMaterial::setAlphaMaskCutoff(U8 cutoff) mAlphaMaskCutoff = cutoff; } +LLUUID LLMaterial::getMaterialID() const +{ + // TODO - not null + return LLUUID::null; +} + +void LLMaterial::setMaterialID(const LLUUID &material_id) +{ + // TODO - set +} + LLSD LLMaterial::asLLSD() const { LLSD material_data; |