diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-17 17:32:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-17 17:32:28 -0400 |
| commit | 068c6d45099411d7827db3e50d9c91331fa5c189 (patch) | |
| tree | c46cce78e6db0d87c1d9b0da9229ea0cf1d727de /indra/newview/app_settings/shaders/class1/interface | |
| parent | 5e5be51edebf0fb6a59d4907c9fcaac1b1667ac4 (diff) | |
| parent | 806b11c5720e1bd9e9764fcfd896436b8385e8b2 (diff) | |
merge mesh branch changes (storm-1390)
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() { |