diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-04-16 13:43:10 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-04-16 13:43:10 -0700 |
| commit | d8d889802b95af63c64115b1da59d955e274cd27 (patch) | |
| tree | 5ada3fc80606475e0040bfe648df27bcc932c130 /indra/newview/llviewertexture.h | |
| parent | a9f3e6d95c03a469ac6b88e8d0ed4034cb978d88 (diff) | |
| parent | 4b2d6062ba1865f6c89175cf047c3e772bcd03bd (diff) | |
Merge viewer-dev-materials
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 eb30139cb8..ebace4b583 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -596,6 +596,7 @@ public: static LLPointer<LLViewerFetchedTexture> sWhiteImagep; // Texture to show NOTHING (whiteness) static LLPointer<LLViewerFetchedTexture> sDefaultImagep; // "Default" texture for error cases, the only case of fetched texture which is generated in local. static LLPointer<LLViewerFetchedTexture> sSmokeImagep; // Old "Default" translucent texture + static LLPointer<LLViewerFetchedTexture> sFlatNormalImagep; // Flat normal map denoting no bumpiness on a surface }; // |