summaryrefslogtreecommitdiff
path: root/indra/llrender/llrender.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-10 17:53:11 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-08-10 17:53:11 -0400
commit6732f5fbca2dc83ec1cf6fcb31b5a6657e8d040f (patch)
tree48165a2aa3aed2133d1d79742e3d64cce3ca2b01 /indra/llrender/llrender.h
parent20c3d8485480487d38500c9b18846ca96d1d6f83 (diff)
parentc7b6a25728cd360348d1c3da5ace0971767206a4 (diff)
merge viewer-development to mesh-development
Diffstat (limited to 'indra/llrender/llrender.h')
-rw-r--r--indra/llrender/llrender.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 41e7b35341..9eedebe2ce 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -52,6 +52,8 @@ class LLTexUnit
{
friend class LLRender;
public:
+ static U32 sWhiteTexture;
+
typedef enum
{
TT_TEXTURE = 0, // Standard 2D Texture