Merge branch 'mccabe-plugins' into plugins_merge

Conflicts:
	linden/doc/contributions.txt
	linden/indra/cmake/GStreamer.cmake
	linden/indra/cmake/LLMedia.cmake
	linden/indra/cmake/OPENAL.cmake
	linden/indra/llmedia/CMakeLists.txt
	linden/indra/llprimitive/material_codes.h
	linden/indra/newview/chatbar_as_cmdline.cpp
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/llviewerwindow.cpp
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/pipeline.cpp
	linden/indra/newview/pipeline.h
	linden/indra/newview/viewer_manifest.py
	linden/install.xml

1 files changed, 3 insertions, 5 deletions

diff --git a/linden/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl b/linden/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
index a8712bc..1c29dae 100644
--- a/linden/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
@@ -11,7 +11,6 @@ uniform sampler2D bumpMap;
 varying vec3 vary_mat0;
 varying vec3 vary_mat1;
 varying vec3 vary_mat2;
-varying vec4 vary_position;
 
 void main() 
 {
@@ -22,8 +21,7 @@ void main()
                                           dot(norm,vary_mat1),
                                           dot(norm,vary_mat2));
                                                 
-        gl_FragData[0].rgb = gl_Color.rgb*col;
-        gl_FragData[1] = vec4(col*(gl_Color.a*1.5), gl_Color.a);
-        gl_FragData[2] = vec4(normalize(tnorm), 0.0);
-        gl_FragData[3] = vary_position;
+        gl_FragData[0] = vec4(gl_Color.rgb*col, 0.0);
+        gl_FragData[1] = vec4(col*gl_Color.a, gl_Color.a);
+        gl_FragData[2] = vec4(normalize(tnorm)*0.5+0.5, 0.0);
 }