diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-16 09:00:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-16 09:00:39 -0400 |
| commit | b7d4ba1f086e8a318e389add7c17dcb803689a7d (patch) | |
| tree | abd44fe38364125ba5de0ebe260701a1d25c0645 /indra/newview/llviewertexture.h | |
| parent | d1f713f30bd4d42fe4696e25c01ab4532ef3b69b (diff) | |
| parent | c72c3691ecf83875d4ee3e0784b3e76cb4b4633a (diff) | |
merge changes for alpha fixes from geenz
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 }; // |