diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-03-16 13:08:06 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-03-16 13:08:06 -0400 |
| commit | 31f3db02919870a8e92c9452de477c1478b273e9 (patch) | |
| tree | 1acf6944bf8dbe0b67bb64caee9188ad5e36d913 /indra/newview/llappviewer.cpp | |
| parent | 0b996159cef3a4022c6a3d4691bd2e2db37b6e92 (diff) | |
| parent | 9197a8652e49178c63ea208c6c4acf1ca3433659 (diff) | |
merge changes for DRTVWR-417
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6f09bd8eea..c146e97c2e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4536,7 +4536,13 @@ void LLAppViewer::purgeCache() LL_INFOS("AppCache") << "Purging Cache and Texture Cache..." << LL_ENDL; LLAppViewer::getTextureCache()->purgeCache(LL_PATH_CACHE); LLVOCache::getInstance()->removeCache(LL_PATH_CACHE); - gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), "*.*"); + std::string browser_cache = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "cef_cache"); + if (LLFile::isdir(browser_cache)) + { + // cef does not support clear_cache and clear_cookies, so clear what we can manually. + gDirUtilp->deleteDirAndContents(browser_cache); + } + gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), "*"); } //purge cache immediately, do not wait until the next login. |