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

Fix asset cache is ignoring custom cache path

meow-7.2.2
Ansariel 2021-03-03 10:24:54 +01:00
parent 3fcc7dfeb8
commit dace23b988
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llappviewer.cpp
View File

@ -4941,8 +4941,10 @@ bool LLAppViewer::initCache()
const unsigned int disk_cache_mb = cache_total_size_mb * disk_cache_percent / 100;
const unsigned int disk_cache_bytes = disk_cache_mb * 1024 * 1024;
const bool enable_cache_debug_info = gSavedSettings.getBOOL("EnableDiskCacheDebugInfo");
const std::string cache_dir = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, cache_dir_name);
LLDiskCache::initParamSingleton(cache_dir, disk_cache_bytes, enable_cache_debug_info);
// <FS:Ansariel> Don't ignore cache path for asset cache; Moved further down until cache path has been set correctly
//const std::string cache_dir = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, cache_dir_name);
//LLDiskCache::initParamSingleton(cache_dir, disk_cache_bytes, enable_cache_debug_info);
// </FS:Ansariel>
bool texture_cache_mismatch = false;
if (gSavedSettings.getS32("LocalCacheVersion") != LLAppViewer::getTextureCacheVersion())
@ -5012,7 +5014,12 @@ bool LLAppViewer::initCache()
gSavedSettings.setString("FSSoundCacheLocation", "");
}
// </FS:Ansariel>
// <FS:Ansariel> Don't ignore cache path for asset cache
const std::string cache_dir = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, cache_dir_name);
LLDiskCache::initParamSingleton(cache_dir, disk_cache_bytes, enable_cache_debug_info);
// </FS:Ansariel>
if (!read_only)
{
if (mPurgeCache)