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/llviewertexturelist.cpp | |
| parent | d1f713f30bd4d42fe4696e25c01ab4532ef3b69b (diff) | |
| parent | c72c3691ecf83875d4ee3e0784b3e76cb4b4633a (diff) | |
merge changes for alpha fixes from geenz
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index b9f5c432d0..8d71761f92 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -119,6 +119,9 @@ void LLViewerTextureList::doPreloadImages() LLTexUnit::sWhiteTexture = LLViewerFetchedTexture::sWhiteImagep->getTexName(); LLUIImageList* image_list = LLUIImageList::getInstance(); + // Set the default flat normal map + LLViewerFetchedTexture::sFlatNormalImagep = LLViewerTextureManager::getFetchedTextureFromFile("flatnormal.tga", MIPMAP_NO, LLViewerFetchedTexture::BOOST_BUMP); + image_list->initFromFile(); // turn off clamping and bilinear filtering for uv picking images |