1 files changed, 68 insertions, 67 deletions

diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 6d02ad2b96..3cf96a9054 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1165,85 +1165,85 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
 	{ //render rigged attachments
 		if (!avatarp->isVisuallyMuted())
 		{
-			if (pass == 3)
-			{
-				if (is_deferred_render)
-				{
-					renderDeferredRiggedSimple(avatarp);
-				}
-				else
-				{
-					renderRiggedSimple(avatarp);
-				}
-			}
+	if (pass == 3)
+	{
+		if (is_deferred_render)
+		{
+			renderDeferredRiggedSimple(avatarp);
+		}
+		else
+		{
+			renderRiggedSimple(avatarp);
+		}
+	}
 			else if (pass == 4)
-			{
-				if (is_deferred_render)
-				{
-					renderDeferredRiggedBump(avatarp);
-				}
-				else
-				{
-					renderRiggedFullbright(avatarp);
-				}
-			}
+	{
+		if (is_deferred_render)
+		{
+			renderDeferredRiggedBump(avatarp);
+		}
+		else
+		{
+			renderRiggedFullbright(avatarp);
+		}
+	}
 			else if (pass == 5)
-			{
-				renderRiggedShinySimple(avatarp);
-			}
+	{
+		renderRiggedShinySimple(avatarp);
+	}
 			else if (pass == 6)
-			{
-				renderRiggedFullbrightShiny(avatarp);
-			}
+	{
+		renderRiggedFullbrightShiny(avatarp);
+	}
 			else if (pass >= 7 && pass < 9)
-			{
-				if (pass == 7)
-				{
-					renderRiggedAlpha(avatarp);
-				}
+	{
+		if (pass == 7)
+		{
+			renderRiggedAlpha(avatarp);
+		}
 				else if (pass == 8)
-				{
-					renderRiggedFullbrightAlpha(avatarp);
-				}
-			}
+		{
+			renderRiggedFullbrightAlpha(avatarp);
+		}
+	}
 			else if (pass == 9)
-			{
-				renderRiggedGlow(avatarp);
-			}
+	{
+		renderRiggedGlow(avatarp);
+	}
 		}
 	}
 	else
 	{
-		if ((sShaderLevel >= SHADER_LEVEL_CLOTH))
-		{
-			LLMatrix4 rot_mat;
-			LLViewerCamera::getInstance()->getMatrixToLocal(rot_mat);
-			LLMatrix4 cfr(OGL_TO_CFR_ROTATION);
-			rot_mat *= cfr;
+	if ((sShaderLevel >= SHADER_LEVEL_CLOTH))
+	{
+		LLMatrix4 rot_mat;
+		LLViewerCamera::getInstance()->getMatrixToLocal(rot_mat);
+		LLMatrix4 cfr(OGL_TO_CFR_ROTATION);
+		rot_mat *= cfr;
 		
-			LLVector4 wind;
-			wind.setVec(avatarp->mWindVec);
-			wind.mV[VW] = 0;
-			wind = wind * rot_mat;
-			wind.mV[VW] = avatarp->mWindVec.mV[VW];
-
-			sVertexProgram->uniform4fv(LLViewerShaderMgr::AVATAR_WIND, 1, wind.mV);
-			F32 phase = -1.f * (avatarp->mRipplePhase);
-
-			F32 freq = 7.f + (noise1(avatarp->mRipplePhase) * 2.f);
-			LLVector4 sin_params(freq, freq, freq, phase);
-			sVertexProgram->uniform4fv(LLViewerShaderMgr::AVATAR_SINWAVE, 1, sin_params.mV);
-
-			LLVector4 gravity(0.f, 0.f, -CLOTHING_GRAVITY_EFFECT, 0.f);
-			gravity = gravity * rot_mat;
-			sVertexProgram->uniform4fv(LLViewerShaderMgr::AVATAR_GRAVITY, 1, gravity.mV);
-		}
+		LLVector4 wind;
+		wind.setVec(avatarp->mWindVec);
+		wind.mV[VW] = 0;
+		wind = wind * rot_mat;
+		wind.mV[VW] = avatarp->mWindVec.mV[VW];
 
-		if( !single_avatar || (avatarp == single_avatar) )
-		{
-			avatarp->renderSkinned(AVATAR_RENDER_PASS_SINGLE);
-		}
+		sVertexProgram->uniform4fv(LLViewerShaderMgr::AVATAR_WIND, 1, wind.mV);
+		F32 phase = -1.f * (avatarp->mRipplePhase);
+
+		F32 freq = 7.f + (noise1(avatarp->mRipplePhase) * 2.f);
+		LLVector4 sin_params(freq, freq, freq, phase);
+		sVertexProgram->uniform4fv(LLViewerShaderMgr::AVATAR_SINWAVE, 1, sin_params.mV);
+
+		LLVector4 gravity(0.f, 0.f, -CLOTHING_GRAVITY_EFFECT, 0.f);
+		gravity = gravity * rot_mat;
+		sVertexProgram->uniform4fv(LLViewerShaderMgr::AVATAR_GRAVITY, 1, gravity.mV);
 	}
+
+	if( !single_avatar || (avatarp == single_avatar) )
+	{
+		avatarp->renderSkinned(AVATAR_RENDER_PASS_SINGLE);
+	}
+}
 }
 
 void LLDrawPoolAvatar::getRiggedGeometry(LLFace* face, LLPointer<LLVertexBuffer>& buffer, U32 data_mask, const LLMeshSkinInfo* skin, LLVolume* volume, const LLVolumeFace& vol_face)
@@ -1505,7 +1505,8 @@ void LLDrawPoolAvatar::renderRigged(LLVOAvatar* avatar, U32 type, bool glow)
 				
 				stop_glerror();
 
-				LLDrawPoolAvatar::sVertexProgram->uniformMatrix4fv("matrixPalette", 
+				static LLStaticHashedString sMatPalette("matrixPalette");
+				LLDrawPoolAvatar::sVertexProgram->uniformMatrix4fv(sMatPalette, 
 					skin->mJointNames.size(),
 					FALSE,
 					(GLfloat*) mat[0].mMatrix);