From da3002bd0c25cfe922db1e40e46e48de9201501f Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Sun, 12 Feb 2023 13:37:08 +0100 Subject: SL-18964 Move creating of LLViewerFetchedTexture::sSmokeImagep to LLDrawPoolAlpha::renderDebugAlpha() --- indra/newview/llviewertexture.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llviewertexture.cpp') diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index e3ac56d0d3..0d82aced23 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -402,8 +402,12 @@ void LLViewerTextureManager::init() LLViewerFetchedTexture::sDefaultImagep->dontDiscard(); LLViewerFetchedTexture::sDefaultImagep->setCategory(LLGLTexture::OTHER); +#if 0 + // When called first time after clearing cache this call creates (and adds to cache) an opaque texture instead of transparent + // SL-18964 : The creating of this texture was moved to LLDrawPoolAlpha::renderDebugAlpha() LLViewerFetchedTexture::sSmokeImagep = LLViewerTextureManager::getFetchedTexture(IMG_SMOKE, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); LLViewerFetchedTexture::sSmokeImagep->setNoDelete(); +#endif image_raw = new LLImageRaw(32,32,3); data = image_raw->getData(); -- cgit v1.2.3 From d2a8a3bd53f011b7137717ece39f01b5242bb45a Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Thu, 16 Mar 2023 00:04:11 +0200 Subject: SL-18964 Smoke texture can fail to load Debt from SL-18221. Keep init together, after we got the cap; texture should finish loading before it's needed. --- indra/newview/llviewertexture.cpp | 7 ------- 1 file changed, 7 deletions(-) (limited to 'indra/newview/llviewertexture.cpp') diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 0d82aced23..df65fe8fb8 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -402,13 +402,6 @@ void LLViewerTextureManager::init() LLViewerFetchedTexture::sDefaultImagep->dontDiscard(); LLViewerFetchedTexture::sDefaultImagep->setCategory(LLGLTexture::OTHER); -#if 0 - // When called first time after clearing cache this call creates (and adds to cache) an opaque texture instead of transparent - // SL-18964 : The creating of this texture was moved to LLDrawPoolAlpha::renderDebugAlpha() - LLViewerFetchedTexture::sSmokeImagep = LLViewerTextureManager::getFetchedTexture(IMG_SMOKE, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); - LLViewerFetchedTexture::sSmokeImagep->setNoDelete(); -#endif - image_raw = new LLImageRaw(32,32,3); data = image_raw->getData(); -- cgit v1.2.3