diff options
author | Don Kjer <don@lindenlab.com> | 2011-05-17 21:01:36 +0000 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-05-17 21:01:36 +0000 |
commit | 0a86e39d90e06f0a690b1ff5caf2dee5fe347f8f (patch) | |
tree | c0e4f0df907c3f876dafdab3caa83e9356434fa9 /indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl | |
parent | ae8ed3fc2d4a7dda92ad8fdb34bc559478eb9177 (diff) | |
parent | 79459bc9ba8cefa67091e65dd676f50c9ddc612d (diff) |
Merge with viewer-development (mesh)
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl b/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl index 66458ec66d..0dfac84a6e 100644 --- a/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl @@ -4,6 +4,8 @@ * $LicenseInfo:firstyear=2007&license=viewerlgpl$ * $/LicenseInfo$ */ + +#version 120 uniform sampler2D diffuseMap; uniform sampler2D bumpMap; |