diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index e10880ecc..73583c769 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -53,7 +53,7 @@ //note: there is no good to define 1024 for TEXTURE_CACHE_ENTRY_SIZE while FIRST_PACKET_SIZE is 600 on sim side. const S32 TEXTURE_CACHE_ENTRY_SIZE = FIRST_PACKET_SIZE;//1024; -const S64 TEXTURE_PURGED_CACHE_SIZE = 80; // % amount of cache left after a purge. +const F32 TEXTURE_CACHE_PURGE_AMOUNT = .20f; // % amount to reduce the cache by when it exceeds its limit const F32 TEXTURE_CACHE_LRU_SIZE = .10f; // % amount for LRU list (low overhead to regenerate) class LLTextureCacheWorker : public LLWorkerClass @@ -250,9 +250,9 @@ bool LLTextureCacheLocalFileWorker::doRead() } } #else - if (!mDataSize || mDataSize > local_size - mOffset) + if (!mDataSize || mDataSize > local_size/* - mOffset*/) { - mDataSize = local_size - mOffset; + mDataSize = local_size/* - mOffset*/; } mReadData = new U8[mDataSize]; @@ -372,9 +372,9 @@ bool LLTextureCacheRemoteWorker::doRead() if (!done && (mState == LOCAL)) { llassert(local_size != 0); // we're assuming there is a non empty local file here... - if (!mDataSize || mDataSize > local_size - mOffset) + if (!mDataSize || mDataSize > local_size/* - mOffset*/) { - mDataSize = local_size - mOffset; + mDataSize = local_size/* - mOffset*/; } // Allocate read buffer mReadData = new U8[mDataSize]; @@ -817,7 +817,7 @@ std::string LLTextureCache::getLocalFileName(const LLUUID& id) // Does not include extension std::string idstr = id.asString(); // TODO: should we be storing cached textures in skin directory? - std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "default", "textures", idstr); + std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_LOCAL_ASSETS, idstr); return filename; } @@ -833,7 +833,9 @@ std::string LLTextureCache::getTextureFileName(const LLUUID& id) BOOL LLTextureCache::isInCache(const LLUUID& id) { LLMutexLock lock(&mHeaderMutex); - return (mHeaderIDMap.find(id) != mHeaderIDMap.end()); + id_map_t::const_iterator iter = mHeaderIDMap.find(id); + + return (iter != mHeaderIDMap.end()) ; } //debug @@ -1614,7 +1616,7 @@ void LLTextureCache::purgeTextures(bool validate) } S64 cache_size = mTexturesSizeTotal; - S64 purged_cache_size = (TEXTURE_PURGED_CACHE_SIZE * sCacheMaxTexturesSize) / (S64)100; + S64 purged_cache_size = (sCacheMaxTexturesSize * (S64)((1.f-TEXTURE_CACHE_PURGE_AMOUNT)*100)) / 100; S32 purge_count = 0; for (time_idx_set_t::iterator iter = time_idx_set.begin(); iter != time_idx_set.end(); ++iter) @@ -1952,8 +1954,22 @@ void LLTextureCache::removeCachedTexture(const LLUUID& id) //called after mHeaderMutex is locked. void LLTextureCache::removeEntry(S32 idx, Entry& entry, std::string& filename, bool remove_file) { - if (idx >= 0) //valid entry + bool file_maybe_exists = true; // Always attempt to remove when idx is invalid. + + if(idx >= 0) //valid entry + { + if (entry.mBodySize == 0) // Always attempt to remove when mBodySize > 0. { + if (LLAPRFile::isExist(filename)) // Sanity check. Shouldn't exist when body size is 0. + { + LL_WARNS("TextureCache") << "Entry has body size of zero but file " << filename << " exists. Deleting this file, too." << LL_ENDL; + } + else + { + file_maybe_exists = false; + } + } + entry.mImageSize = -1; entry.mBodySize = 0; mHeaderIDMap.erase(entry.mID); @@ -1963,7 +1979,7 @@ void LLTextureCache::removeEntry(S32 idx, Entry& entry, std::string& filename, b mFreeList.insert(idx); } - if (remove_file && LLAPRFile::isExist(filename)) + if (remove_file && file_maybe_exists) { LLAPRFile::remove(filename); } diff --git a/indra/newview/skins/default/textures/0187babf-6c0d-5891-ebed-4ecab1426683.j2c b/indra/newview/local_assets/0187babf-6c0d-5891-ebed-4ecab1426683.j2c similarity index 100% rename from indra/newview/skins/default/textures/0187babf-6c0d-5891-ebed-4ecab1426683.j2c rename to indra/newview/local_assets/0187babf-6c0d-5891-ebed-4ecab1426683.j2c diff --git a/indra/newview/skins/default/textures/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c b/indra/newview/local_assets/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c similarity index 100% rename from indra/newview/skins/default/textures/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c rename to indra/newview/local_assets/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c diff --git a/indra/newview/skins/default/textures/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c b/indra/newview/local_assets/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c similarity index 100% rename from indra/newview/skins/default/textures/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c rename to indra/newview/local_assets/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c diff --git a/indra/newview/skins/default/textures/0b444c3a-75c2-4891-9d1e-ac35c8d13d62.j2c b/indra/newview/local_assets/0b444c3a-75c2-4891-9d1e-ac35c8d13d62.j2c similarity index 100% rename from indra/newview/skins/default/textures/0b444c3a-75c2-4891-9d1e-ac35c8d13d62.j2c rename to indra/newview/local_assets/0b444c3a-75c2-4891-9d1e-ac35c8d13d62.j2c diff --git a/indra/newview/skins/default/textures/0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c b/indra/newview/local_assets/0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c similarity index 100% rename from indra/newview/skins/default/textures/0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c rename to indra/newview/local_assets/0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c diff --git a/indra/newview/skins/default/textures/0ff70ead-4562-45f9-9e8a-52b1a3286868.j2c b/indra/newview/local_assets/0ff70ead-4562-45f9-9e8a-52b1a3286868.j2c similarity index 100% rename from indra/newview/skins/default/textures/0ff70ead-4562-45f9-9e8a-52b1a3286868.j2c rename to indra/newview/local_assets/0ff70ead-4562-45f9-9e8a-52b1a3286868.j2c diff --git a/indra/newview/skins/default/textures/10d2a01a-0818-84b9-4b96-c2eb63256519.j2c b/indra/newview/local_assets/10d2a01a-0818-84b9-4b96-c2eb63256519.j2c similarity index 100% rename from indra/newview/skins/default/textures/10d2a01a-0818-84b9-4b96-c2eb63256519.j2c rename to indra/newview/local_assets/10d2a01a-0818-84b9-4b96-c2eb63256519.j2c diff --git a/indra/newview/skins/default/textures/179cdabd-398a-9b6b-1391-4dc333ba321f.j2c b/indra/newview/local_assets/179cdabd-398a-9b6b-1391-4dc333ba321f.j2c similarity index 100% rename from indra/newview/skins/default/textures/179cdabd-398a-9b6b-1391-4dc333ba321f.j2c rename to indra/newview/local_assets/179cdabd-398a-9b6b-1391-4dc333ba321f.j2c diff --git a/indra/newview/skins/default/textures/18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c b/indra/newview/local_assets/18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c similarity index 100% rename from indra/newview/skins/default/textures/18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c rename to indra/newview/local_assets/18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c diff --git a/indra/newview/skins/default/textures/19c76b49-c5f4-aeca-7cd8-17010f2969c3.j2c b/indra/newview/local_assets/19c76b49-c5f4-aeca-7cd8-17010f2969c3.j2c similarity index 100% rename from indra/newview/skins/default/textures/19c76b49-c5f4-aeca-7cd8-17010f2969c3.j2c rename to indra/newview/local_assets/19c76b49-c5f4-aeca-7cd8-17010f2969c3.j2c diff --git a/indra/newview/skins/default/textures/1e63e323-5fe0-452e-92f8-b98bd0f764e3.j2c b/indra/newview/local_assets/1e63e323-5fe0-452e-92f8-b98bd0f764e3.j2c similarity index 100% rename from indra/newview/skins/default/textures/1e63e323-5fe0-452e-92f8-b98bd0f764e3.j2c rename to indra/newview/local_assets/1e63e323-5fe0-452e-92f8-b98bd0f764e3.j2c diff --git a/indra/newview/skins/default/textures/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c b/indra/newview/local_assets/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c similarity index 100% rename from indra/newview/skins/default/textures/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c rename to indra/newview/local_assets/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c diff --git a/indra/newview/skins/default/textures/28f0f9ca-0423-4d1b-9e76-616ffce99544.j2c b/indra/newview/local_assets/28f0f9ca-0423-4d1b-9e76-616ffce99544.j2c similarity index 100% rename from indra/newview/skins/default/textures/28f0f9ca-0423-4d1b-9e76-616ffce99544.j2c rename to indra/newview/local_assets/28f0f9ca-0423-4d1b-9e76-616ffce99544.j2c diff --git a/indra/newview/skins/default/textures/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c b/indra/newview/local_assets/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c similarity index 100% rename from indra/newview/skins/default/textures/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c rename to indra/newview/local_assets/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c diff --git a/indra/newview/skins/default/textures/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c b/indra/newview/local_assets/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c similarity index 100% rename from indra/newview/skins/default/textures/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c rename to indra/newview/local_assets/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c diff --git a/indra/newview/skins/default/textures/2d784476-d0db-9979-0cff-9408745a7cf3.j2c b/indra/newview/local_assets/2d784476-d0db-9979-0cff-9408745a7cf3.j2c similarity index 100% rename from indra/newview/skins/default/textures/2d784476-d0db-9979-0cff-9408745a7cf3.j2c rename to indra/newview/local_assets/2d784476-d0db-9979-0cff-9408745a7cf3.j2c diff --git a/indra/newview/skins/default/textures/30047cec-269d-408e-0c30-b2603b887268.j2c b/indra/newview/local_assets/30047cec-269d-408e-0c30-b2603b887268.j2c similarity index 100% rename from indra/newview/skins/default/textures/30047cec-269d-408e-0c30-b2603b887268.j2c rename to indra/newview/local_assets/30047cec-269d-408e-0c30-b2603b887268.j2c diff --git a/indra/newview/skins/default/textures/303cd381-8560-7579-23f1-f0a880799740.j2c b/indra/newview/local_assets/303cd381-8560-7579-23f1-f0a880799740.j2c similarity index 100% rename from indra/newview/skins/default/textures/303cd381-8560-7579-23f1-f0a880799740.j2c rename to indra/newview/local_assets/303cd381-8560-7579-23f1-f0a880799740.j2c diff --git a/indra/newview/skins/default/textures/335f8f14-f2db-db7c-1c04-734dc7657439.j2c b/indra/newview/local_assets/335f8f14-f2db-db7c-1c04-734dc7657439.j2c similarity index 100% rename from indra/newview/skins/default/textures/335f8f14-f2db-db7c-1c04-734dc7657439.j2c rename to indra/newview/local_assets/335f8f14-f2db-db7c-1c04-734dc7657439.j2c diff --git a/indra/newview/skins/default/textures/35f217a3-f618-49cf-bbca-c86d486551a9.j2c b/indra/newview/local_assets/35f217a3-f618-49cf-bbca-c86d486551a9.j2c similarity index 100% rename from indra/newview/skins/default/textures/35f217a3-f618-49cf-bbca-c86d486551a9.j2c rename to indra/newview/local_assets/35f217a3-f618-49cf-bbca-c86d486551a9.j2c diff --git a/indra/newview/skins/default/textures/3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef.j2c b/indra/newview/local_assets/3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef.j2c similarity index 100% rename from indra/newview/skins/default/textures/3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef.j2c rename to indra/newview/local_assets/3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef.j2c diff --git a/indra/newview/skins/default/textures/3cddf591-a726-4702-87b3-70c1daf88f90.j2c b/indra/newview/local_assets/3cddf591-a726-4702-87b3-70c1daf88f90.j2c similarity index 100% rename from indra/newview/skins/default/textures/3cddf591-a726-4702-87b3-70c1daf88f90.j2c rename to indra/newview/local_assets/3cddf591-a726-4702-87b3-70c1daf88f90.j2c diff --git a/indra/newview/skins/default/textures/402f8b24-5f9d-4905-b5f8-37baff603e88.j2c b/indra/newview/local_assets/402f8b24-5f9d-4905-b5f8-37baff603e88.j2c similarity index 100% rename from indra/newview/skins/default/textures/402f8b24-5f9d-4905-b5f8-37baff603e88.j2c rename to indra/newview/local_assets/402f8b24-5f9d-4905-b5f8-37baff603e88.j2c diff --git a/indra/newview/skins/default/textures/4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c b/indra/newview/local_assets/4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c similarity index 100% rename from indra/newview/skins/default/textures/4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c rename to indra/newview/local_assets/4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c diff --git a/indra/newview/skins/default/textures/48766d75-6e58-de84-68fe-1980c64feaee.j2c b/indra/newview/local_assets/48766d75-6e58-de84-68fe-1980c64feaee.j2c similarity index 100% rename from indra/newview/skins/default/textures/48766d75-6e58-de84-68fe-1980c64feaee.j2c rename to indra/newview/local_assets/48766d75-6e58-de84-68fe-1980c64feaee.j2c diff --git a/indra/newview/skins/default/textures/53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c b/indra/newview/local_assets/53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c similarity index 100% rename from indra/newview/skins/default/textures/53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c rename to indra/newview/local_assets/53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c diff --git a/indra/newview/skins/default/textures/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c b/indra/newview/local_assets/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c similarity index 100% rename from indra/newview/skins/default/textures/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c rename to indra/newview/local_assets/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c diff --git a/indra/newview/skins/default/textures/5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508.j2c b/indra/newview/local_assets/5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508.j2c similarity index 100% rename from indra/newview/skins/default/textures/5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508.j2c rename to indra/newview/local_assets/5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508.j2c diff --git a/indra/newview/skins/default/textures/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c b/indra/newview/local_assets/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c similarity index 100% rename from indra/newview/skins/default/textures/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c rename to indra/newview/local_assets/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c diff --git a/indra/newview/skins/default/textures/63338ede-0037-c4fd-855b-015d77112fc8.j2c b/indra/newview/local_assets/63338ede-0037-c4fd-855b-015d77112fc8.j2c similarity index 100% rename from indra/newview/skins/default/textures/63338ede-0037-c4fd-855b-015d77112fc8.j2c rename to indra/newview/local_assets/63338ede-0037-c4fd-855b-015d77112fc8.j2c diff --git a/indra/newview/skins/default/textures/64367bd1-697e-b3e6-0b65-3f862a577366.j2c b/indra/newview/local_assets/64367bd1-697e-b3e6-0b65-3f862a577366.j2c similarity index 100% rename from indra/newview/skins/default/textures/64367bd1-697e-b3e6-0b65-3f862a577366.j2c rename to indra/newview/local_assets/64367bd1-697e-b3e6-0b65-3f862a577366.j2c diff --git a/indra/newview/skins/default/textures/6522e74d-1660-4e7f-b601-6f48c1659a77.j2c b/indra/newview/local_assets/6522e74d-1660-4e7f-b601-6f48c1659a77.j2c similarity index 100% rename from indra/newview/skins/default/textures/6522e74d-1660-4e7f-b601-6f48c1659a77.j2c rename to indra/newview/local_assets/6522e74d-1660-4e7f-b601-6f48c1659a77.j2c diff --git a/indra/newview/skins/default/textures/67931331-0c02-4876-1255-28770896c6a2.j2c b/indra/newview/local_assets/67931331-0c02-4876-1255-28770896c6a2.j2c similarity index 100% rename from indra/newview/skins/default/textures/67931331-0c02-4876-1255-28770896c6a2.j2c rename to indra/newview/local_assets/67931331-0c02-4876-1255-28770896c6a2.j2c diff --git a/indra/newview/skins/default/textures/6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c b/indra/newview/local_assets/6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c similarity index 100% rename from indra/newview/skins/default/textures/6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c rename to indra/newview/local_assets/6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c diff --git a/indra/newview/skins/default/textures/6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c b/indra/newview/local_assets/6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c similarity index 100% rename from indra/newview/skins/default/textures/6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c rename to indra/newview/local_assets/6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c diff --git a/indra/newview/skins/default/textures/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c b/indra/newview/local_assets/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c similarity index 100% rename from indra/newview/skins/default/textures/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c rename to indra/newview/local_assets/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c diff --git a/indra/newview/skins/default/textures/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c b/indra/newview/local_assets/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c similarity index 100% rename from indra/newview/skins/default/textures/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c rename to indra/newview/local_assets/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c diff --git a/indra/newview/skins/default/textures/7581f2f4-d0d2-481a-bc75-69a13d9caeaa.j2c b/indra/newview/local_assets/7581f2f4-d0d2-481a-bc75-69a13d9caeaa.j2c similarity index 100% rename from indra/newview/skins/default/textures/7581f2f4-d0d2-481a-bc75-69a13d9caeaa.j2c rename to indra/newview/local_assets/7581f2f4-d0d2-481a-bc75-69a13d9caeaa.j2c diff --git a/indra/newview/skins/default/textures/78af921a-3c49-47a1-9c4e-2608951164ae.j2c b/indra/newview/local_assets/78af921a-3c49-47a1-9c4e-2608951164ae.j2c similarity index 100% rename from indra/newview/skins/default/textures/78af921a-3c49-47a1-9c4e-2608951164ae.j2c rename to indra/newview/local_assets/78af921a-3c49-47a1-9c4e-2608951164ae.j2c diff --git a/indra/newview/skins/default/textures/79504bf5-c3ec-0763-6563-d843de66d0a1.j2c b/indra/newview/local_assets/79504bf5-c3ec-0763-6563-d843de66d0a1.j2c similarity index 100% rename from indra/newview/skins/default/textures/79504bf5-c3ec-0763-6563-d843de66d0a1.j2c rename to indra/newview/local_assets/79504bf5-c3ec-0763-6563-d843de66d0a1.j2c diff --git a/indra/newview/skins/default/textures/7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c b/indra/newview/local_assets/7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c similarity index 100% rename from indra/newview/skins/default/textures/7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c rename to indra/newview/local_assets/7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c diff --git a/indra/newview/skins/default/textures/7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c b/indra/newview/local_assets/7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c similarity index 100% rename from indra/newview/skins/default/textures/7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c rename to indra/newview/local_assets/7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c diff --git a/indra/newview/skins/default/textures/7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c b/indra/newview/local_assets/7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c similarity index 100% rename from indra/newview/skins/default/textures/7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c rename to indra/newview/local_assets/7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c diff --git a/indra/newview/skins/default/textures/7cb070bc-fc00-4527-9c4d-7f7e0c4191be.j2c b/indra/newview/local_assets/7cb070bc-fc00-4527-9c4d-7f7e0c4191be.j2c similarity index 100% rename from indra/newview/skins/default/textures/7cb070bc-fc00-4527-9c4d-7f7e0c4191be.j2c rename to indra/newview/local_assets/7cb070bc-fc00-4527-9c4d-7f7e0c4191be.j2c diff --git a/indra/newview/skins/default/textures/822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c b/indra/newview/local_assets/822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c similarity index 100% rename from indra/newview/skins/default/textures/822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c rename to indra/newview/local_assets/822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c diff --git a/indra/newview/skins/default/textures/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c b/indra/newview/local_assets/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c similarity index 100% rename from indra/newview/skins/default/textures/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c rename to indra/newview/local_assets/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c diff --git a/indra/newview/skins/default/textures/8872f2b8-31db-42d8-580a-b3e4a91262de.j2c b/indra/newview/local_assets/8872f2b8-31db-42d8-580a-b3e4a91262de.j2c similarity index 100% rename from indra/newview/skins/default/textures/8872f2b8-31db-42d8-580a-b3e4a91262de.j2c rename to indra/newview/local_assets/8872f2b8-31db-42d8-580a-b3e4a91262de.j2c diff --git a/indra/newview/skins/default/textures/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c b/indra/newview/local_assets/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c similarity index 100% rename from indra/newview/skins/default/textures/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c rename to indra/newview/local_assets/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c diff --git a/indra/newview/skins/default/textures/8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c b/indra/newview/local_assets/8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c similarity index 100% rename from indra/newview/skins/default/textures/8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c rename to indra/newview/local_assets/8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c diff --git a/indra/newview/skins/default/textures/92e66e00-f56f-598a-7997-048aa64cde18.j2c b/indra/newview/local_assets/92e66e00-f56f-598a-7997-048aa64cde18.j2c similarity index 100% rename from indra/newview/skins/default/textures/92e66e00-f56f-598a-7997-048aa64cde18.j2c rename to indra/newview/local_assets/92e66e00-f56f-598a-7997-048aa64cde18.j2c diff --git a/indra/newview/skins/default/textures/96b4de31-f4fa-337d-ec78-451e3609769e.j2c b/indra/newview/local_assets/96b4de31-f4fa-337d-ec78-451e3609769e.j2c similarity index 100% rename from indra/newview/skins/default/textures/96b4de31-f4fa-337d-ec78-451e3609769e.j2c rename to indra/newview/local_assets/96b4de31-f4fa-337d-ec78-451e3609769e.j2c diff --git a/indra/newview/skins/default/textures/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c b/indra/newview/local_assets/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c similarity index 100% rename from indra/newview/skins/default/textures/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c rename to indra/newview/local_assets/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c diff --git a/indra/newview/skins/default/textures/9c88539c-fd04-46b8-bea2-ddf1bcffe3bd.j2c b/indra/newview/local_assets/9c88539c-fd04-46b8-bea2-ddf1bcffe3bd.j2c similarity index 100% rename from indra/newview/skins/default/textures/9c88539c-fd04-46b8-bea2-ddf1bcffe3bd.j2c rename to indra/newview/local_assets/9c88539c-fd04-46b8-bea2-ddf1bcffe3bd.j2c diff --git a/indra/newview/skins/default/textures/9deab416-9c63-78d6-d558-9a156f12044c.j2c b/indra/newview/local_assets/9deab416-9c63-78d6-d558-9a156f12044c.j2c similarity index 100% rename from indra/newview/skins/default/textures/9deab416-9c63-78d6-d558-9a156f12044c.j2c rename to indra/newview/local_assets/9deab416-9c63-78d6-d558-9a156f12044c.j2c diff --git a/indra/newview/skins/default/textures/a6162133-724b-54df-a12f-51cd070ad6f3.j2c b/indra/newview/local_assets/a6162133-724b-54df-a12f-51cd070ad6f3.j2c similarity index 100% rename from indra/newview/skins/default/textures/a6162133-724b-54df-a12f-51cd070ad6f3.j2c rename to indra/newview/local_assets/a6162133-724b-54df-a12f-51cd070ad6f3.j2c diff --git a/indra/newview/skins/default/textures/a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c b/indra/newview/local_assets/a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c similarity index 100% rename from indra/newview/skins/default/textures/a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c rename to indra/newview/local_assets/a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c diff --git a/indra/newview/skins/default/textures/abb783e6-3e93-26c0-248a-247666855da3.j2c b/indra/newview/local_assets/abb783e6-3e93-26c0-248a-247666855da3.j2c similarity index 100% rename from indra/newview/skins/default/textures/abb783e6-3e93-26c0-248a-247666855da3.j2c rename to indra/newview/local_assets/abb783e6-3e93-26c0-248a-247666855da3.j2c diff --git a/indra/newview/skins/default/textures/ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c b/indra/newview/local_assets/ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c similarity index 100% rename from indra/newview/skins/default/textures/ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c rename to indra/newview/local_assets/ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c diff --git a/indra/newview/skins/default/textures/b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d.j2c b/indra/newview/local_assets/b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d.j2c similarity index 100% rename from indra/newview/skins/default/textures/b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d.j2c rename to indra/newview/local_assets/b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d.j2c diff --git a/indra/newview/skins/default/textures/b8d3965a-ad78-bf43-699b-bff8eca6c975.j2c b/indra/newview/local_assets/b8d3965a-ad78-bf43-699b-bff8eca6c975.j2c similarity index 100% rename from indra/newview/skins/default/textures/b8d3965a-ad78-bf43-699b-bff8eca6c975.j2c rename to indra/newview/local_assets/b8d3965a-ad78-bf43-699b-bff8eca6c975.j2c diff --git a/indra/newview/skins/default/textures/b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c b/indra/newview/local_assets/b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c similarity index 100% rename from indra/newview/skins/default/textures/b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c rename to indra/newview/local_assets/b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c diff --git a/indra/newview/skins/default/textures/b9e1cf8a-9660-c020-0c69-18f1ea27268a.j2c b/indra/newview/local_assets/b9e1cf8a-9660-c020-0c69-18f1ea27268a.j2c similarity index 100% rename from indra/newview/skins/default/textures/b9e1cf8a-9660-c020-0c69-18f1ea27268a.j2c rename to indra/newview/local_assets/b9e1cf8a-9660-c020-0c69-18f1ea27268a.j2c diff --git a/indra/newview/skins/default/textures/b9f1a3b8-933e-b7c8-e6f5-dba1bc666bed.j2c b/indra/newview/local_assets/b9f1a3b8-933e-b7c8-e6f5-dba1bc666bed.j2c similarity index 100% rename from indra/newview/skins/default/textures/b9f1a3b8-933e-b7c8-e6f5-dba1bc666bed.j2c rename to indra/newview/local_assets/b9f1a3b8-933e-b7c8-e6f5-dba1bc666bed.j2c diff --git a/indra/newview/skins/default/textures/beb169c7-11ea-fff2-efe5-0f24dc881df2.j2c b/indra/newview/local_assets/beb169c7-11ea-fff2-efe5-0f24dc881df2.j2c similarity index 100% rename from indra/newview/skins/default/textures/beb169c7-11ea-fff2-efe5-0f24dc881df2.j2c rename to indra/newview/local_assets/beb169c7-11ea-fff2-efe5-0f24dc881df2.j2c diff --git a/indra/newview/skins/default/textures/c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d.j2c b/indra/newview/local_assets/c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d.j2c similarity index 100% rename from indra/newview/skins/default/textures/c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d.j2c rename to indra/newview/local_assets/c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d.j2c diff --git a/indra/newview/skins/default/textures/ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c b/indra/newview/local_assets/ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c similarity index 100% rename from indra/newview/skins/default/textures/ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c rename to indra/newview/local_assets/ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c diff --git a/indra/newview/skins/default/textures/cce0f112-878f-4586-a2e2-a8f104bba271.j2c b/indra/newview/local_assets/cce0f112-878f-4586-a2e2-a8f104bba271.j2c similarity index 100% rename from indra/newview/skins/default/textures/cce0f112-878f-4586-a2e2-a8f104bba271.j2c rename to indra/newview/local_assets/cce0f112-878f-4586-a2e2-a8f104bba271.j2c diff --git a/indra/newview/skins/default/textures/cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c b/indra/newview/local_assets/cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c similarity index 100% rename from indra/newview/skins/default/textures/cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c rename to indra/newview/local_assets/cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c diff --git a/indra/newview/skins/default/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c b/indra/newview/local_assets/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c similarity index 100% rename from indra/newview/skins/default/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c rename to indra/newview/local_assets/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c diff --git a/indra/newview/skins/default/textures/d2114404-dd59-4a4d-8e6c-49359e91bbf0.j2c b/indra/newview/local_assets/d2114404-dd59-4a4d-8e6c-49359e91bbf0.j2c similarity index 100% rename from indra/newview/skins/default/textures/d2114404-dd59-4a4d-8e6c-49359e91bbf0.j2c rename to indra/newview/local_assets/d2114404-dd59-4a4d-8e6c-49359e91bbf0.j2c diff --git a/indra/newview/skins/default/textures/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c b/indra/newview/local_assets/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c similarity index 100% rename from indra/newview/skins/default/textures/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c rename to indra/newview/local_assets/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c diff --git a/indra/newview/skins/default/textures/d319ce44-0821-932a-cd18-cd1afb9d3ead.j2c b/indra/newview/local_assets/d319ce44-0821-932a-cd18-cd1afb9d3ead.j2c similarity index 100% rename from indra/newview/skins/default/textures/d319ce44-0821-932a-cd18-cd1afb9d3ead.j2c rename to indra/newview/local_assets/d319ce44-0821-932a-cd18-cd1afb9d3ead.j2c diff --git a/indra/newview/skins/default/textures/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c b/indra/newview/local_assets/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c similarity index 100% rename from indra/newview/skins/default/textures/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c rename to indra/newview/local_assets/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c diff --git a/indra/newview/skins/default/textures/d7d99e40-10e2-5739-d063-91dcbdefc492.j2c b/indra/newview/local_assets/d7d99e40-10e2-5739-d063-91dcbdefc492.j2c similarity index 100% rename from indra/newview/skins/default/textures/d7d99e40-10e2-5739-d063-91dcbdefc492.j2c rename to indra/newview/local_assets/d7d99e40-10e2-5739-d063-91dcbdefc492.j2c diff --git a/indra/newview/skins/default/textures/d9258671-868f-7511-c321-7baef9e948a4.j2c b/indra/newview/local_assets/d9258671-868f-7511-c321-7baef9e948a4.j2c similarity index 100% rename from indra/newview/skins/default/textures/d9258671-868f-7511-c321-7baef9e948a4.j2c rename to indra/newview/local_assets/d9258671-868f-7511-c321-7baef9e948a4.j2c diff --git a/indra/newview/skins/default/textures/db9d39ec-a896-c287-1ced-64566217021e.j2c b/indra/newview/local_assets/db9d39ec-a896-c287-1ced-64566217021e.j2c similarity index 100% rename from indra/newview/skins/default/textures/db9d39ec-a896-c287-1ced-64566217021e.j2c rename to indra/newview/local_assets/db9d39ec-a896-c287-1ced-64566217021e.j2c diff --git a/indra/newview/skins/default/textures/e121e2fc-7573-740f-edfd-0d45a9ba486e.j2c b/indra/newview/local_assets/e121e2fc-7573-740f-edfd-0d45a9ba486e.j2c similarity index 100% rename from indra/newview/skins/default/textures/e121e2fc-7573-740f-edfd-0d45a9ba486e.j2c rename to indra/newview/local_assets/e121e2fc-7573-740f-edfd-0d45a9ba486e.j2c diff --git a/indra/newview/skins/default/textures/e38248f9-f2ee-2c9f-aa49-4860857e3b08.j2c b/indra/newview/local_assets/e38248f9-f2ee-2c9f-aa49-4860857e3b08.j2c similarity index 100% rename from indra/newview/skins/default/textures/e38248f9-f2ee-2c9f-aa49-4860857e3b08.j2c rename to indra/newview/local_assets/e38248f9-f2ee-2c9f-aa49-4860857e3b08.j2c diff --git a/indra/newview/skins/default/textures/e569711a-27c2-aad4-9246-0c910239a179.j2c b/indra/newview/local_assets/e569711a-27c2-aad4-9246-0c910239a179.j2c similarity index 100% rename from indra/newview/skins/default/textures/e569711a-27c2-aad4-9246-0c910239a179.j2c rename to indra/newview/local_assets/e569711a-27c2-aad4-9246-0c910239a179.j2c diff --git a/indra/newview/skins/default/textures/f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c b/indra/newview/local_assets/f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c similarity index 100% rename from indra/newview/skins/default/textures/f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c rename to indra/newview/local_assets/f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c diff --git a/indra/newview/skins/default/textures/f4b6b161-6530-6679-1a84-adfcb71a8b12.j2c b/indra/newview/local_assets/f4b6b161-6530-6679-1a84-adfcb71a8b12.j2c similarity index 100% rename from indra/newview/skins/default/textures/f4b6b161-6530-6679-1a84-adfcb71a8b12.j2c rename to indra/newview/local_assets/f4b6b161-6530-6679-1a84-adfcb71a8b12.j2c diff --git a/indra/newview/skins/default/textures/fb1fecba-9585-415b-ad15-6e6e3d6c5479.j2c b/indra/newview/local_assets/fb1fecba-9585-415b-ad15-6e6e3d6c5479.j2c similarity index 100% rename from indra/newview/skins/default/textures/fb1fecba-9585-415b-ad15-6e6e3d6c5479.j2c rename to indra/newview/local_assets/fb1fecba-9585-415b-ad15-6e6e3d6c5479.j2c diff --git a/indra/newview/skins/default/textures/fb2ae204-3fd1-df33-594f-c9f882830e66.j2c b/indra/newview/local_assets/fb2ae204-3fd1-df33-594f-c9f882830e66.j2c similarity index 100% rename from indra/newview/skins/default/textures/fb2ae204-3fd1-df33-594f-c9f882830e66.j2c rename to indra/newview/local_assets/fb2ae204-3fd1-df33-594f-c9f882830e66.j2c diff --git a/indra/newview/skins/default/textures/fc987bf9-b8cb-f8e5-45f2-d664ca6bd3eb.j2c b/indra/newview/local_assets/fc987bf9-b8cb-f8e5-45f2-d664ca6bd3eb.j2c similarity index 100% rename from indra/newview/skins/default/textures/fc987bf9-b8cb-f8e5-45f2-d664ca6bd3eb.j2c rename to indra/newview/local_assets/fc987bf9-b8cb-f8e5-45f2-d664ca6bd3eb.j2c diff --git a/indra/newview/skins/default/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga b/indra/newview/skins/default/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga deleted file mode 100644 index d7097e3a3..000000000 Binary files a/indra/newview/skins/default/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga b/indra/newview/skins/default/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga deleted file mode 100644 index 2d78d07f5..000000000 Binary files a/indra/newview/skins/default/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga b/indra/newview/skins/default/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga deleted file mode 100644 index 77d470731..000000000 Binary files a/indra/newview/skins/default/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/0a94b42f-ec84-5f9c-14b7-1ef8505ceead.j2c b/indra/newview/skins/default/textures/0a94b42f-ec84-5f9c-14b7-1ef8505ceead.j2c deleted file mode 100644 index 03d4b1a9b..000000000 Binary files a/indra/newview/skins/default/textures/0a94b42f-ec84-5f9c-14b7-1ef8505ceead.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga b/indra/newview/skins/default/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga deleted file mode 100644 index b2e5609f1..000000000 Binary files a/indra/newview/skins/default/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga b/indra/newview/skins/default/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga deleted file mode 100644 index 0febf4edc..000000000 Binary files a/indra/newview/skins/default/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/11ee27f5-43c0-414e-afd5-d7f5688c351f.j2c b/indra/newview/skins/default/textures/11ee27f5-43c0-414e-afd5-d7f5688c351f.j2c deleted file mode 100644 index 3fb9c95aa..000000000 Binary files a/indra/newview/skins/default/textures/11ee27f5-43c0-414e-afd5-d7f5688c351f.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga b/indra/newview/skins/default/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga deleted file mode 100644 index 031b3ad34..000000000 Binary files a/indra/newview/skins/default/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga b/indra/newview/skins/default/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga deleted file mode 100644 index 58cd2cd55..000000000 Binary files a/indra/newview/skins/default/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga b/indra/newview/skins/default/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga deleted file mode 100644 index 879b9e618..000000000 Binary files a/indra/newview/skins/default/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/39801651-26cb-4926-af57-7af9352c273c.tga b/indra/newview/skins/default/textures/39801651-26cb-4926-af57-7af9352c273c.tga deleted file mode 100644 index f2fdd074b..000000000 Binary files a/indra/newview/skins/default/textures/39801651-26cb-4926-af57-7af9352c273c.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga b/indra/newview/skins/default/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga deleted file mode 100644 index 340f3213d..000000000 Binary files a/indra/newview/skins/default/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga b/indra/newview/skins/default/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga deleted file mode 100644 index 505f6ed1c..000000000 Binary files a/indra/newview/skins/default/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/5abfabc2-5d6d-4912-acd8-d7e38ae93d02.j2c b/indra/newview/skins/default/textures/5abfabc2-5d6d-4912-acd8-d7e38ae93d02.j2c deleted file mode 100644 index 1068e940b..000000000 Binary files a/indra/newview/skins/default/textures/5abfabc2-5d6d-4912-acd8-d7e38ae93d02.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga b/indra/newview/skins/default/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga deleted file mode 100644 index fc720c826..000000000 Binary files a/indra/newview/skins/default/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/64eed6af-f575-35c7-baa4-b140bdcdb00f.j2c b/indra/newview/skins/default/textures/64eed6af-f575-35c7-baa4-b140bdcdb00f.j2c deleted file mode 100644 index 1068e940b..000000000 Binary files a/indra/newview/skins/default/textures/64eed6af-f575-35c7-baa4-b140bdcdb00f.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga b/indra/newview/skins/default/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga deleted file mode 100644 index 35846cef3..000000000 Binary files a/indra/newview/skins/default/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/74ba3584-58ea-9984-5b76-62d37942ab77.tga b/indra/newview/skins/default/textures/74ba3584-58ea-9984-5b76-62d37942ab77.tga deleted file mode 100644 index 0fc1afb7a..000000000 Binary files a/indra/newview/skins/default/textures/74ba3584-58ea-9984-5b76-62d37942ab77.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga b/indra/newview/skins/default/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga deleted file mode 100644 index c359f2f31..000000000 Binary files a/indra/newview/skins/default/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/827ff765-8c1d-a8b1-23f7-fdcba560effc.j2c b/indra/newview/skins/default/textures/827ff765-8c1d-a8b1-23f7-fdcba560effc.j2c deleted file mode 100644 index eb13fcc88..000000000 Binary files a/indra/newview/skins/default/textures/827ff765-8c1d-a8b1-23f7-fdcba560effc.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga b/indra/newview/skins/default/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga deleted file mode 100644 index 6cc9ea194..000000000 Binary files a/indra/newview/skins/default/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c b/indra/newview/skins/default/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c deleted file mode 100644 index 1068e940b..000000000 Binary files a/indra/newview/skins/default/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga b/indra/newview/skins/default/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga deleted file mode 100644 index 1f9f564fa..000000000 Binary files a/indra/newview/skins/default/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/95281d5c-d27a-ee13-e067-08295b67b58a.j2c b/indra/newview/skins/default/textures/95281d5c-d27a-ee13-e067-08295b67b58a.j2c deleted file mode 100644 index 03d4b1a9b..000000000 Binary files a/indra/newview/skins/default/textures/95281d5c-d27a-ee13-e067-08295b67b58a.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/978380f0-aaf7-c459-14e3-9808833fd372.j2c b/indra/newview/skins/default/textures/978380f0-aaf7-c459-14e3-9808833fd372.j2c deleted file mode 100644 index 38227ffcd..000000000 Binary files a/indra/newview/skins/default/textures/978380f0-aaf7-c459-14e3-9808833fd372.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/988dd995-1769-bdc9-8842-51f8f2b03884.j2c b/indra/newview/skins/default/textures/988dd995-1769-bdc9-8842-51f8f2b03884.j2c deleted file mode 100644 index 03d4b1a9b..000000000 Binary files a/indra/newview/skins/default/textures/988dd995-1769-bdc9-8842-51f8f2b03884.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga b/indra/newview/skins/default/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga deleted file mode 100644 index c8491a0a1..000000000 Binary files a/indra/newview/skins/default/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/b2ef2d31-9714-a07b-6ca7-31638166364b.tga b/indra/newview/skins/default/textures/b2ef2d31-9714-a07b-6ca7-31638166364b.tga deleted file mode 100644 index 7358e86d3..000000000 Binary files a/indra/newview/skins/default/textures/b2ef2d31-9714-a07b-6ca7-31638166364b.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga b/indra/newview/skins/default/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga deleted file mode 100644 index 0dbb8fda4..000000000 Binary files a/indra/newview/skins/default/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/de651394-f926-48db-b666-e49d83af1bbc.j2c b/indra/newview/skins/default/textures/de651394-f926-48db-b666-e49d83af1bbc.j2c deleted file mode 100644 index 11b398470..000000000 Binary files a/indra/newview/skins/default/textures/de651394-f926-48db-b666-e49d83af1bbc.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/e3369e02-93e1-43dc-b9c0-4533db0963d0.tga b/indra/newview/skins/default/textures/e3369e02-93e1-43dc-b9c0-4533db0963d0.tga deleted file mode 100644 index 0d127f946..000000000 Binary files a/indra/newview/skins/default/textures/e3369e02-93e1-43dc-b9c0-4533db0963d0.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/e674ca0c-a387-4dae-a0b4-db6bd073faa5.j2c b/indra/newview/skins/default/textures/e674ca0c-a387-4dae-a0b4-db6bd073faa5.j2c deleted file mode 100644 index 9541c5d43..000000000 Binary files a/indra/newview/skins/default/textures/e674ca0c-a387-4dae-a0b4-db6bd073faa5.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/e97cf410-8e61-7005-ec06-629eba4cd1fb.tga b/indra/newview/skins/default/textures/e97cf410-8e61-7005-ec06-629eba4cd1fb.tga deleted file mode 100644 index 6fdba25d4..000000000 Binary files a/indra/newview/skins/default/textures/e97cf410-8e61-7005-ec06-629eba4cd1fb.tga and /dev/null differ diff --git a/indra/newview/skins/default/textures/ebf2aa19-6c34-c5d8-4f14-853da1241f91.j2c b/indra/newview/skins/default/textures/ebf2aa19-6c34-c5d8-4f14-853da1241f91.j2c deleted file mode 100644 index cb0bb9cac..000000000 Binary files a/indra/newview/skins/default/textures/ebf2aa19-6c34-c5d8-4f14-853da1241f91.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/f54a0c32-3cd1-d49a-5b4f-7b792bebc204.j2c b/indra/newview/skins/default/textures/f54a0c32-3cd1-d49a-5b4f-7b792bebc204.j2c deleted file mode 100644 index 03d4b1a9b..000000000 Binary files a/indra/newview/skins/default/textures/f54a0c32-3cd1-d49a-5b4f-7b792bebc204.j2c and /dev/null differ diff --git a/indra/newview/skins/default/textures/f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga b/indra/newview/skins/default/textures/f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga deleted file mode 100644 index 3706c96e0..000000000 Binary files a/indra/newview/skins/default/textures/f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga and /dev/null differ