From 405182025d100b54c5e7f1612bb42b50faa70ad1 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Fri, 21 Oct 2011 21:46:35 -0500 Subject: [PATCH] Resolved warning about 8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c not being found. Also renamed it to transparent.j2c because I hate seeing local textures with uuid filenames... and because v2 renamed it too. --- indra/newview/llviewertexturelist.cpp | 2 +- .../textures/transparent.j2c} | Bin .../8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c | Bin 172 -> 0 bytes .../8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c | Bin 172 -> 0 bytes 4 files changed, 1 insertion(+), 1 deletion(-) rename indra/newview/skins/{darkorange/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c => default/textures/transparent.j2c} (100%) delete mode 100644 indra/newview/skins/kdarknv/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c delete mode 100644 indra/newview/skins/kliteat/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 5de2a805e..36370137e 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -159,7 +159,7 @@ void LLViewerTextureList::doPreloadImages() image->setAddressMode(LLTexUnit::TAM_WRAP); mImagePreloads.insert(image); } - image = LLViewerTextureManager::getFetchedTextureFromFile("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c"/*"transparent.j2c"*/, MIPMAP_YES, LLViewerFetchedTexture::BOOST_UI, LLViewerTexture::FETCHED_TEXTURE, + image = LLViewerTextureManager::getFetchedTextureFromFile("transparent.j2c", MIPMAP_YES, LLViewerFetchedTexture::BOOST_UI, LLViewerTexture::FETCHED_TEXTURE, 0,0,LLUUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903")); if (image) { diff --git a/indra/newview/skins/darkorange/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c b/indra/newview/skins/default/textures/transparent.j2c similarity index 100% rename from indra/newview/skins/darkorange/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c rename to indra/newview/skins/default/textures/transparent.j2c diff --git a/indra/newview/skins/kdarknv/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c b/indra/newview/skins/kdarknv/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c deleted file mode 100644 index 1068e940b9237289d148851aa5394c97afff506b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmezG|38qyhyer?pcupk0R<=qu^AXx*cln&=zkCc4^WJek(Gsof#H7)gR)Y&TscEI zL)oKzhJ1#+N9jI5m=eGYgs$P2fH3iY3WFd6qjzF