diff options
author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2023-08-14 09:29:58 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-14 09:29:58 -0700 |
commit | 50e2973cd2360dedd6baf1c0772d9d009e2628d4 (patch) | |
tree | 71a86030d3d52045642ea1a21168a2effc98e4f6 /indra/llprimitive/llmaterial.h | |
parent | d8e4572b901b429439f991703f2bc12f81e03901 (diff) | |
parent | 076a02e2d8ddb10856602c3f5f3115ace41327b5 (diff) |
Merge pull request #323 from secondlife/SL-20024
SL-20024: Improve material permissions handling
Diffstat (limited to 'indra/llprimitive/llmaterial.h')
-rw-r--r-- | indra/llprimitive/llmaterial.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llprimitive/llmaterial.h b/indra/llprimitive/llmaterial.h index b46d85c2d1..81f41ddc51 100644 --- a/indra/llprimitive/llmaterial.h +++ b/indra/llprimitive/llmaterial.h @@ -115,8 +115,6 @@ public: void setDiffuseAlphaMode(U8 alpha_mode); U8 getAlphaMaskCutoff() const; void setAlphaMaskCutoff(U8 cutoff); - LLUUID getMaterialID() const; - void setMaterialID(LLUUID const & material_id); bool isNull() const; static const LLMaterial null; |