summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmaterial.h
diff options
context:
space:
mode:
authorBrad Kittenbrink <brad@lindenlab.com>2022-04-29 18:02:45 +0000
committerEuclid Linden <euclid@lindenlab.com>2022-04-29 18:02:45 +0000
commit0e0c156bd00a01b38edee803e38b956d4f786701 (patch)
tree41dabc7b9c53a17591c8c4d6da93207a52a1b793 /indra/llprimitive/llmaterial.h
parentb08742d0b3e0000430b8ae772c7c4d25cfe084fa (diff)
parentcc04903379c3a5dc094e0c9582cf41f022406ef5 (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.h')
-rw-r--r--indra/llprimitive/llmaterial.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llprimitive/llmaterial.h b/indra/llprimitive/llmaterial.h
index d58b7ee812..2f8aafc2cf 100644
--- a/indra/llprimitive/llmaterial.h
+++ b/indra/llprimitive/llmaterial.h
@@ -27,8 +27,6 @@
#ifndef LL_LLMATERIAL_H
#define LL_LLMATERIAL_H
-#include <boost/shared_ptr.hpp>
-
#include "llmaterialid.h"
#include "llsd.h"
#include "v4coloru.h"
@@ -54,8 +52,6 @@ public:
ALPHA_SHADER_COUNT = 4
} eShaderCount;
-
-
static const U8 DEFAULT_SPECULAR_LIGHT_EXPONENT = ((U8)(0.2f * 255));
static const LLColor4U DEFAULT_SPECULAR_LIGHT_COLOR;
static const U8 DEFAULT_ENV_INTENSITY = 0;
@@ -119,6 +115,8 @@ 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;