diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 64977be82cac4995465139af13732e2d7aebd616..7622f9ad22a9df59b5f9d933f88eac1868fda3de 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 5a4fae1edcf09896d23528c8d3ab3ee265c13233..bce1fc0c0e8a1cf05725e684823937e91e698f04 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