summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llmaterial.cpp
diff options
context:
space:
mode:
authorGraham Madarasz (Graham) <graham@lindenlab.com>2013-04-08 11:40:10 -0700
committerGraham Madarasz (Graham) <graham@lindenlab.com>2013-04-08 11:40:10 -0700
commit9e3155c368fba6cb877c55ad4e0c90258a6e9ba9 (patch)
tree52b3c33f0964b2ac3276bac75acc235e46c16212 /indra/llprimitive/llmaterial.cpp
parent73aa45d1058724460aa89b14a48ec87ce53a85f4 (diff)
NORSPEC-82 NORSPEC-85 More UI shenanigans
Diffstat (limited to 'indra/llprimitive/llmaterial.cpp')
-rw-r--r--indra/llprimitive/llmaterial.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp
index 7d1ce4ab86..1e92847b38 100644
--- a/indra/llprimitive/llmaterial.cpp
+++ b/indra/llprimitive/llmaterial.cpp
@@ -51,6 +51,8 @@
#define MATERIALS_CAP_ALPHA_MASK_CUTOFF_FIELD "AlphaMaskCutoff"
#define MATERIALS_CAP_DIFFUSE_ALPHA_MODE_FIELD "DiffuseAlphaMode"
+const LLColor4U LLMaterial::DEFAULT_SPECULAR_LIGHT_COLOR = LLColor4U::white;
+
/**
* Materials constants
*/
@@ -99,7 +101,8 @@ LLMaterial::LLMaterial()
, mSpecularRepeatX(.0f)
, mSpecularRepeatY(.0f)
, mSpecularRotation(.0f)
- , mSpecularLightExponent(0)
+ , mSpecularLightColor(LLMaterial::DEFAULT_SPECULAR_LIGHT_COLOR)
+ , mSpecularLightExponent(LLMaterial::DEFAULT_SPECULAR_LIGHT_EXPONENT)
, mEnvironmentIntensity(0)
, mDiffuseAlphaMode(0)
, mAlphaMaskCutoff(0)
@@ -214,3 +217,4 @@ U32 LLMaterial::getShaderMask()
return ret;
}
+