diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-15 11:41:00 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-15 11:41:00 -0400 |
commit | 402a2de7651105d63693deb2872dd6646dd1bd85 (patch) | |
tree | 5b0935f876e954a024227355c34a2c23eebe1b8d /indra/llrender/llrender.h | |
parent | 60d15f78e17a2203d73d58c3f1c2af941d599277 (diff) | |
parent | 6b70273603e4aa807662c301179d05a1f2f5a224 (diff) |
merging latest viewer-mesh into nyx's sidebranch
Diffstat (limited to 'indra/llrender/llrender.h')
-rw-r--r-- | indra/llrender/llrender.h | 2 |
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 |