diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-16 13:49:35 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-16 13:49:35 -0400 |
| commit | 8379df21bce877897aec6c56f170b6e2ad11c7be (patch) | |
| tree | 908e3940d8c9624b1b0591567a35b2314ed6277c /indra/newview/llviewertexturelist.cpp | |
| parent | 6c61a537918b5cc73336885f8bdd34943fda2482 (diff) | |
| parent | f99cf295e1d7e297996d4ea32a2202273010d8a3 (diff) | |
merged .hgtags
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index d24174adea..30ef8b8a29 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -115,7 +115,7 @@ void LLViewerTextureList::doPreloadImages() // Set the "white" image LLViewerFetchedTexture::sWhiteImagep = LLViewerTextureManager::getFetchedTextureFromFile("white.tga", MIPMAP_NO, LLViewerFetchedTexture::BOOST_UI); - + LLTexUnit::sWhiteTexture = LLViewerFetchedTexture::sWhiteImagep->getTexName(); LLUIImageList* image_list = LLUIImageList::getInstance(); image_list->initFromFile(); |