diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-18 07:33:08 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-18 07:33:08 -0400 |
commit | 5eb6cb8d86cf19da79d034df52a0254079f2c95f (patch) | |
tree | cd2853e9c7c2cbf0bce317ca9018a6f4fa46a23f /indra/newview/app_settings/shaders/class1/interface | |
parent | 66c078de5e5a6b685d435f7b1a462d64ca80f35e (diff) | |
parent | 644cbc44871992a95bcd5a6854dfc2a4d56a7b62 (diff) |
merge up latest viewer-development (post mesh)
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/highlightF.glsl | 2 | ||||
-rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/highlightV.glsl | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl index 5ac9e96601..6f821f893d 100644 --- a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl @@ -4,6 +4,8 @@ * $LicenseInfo:firstyear=2007&license=viewerlgpl$ * $/LicenseInfo$ */ + +#version 120 uniform sampler2D diffuseMap; diff --git a/indra/newview/app_settings/shaders/class1/interface/highlightV.glsl b/indra/newview/app_settings/shaders/class1/interface/highlightV.glsl index c5f69c4ad4..d1c98bf70c 100644 --- a/indra/newview/app_settings/shaders/class1/interface/highlightV.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/highlightV.glsl @@ -4,6 +4,8 @@ * $LicenseInfo:firstyear=2007&license=viewerlgpl$ * $/LicenseInfo$ */ + +#version 120 void main() { |