From 0a5f50597a34c77f3b8904150a4fcb344b6beb27 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Fri, 18 Sep 2009 18:50:55 +0000 Subject: merge -r132681 from texture-pipeline-4 to fix a flaw of endlessly fetching the default texture. --- indra/newview/llviewertexture.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index ec82f62a8b..c479a232c5 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -244,7 +244,7 @@ void LLViewerTextureManager::init() LLViewerTexture::sNullImagep = LLViewerTextureManager::getLocalTexture(raw.get(), TRUE) ; #if 1 - LLPointer imagep = new LLViewerFetchedTexture(IMG_DEFAULT, TRUE); + LLPointer imagep = LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT); LLViewerFetchedTexture::sDefaultImagep = imagep; const S32 dim = 128; @@ -273,7 +273,6 @@ void LLViewerTextureManager::init() } imagep->createGLTexture(0, image_raw); image_raw = NULL; - gTextureList.addImage(imagep); LLViewerFetchedTexture::sDefaultImagep->dontDiscard(); #else LLViewerFetchedTexture::sDefaultImagep = LLViewerTextureManager::getFetchedTexture(IMG_DEFAULT, TRUE, TRUE); -- cgit v1.2.3