summaryrefslogtreecommitdiff
path: root/indra/llrender/llrender.h
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2011-06-21 18:29:50 -0400
committerLogan Dethrow <log@lindenlab.com>2011-06-21 18:29:50 -0400
commitd5ea63119d1cc848318dbeeaa42e9ce3b777ee51 (patch)
tree4b5403406184c8e7635ccb989a2dfceb46f95693 /indra/llrender/llrender.h
parent20100ba38c6d3fa16ab11be2ed326ab0964c4c21 (diff)
parentede3b577d8cebd5065514bb485e2cbd93dd5b05a (diff)
Merge
Diffstat (limited to 'indra/llrender/llrender.h')
-rw-r--r--indra/llrender/llrender.h1
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;