From fa1b64bd85956fc58ed6c9c7cc380772f72aaa1b Mon Sep 17 00:00:00 2001 From: Rye Mutt <rye@alchemyviewer.org> Date: Tue, 14 Nov 2023 15:13:50 -0500 Subject: [PATCH] I love when visual studio doesn't save?? --- indra/newview/llviewertexture.h | 1 - indra/newview/llviewertexturelist.cpp | 3 --- 2 files changed, 4 deletions(-) diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 64977be82ca..7622f9ad22a 100644 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -538,7 +538,6 @@ class LLViewerFetchedTexture : public LLViewerTexture static LLPointer<LLViewerFetchedTexture> sSmokeImagep; // Old "Default" translucent texture static LLViewerFetchedTexture* getSmokeImage(); static LLPointer<LLViewerFetchedTexture> sPixieSmallImagep; // Small pixmap for default particle tex - static LLPointer<LLViewerFetchedTexture> sPixieEffectImagep; // Small pixmap for default particle tex // [SL:KB] - Patch: Render-TextureToggle (Catznip-4.0) static LLPointer<LLViewerFetchedTexture> sDefaultDiffuseImagep; // [/SL:KB] diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 5a4fae1edcf..bce1fc0c0e8 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -129,9 +129,6 @@ void LLViewerTextureList::doPreloadImages() // Set the default particle image LLViewerFetchedTexture::sPixieSmallImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c", FTT_LOCAL_FILE, MIPMAP_YES, LLViewerFetchedTexture::BOOST_UI); - // Set the default particle image - LLViewerFetchedTexture::sPixieEffectImagep = LLViewerTextureManager::getFetchedTextureFromFile("PixieSmall.png", FTT_LOCAL_FILE, MIPMAP_YES, LLViewerFetchedTexture::BOOST_UI); - image_list->initFromFile(); // turn off clamping and bilinear filtering for uv picking images -- GitLab