diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:26:28 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-25 09:26:28 -0400 |
| commit | 66cac05cfb1236c3c1607dff27babf873c29a679 (patch) | |
| tree | 64a5eee7cf984098a5614563a9f5ad49b520fa17 /indra/newview/llviewertexture.h | |
| parent | bf906ac9264e21d622e4ce867c40dd53a0da6013 (diff) | |
| parent | 2434a39c252ce895e7c659f42c54b9142ad859c2 (diff) | |
merge changes for storm-1570
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) }; |