livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restrict cache clears to explicit action only

Arrehn 2011-11-04 22:45:07 -04:00
parent c570061609
commit 72d10ec85a
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llagentlanguage.cpp
View File

@ -47,7 +47,8 @@ void LLAgentLanguage::onChange()
{
// Clear inventory cache so that default names of inventory items
// appear retranslated (EXT-8308).
gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
// AO: Purging the cache every language change is less desirable than having to manually cache clear once to retranslate inventory.
//gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
}
// send language settings to the sim

16
indra/newview/llappviewer.cpp
View File

@ -3861,9 +3861,10 @@ void LLAppViewer::migrateCacheDirectory()
}
llinfos << "Moved " << file_count << " files" << llendl;
// Nuke the old cache
gDirUtilp->setCacheDir(old_cache_dir);
purgeCache();
// AO: Don't automatically purge old cache
//// Nuke the old cache
//gDirUtilp->setCacheDir(old_cache_dir);
//purgeCache();
gDirUtilp->setCacheDir(new_cache_dir);
#if LL_DARWIN
@ -3965,6 +3966,7 @@ bool LLAppViewer::initCache()
gSavedSettings.getBOOL("PurgeCacheOnNextStartup"))
{
gSavedSettings.setBOOL("PurgeCacheOnNextStartup", false);
llinfos << "Scheduling texture purge, based on PurgeCache* settings." << llendl;
mPurgeCache = true;
// STORM-1141 force purgeAllTextures to get called to prevent a crash here. -brad
texture_cache_mismatch = true;
@ -3975,6 +3977,7 @@ bool LLAppViewer::initCache()
const std::string j2c_last = gSavedSettings.getString("LastJ2CVersion");
if (j2c_info != j2c_last && !j2c_last.empty())
{
llinfos << "Scheduling texture purge, based on LastJ2CVersion mismatch." << llendl;
mPurgeCache = true;
}
gSavedSettings.setString("LastJ2CVersion", j2c_info);
@ -3987,9 +3990,10 @@ bool LLAppViewer::initCache()
std::string new_cache_location = gSavedSettings.getString("NewCacheLocation");
if (new_cache_location != cache_location)
{
llwarns << new_cache_location << " is not the same as " << cache_location << ". PURGING." << llendl;
gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"));
purgeCache(); // purge old cache
// AO: Don't automatically purge old cache location, has unwanted side effects with shared caches, upgrades
//llwarns << new_cache_location << " is not the same as " << cache_location << ". PURGING." << llendl;
//gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"));
//purgeCache(); // purge old cache
gSavedSettings.setString("CacheLocation", new_cache_location);
gSavedSettings.setString("CacheLocationTopFolder", gDirUtilp->getBaseFileName(new_cache_location));
}

5
indra/newview/llfloaterpreference.cpp
View File

@ -237,8 +237,9 @@ bool callback_clear_browser_cache(const LLSD& notification, const LLSD& response
LLNavigationBar::getInstance()->clearHistoryCache();
// flag client texture cache for clearing next time the client runs
gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
LLNotificationsUtil::add("CacheWillClear");
// AO: Don't clear main texture cache on browser cache clear - it's too expensive to be done except explicitly
//gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
//LLNotificationsUtil::add("CacheWillClear");
LLSearchHistory::getInstance()->clearHistory();
LLSearchHistory::getInstance()->save();