diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-09-18 18:50:55 +0000 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-09-18 18:50:55 +0000 |
| commit | 0a5f50597a34c77f3b8904150a4fcb344b6beb27 (patch) | |
| tree | 4b5d8c9e5ca0f65c53d8f4b633ef9f0c9ff87cec | |
| parent | 1f5e07408fff9f5d131230348c22277bb84caade (diff) | |
merge -r132681 from texture-pipeline-4 to fix a flaw of endlessly fetching the default texture.
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 3 |
1 files changed, 1 insertions, 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<LLViewerFetchedTexture> imagep = new LLViewerFetchedTexture(IMG_DEFAULT, TRUE); + LLPointer<LLViewerFetchedTexture> 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); |