Merge cleanup.

3 files changed, 23 insertions, 33 deletions

diff --git a/indra/newview/app_settings/shaders/class1/objects/impostorF.glsl b/indra/newview/app_settings/shaders/class1/objects/impostorF.glsl
index 7257132f06..d6946d0de6 100644
--- a/indra/newview/app_settings/shaders/class1/objects/impostorF.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/impostorF.glsl
@@ -5,22 +5,19 @@
  * $/LicenseInfo$
  */
  
-uniform float minimum_alpha;

-uniform float maximum_alpha;

-

-vec3 fullbrightAtmosTransport(vec3 light);

-vec3 fullbrightScaleSoftClip(vec3 light);

-

-uniform sampler2D diffuseMap;

-

-void main()

-{

-	vec4 color = texture2D(diffuseMap,gl_TexCoord[0].xy) * gl_Color;

-	

-	if (color.a < minimum_alpha || color.a > maximum_alpha)

-	{

-		discard;

-	}

-

-	gl_FragColor = color;

-}

+uniform float minimum_alpha;
+uniform float maximum_alpha;
+
+uniform sampler2D diffuseMap;
+
+void main()
+{
+	vec4 color = texture2D(diffuseMap,gl_TexCoord[0].xy);
+	
+	if (color.a < minimum_alpha || color.a > maximum_alpha)
+	{
+		discard;
+	}
+
+	gl_FragColor = color;
+}
diff --git a/indra/newview/app_settings/shaders/class1/objects/impostorV.glsl b/indra/newview/app_settings/shaders/class1/objects/impostorV.glsl
index 724b86a1b7..f1c307c459 100644
--- a/indra/newview/app_settings/shaders/class1/objects/impostorV.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/impostorV.glsl
@@ -5,12 +5,14 @@
  * $/LicenseInfo$
  */
  
- 
+
+
+attribute vec3 position;
+attribute vec2 texcoord0;
+
 void main()
 {
 	//transform vertex
-	gl_Position = ftransform();
-	gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
-	
-	gl_FrontColor = gl_Color;
+	gl_Position = gl_ModelViewProjectionMatrix * vec4(position.xyz, 1.0);
+	gl_TexCoord[0] = gl_TextureMatrix[0] * vec4(texcoord0, 0, 1);
 }
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 082448d95c..f0eb52909d 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -581,11 +581,6 @@ void LLDrawPoolAvatar::beginImpostor()
 
 	gPipeline.enableLightsFullbright(LLColor4(1,1,1,1));
 	sDiffuseChannel = 0;
-
-	if (LLGLSLShader::sNoFixedFunction)
-	{
-		gUIProgram.bind();
-	}
 }
 
 void LLDrawPoolAvatar::endImpostor()
@@ -595,10 +590,6 @@ void LLDrawPoolAvatar::endImpostor()
 		gImpostorProgram.unbind();
 	}
 	gPipeline.enableLightsDynamic();
-	if (LLGLSLShader::sNoFixedFunction)
-	{
-		gUIProgram.unbind();
-	}
 }
 
 void LLDrawPoolAvatar::beginRigid()