diff options
author | Dave Parks <davep@lindenlab.com> | 2011-08-20 15:33:57 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-08-20 15:33:57 -0500 |
commit | 63c420d8ddb7cc738877d2771b1c3b8972a4de09 (patch) | |
tree | 848fa13efb4b23e4661ea865a186c97fc24de021 /indra/newview/llviewertexture.h | |
parent | e18e1375a0dc7993547b5be89fdfc47735d305e4 (diff) | |
parent | 0e496309d6cb7581c9f69b7da244699c382750ac (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewertexture.h')
-rw-r--r-- | indra/newview/llviewertexture.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index c5b8c8923a..de528927b4 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -330,6 +330,7 @@ public: static BOOL sUseTextureAtlas ; static LLPointer<LLViewerTexture> sNullImagep; // Null texture for non-textured objects. + static LLPointer<LLViewerTexture> sBlackImagep; // Texture to show NOTHING (pure black) }; |