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/llrender/llrender.h | |
parent | 1fbf3e0ec297004879d766cad11c5e9e15b86d4b (diff) | |
parent | a300902494f76b9542c3978c2ca80726cefbc942 (diff) |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/llrender/llrender.h')
-rw-r--r-- | indra/llrender/llrender.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index 7ba14f7b40..41e7b35341 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -57,6 +57,7 @@ public: TT_TEXTURE = 0, // Standard 2D Texture TT_RECT_TEXTURE, // Non power of 2 texture TT_CUBE_MAP, // 6-sided cube map texture + TT_MULTISAMPLE_TEXTURE, // see GL_ARB_texture_multisample TT_NONE // No texture type is currently enabled } eTextureType; |