From c93c38e047836e31dd34e33391a997d883777ae1 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Wed, 21 Mar 2007 19:36:11 +0000
Subject: svn merge -r 59178:59364
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/newview/app_settings/shaders/class2/environment/waterF.glsl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/shaders/class2/environment/waterF.glsl b/indra/newview/app_settings/shaders/class2/environment/waterF.glsl
index e0e79e95ba..11a057b177 100644
--- a/indra/newview/app_settings/shaders/class2/environment/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class2/environment/waterF.glsl
@@ -132,5 +132,7 @@ void main()
    //apply fog
    applyScatter(color.rgb);
    
+   color.a = spec*0.5+fb.a;
+   
    gl_FragColor = color;
 }
-- 
cgit v1.2.3