diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-03-16 00:04:11 +0200 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-03-16 01:18:07 +0200 |
commit | d2a8a3bd53f011b7137717ece39f01b5242bb45a (patch) | |
tree | bff1ee6fef044c87f46fe984d99d3fcd45c7adc5 /indra/newview/lldrawpoolalpha.cpp | |
parent | b75f353903ca5a1ec330291859bfb6ea39b08b6a (diff) |
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.
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
-rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index d4797321bb..f91069185a 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -281,12 +281,7 @@ void LLDrawPoolAlpha::renderDebugAlpha() gHighlightProgram.bind(); gGL.diffuseColor4f(1, 0, 0, 1); - // SL-18964 : The creating of this texture was moved here from LLViewerTextureManager::init() to make the texture transparent before adding to cache - if (!LLViewerFetchedTexture::sSmokeImagep) - { - LLViewerFetchedTexture::sSmokeImagep = LLViewerTextureManager::getFetchedTexture(IMG_SMOKE, FTT_DEFAULT, TRUE, LLGLTexture::BOOST_UI); - LLViewerFetchedTexture::sSmokeImagep->setNoDelete(); - } + LLViewerFetchedTexture::sSmokeImagep->addTextureStats(1024.f * 1024.f); gGL.getTexUnit(0)->bindFast(LLViewerFetchedTexture::sSmokeImagep); |