From 9dba08e851bb6bf76b0b3852e20294cf97a70879 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 11 Apr 2021 14:59:22 +0200 Subject: [PATCH] Clear old cache location when moving cache - shared cache is not an issue here --- indra/newview/llappviewer.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 157dc58f7e..5c72f081a8 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4994,10 +4994,9 @@ bool LLAppViewer::initCache() std::string new_cache_location = gSavedSettings.getString("NewCacheLocation"); if (new_cache_location != cache_location) { - // AO: Don't automatically purge old cache location, has unwanted side effects with shared caches, upgrades - //LL_INFOS("AppCache") << "Cache location changed, cache needs purging" << LL_ENDL; - //gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation")); - //purgeCache(); // purge old cache + LL_INFOS("AppCache") << "Cache location changed, cache needs purging" << LL_ENDL; + gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation")); + purgeCache(); // purge old cache gSavedSettings.setString("CacheLocation", new_cache_location); gSavedSettings.setString("CacheLocationTopFolder", gDirUtilp->getBaseFileName(new_cache_location)); }