NORSPEC-82 NORSPEC-85 More UI shenanigans

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;
 }
 
+

indra/llprimitive/llmaterial.h

@@ -52,6 +52,9 @@ class LLMaterial : public LLRefCount
 		SHADER_COUNT = 16
 	} eShaderCount;
 	
+	static const U8			DEFAULT_SPECULAR_LIGHT_EXPONENT = ((U8)(0.2f * 255));
+	static const LLColor4U	DEFAULT_SPECULAR_LIGHT_COLOR;
+
 	LLMaterial();
 	LLMaterial(const LLSD& material_data);
 
@@ -120,3 +123,4 @@ class LLMaterial : public LLRefCount
 typedef LLPointer<LLMaterial> LLMaterialPtr;
 
 #endif // LL_LLMATERIAL_H
+

indra/newview/llpanelface.h

@@ -93,8 +93,8 @@ class LLPanelFace : public LLPanel
 	static void		onCommitMaterialType(		LLUICtrl* ctrl, void* userdata);
 	static void		onCommitBump(			LLUICtrl* ctrl, void* userdata);
 	static void		onCommitTexGen(			LLUICtrl* ctrl, void* userdata);
-	static void		updateShinyControls(		LLUICtrl* ctrl, void* userdata);
-	static void		updateBumpyControls(		LLUICtrl* ctrl, void* userdata);
+	static void		updateShinyControls(		LLUICtrl* ctrl, void* userdata, bool mess_with_combobox = false);
+	static void		updateBumpyControls(		LLUICtrl* ctrl, void* userdata, bool mess_with_combobox = false);
 	static void		onCommitShiny(			LLUICtrl* ctrl, void* userdata);
 	static void		updateAlphaControls(		LLUICtrl* ctrl, void* userdata);
 	static void		onCommitAlphaMode(		LLUICtrl* ctrl, void* userdata);
@@ -134,3 +134,4 @@ class LLPanelFace : public LLPanel
 };
 
 #endif
+