From eba7eb2d062c43cd83cb6972e4e05dc54d409582 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Sat, 8 Jun 2013 06:28:48 -0700
Subject: NORSPEC-233 fix default value and material apply logic errors

---
 indra/llprimitive/llmaterial.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'indra/llprimitive')

diff --git a/indra/llprimitive/llmaterial.cpp b/indra/llprimitive/llmaterial.cpp
index ce443dea1d..cf4c645cfd 100644
--- a/indra/llprimitive/llmaterial.cpp
+++ b/indra/llprimitive/llmaterial.cpp
@@ -91,16 +91,16 @@ template<> LLUUID getMaterialField(const LLSD& data, const std::string& field, c
 const LLMaterial LLMaterial::null;
 
 LLMaterial::LLMaterial()
-	: mNormalOffsetX(.0f)
-	, mNormalOffsetY(.0f)
-	, mNormalRepeatX(.0f)
-	, mNormalRepeatY(.0f)
-	, mNormalRotation(.0f)
-	, mSpecularOffsetX(.0f)
-	, mSpecularOffsetY(.0f)
-	, mSpecularRepeatX(.0f)
-	, mSpecularRepeatY(.0f)
-	, mSpecularRotation(.0f)
+	: mNormalOffsetX(0.0f)
+	, mNormalOffsetY(0.0f)
+	, mNormalRepeatX(1.0f)
+	, mNormalRepeatY(1.0f)
+	, mNormalRotation(0.0f)
+	, mSpecularOffsetX(0.0f)
+	, mSpecularOffsetY(0.0f)
+	, mSpecularRepeatX(1.0f)
+	, mSpecularRepeatY(1.0f)
+	, mSpecularRotation(0.0f)
 	, mSpecularLightColor(LLMaterial::DEFAULT_SPECULAR_LIGHT_COLOR)
 	, mSpecularLightExponent(LLMaterial::DEFAULT_SPECULAR_LIGHT_EXPONENT)
 	, mEnvironmentIntensity(LLMaterial::DEFAULT_ENV_INTENSITY)
-- 
cgit v1.2.3