diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-09-18 15:58:54 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-09-18 15:58:54 -0700 |
| commit | d9ad2d3a13b4bb15ab5e56fd04970abc03e100e7 (patch) | |
| tree | 39178dd2b0ab11d754b57b492b4835b926a538c6 /indra/llrender/llshadermgr.h | |
| parent | c8144f7405178621f779b814fd4cb3e632786e0a (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
Merge with 3.6.6-release
Diffstat (limited to 'indra/llrender/llshadermgr.h')
| -rwxr-xr-x | indra/llrender/llshadermgr.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index c049e935b8..3c282bf24f 100755 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -167,11 +167,13 @@ public: DEFERRED_PROJECTION, GLOBAL_GAMMA, - TEXTURE_GAMMA, - + TEXTURE_GAMMA, + SPECULAR_COLOR, ENVIRONMENT_INTENSITY, + DISPLAY_GAMMA, + END_RESERVED_UNIFORMS } eGLSLReservedUniforms; |