summaryrefslogtreecommitdiff
path: root/indra/llrender/llrender.h
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-07-25 18:26:14 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-07-25 18:26:14 -0400
commitc07f55e605253f2cafbdfba1f7bd267d855d3a5f (patch)
treef1720b985981f249484f41bfa75f534867f79db9 /indra/llrender/llrender.h
parentca5bd96bb0d60c795b78c883e91792d4a68ad2c1 (diff)
parent825fc273ee5167052d811dc058b1834c86e005da (diff)
merging latest viewer-development to mesh merge candidate.
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