diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-08-11 18:16:51 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-08-11 18:16:51 -0600 |
| commit | 3001e3f6454db11ccf3d55d6e871d59e18915d9f (patch) | |
| tree | 77d6400c6d69005f830ddede9ed308b02e9ff8f6 /indra/newview/llviewertexture.h | |
| parent | 610764fbfce75f54c95d4b10c2a8f9482a7a7b80 (diff) | |
| parent | f9cf9179122d06782f0c968ba84adc1e44dd1e21 (diff) | |
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
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) }; |