diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-06-29 11:36:19 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-06-29 11:36:19 -0700 |
| commit | cc73cf15e6c2a361df278cb0b66c4d68c6acfbcd (patch) | |
| tree | 27140b901d74acd106c5fc4c7a96a2e578635347 /indra/newview/app_settings/shaders/class1/interface | |
| parent | 1fbf3e0ec297004879d766cad11c5e9e15b86d4b (diff) | |
| parent | a300902494f76b9542c3978c2ca80726cefbc942 (diff) | |
Merge latest from lindenlab/viewer-development
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() { |