SL-18964 Move creating of LLViewerFetchedTexture::sSmokeImagep to LLDrawPoolAlpha::renderDebugAlpha()

2 files changed, 11 insertions, 0 deletions

diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 6c1abb24c9..d4797321bb 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -280,6 +280,13 @@ 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);
 
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();