Comment changing the texture cache to match the system cache, since it turns out that important system textures such as the

water normal map are delivered in the SKINS folder and if they were in the cache directory they'd be deleted when the cache
was reset. Also fix a bug with resetting the cache location.

By Tom Meta from his fork.  See the TomsOldWork branch.

2 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/llpanelnetwork.cpp b/linden/indra/newview/llpanelnetwork.cpp
index 2edd1a1..ec0b6ee 100644
--- a/linden/indra/newview/llpanelnetwork.cpp
+++ b/linden/indra/newview/llpanelnetwork.cpp
@@ -127,7 +127,7 @@ void LLPanelNetwork::onClickResetCache(void* user_data)
         LLPanelNetwork* self = (LLPanelNetwork*)user_data;
         if (!gSavedSettings.getString("CacheLocation").empty())
         {
-                gSavedSettings.setString("NewCacheLocation", "");
+                gSavedSettings.setString("NewCacheLocation", gDirUtilp->getCacheDir(true));
                 LLNotifications::instance().add("CacheWillBeMoved");
         }
         std::string cache_location = gDirUtilp->getCacheDir(true);
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index a1a9a39..4679137 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -800,6 +800,8 @@ 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?
+        //We use LL_PATH_SKINS because the default textures (water normal map etc) are delivered in the SKINS path.
+        //Turns out we can't change this to LL_PATH_CACHE or these important textures will be removed when the user clears their cache.
         std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "default", "textures", idstr);
         return filename;
 }