diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
index 6f027de6a2306bb70032f72bd9fd461fd9e3306f..7d18ae503664afbe8ee705d5bdf8381be558db63 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
@@ -54,8 +54,7 @@ void main()
 
 	color.rgb = scaleSoftClip(color.rgb);
 
-	gl_FragColor = gl_Color;
-	//gl_FragColor = color;
+	gl_FragColor = color;
 	//gl_FragColor = vec4(1,0,1,1);
 	//gl_FragColor = vec4(1,0,1,1)*shadow;
 	
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index ac599caa5b7535c5b35ae3e279848b8d14943eea..a49cf8781ea9c7f2dbe55399f016d2a69192408d 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1103,7 +1103,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
 		return;
 	}
 
-	if (pass >= 7 && pass <= 9)
+	if (pass >= 7 && pass < 9)
 	{
 		LLGLEnable blend(GL_BLEND);
 
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 220634897e36c30393496a206e52507155e64fd0..1ed8da85a8ab10512a91499bd5fb682f5b428d29 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3418,7 +3418,7 @@ void LLVolumeGeometryManager::getGeometry(LLSpatialGroup* group)
 static LLFastTimer::DeclareTimer FTM_REBUILD_VOLUME_VB("Volume");
 static LLFastTimer::DeclareTimer FTM_REBUILD_VBO("VBO Rebuilt");
 
-LLDrawPoolAvatar* get_avatar_drawpool(LLViewerObject* vobj)
+static LLDrawPoolAvatar* get_avatar_drawpool(LLViewerObject* vobj)
 {
 	LLVOAvatar* avatar = vobj->getAvatar();