diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-05-31 14:42:17 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-05-31 14:42:17 -0500 |
| commit | 9da4007f85912330a70bc87bfb97cbcf1033e3ab (patch) | |
| tree | 08f94effb0e9ccd8f17bc214f53e62a14a51b405 /indra/newview/app_settings/shaders/class1/interface | |
| parent | fa76b8992c6c636303d398bd25d34c39ae23419e (diff) | |
| parent | ece32418e7c1828a65c88e526a5afcb635c5453a (diff) | |
merge
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, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl index 6f821f893d..f6c6d945de 100644 --- a/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/highlightF.glsl @@ -5,7 +5,7 @@ * $/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 d1c98bf70c..f114f766bf 100644 --- a/indra/newview/app_settings/shaders/class1/interface/highlightV.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/highlightV.glsl @@ -5,7 +5,7 @@ * $/LicenseInfo$ */ -#version 120 + void main() { |