diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-03-21 19:36:11 +0000 |
| commit | c93c38e047836e31dd34e33391a997d883777ae1 (patch) | |
| tree | ccb52c02f9a3bfeb76254e128abc250e7fd5a962 /indra/newview/app_settings/shaders/class2/environment/waterF.glsl | |
| parent | fceae96eb171be0396512e251aab311d4e3ef9cc (diff) | |
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/environment/waterF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/environment/waterF.glsl | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |