diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:57:32 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:57:32 +0200 |
| commit | 3067f56b1f1be6506b0bddd2889854ad7fdf4d8a (patch) | |
| tree | 071ca4cc0de9e066ebb8c3fc2954150f3c21f3ef | |
| parent | 9a1698fd84472c47ef049344b7a5fe39685aa676 (diff) | |
Revert "SL-14940 Fixed ignoring custom cache path"
This reverts commit 88746478583711951d04a3ea709ccf1667ddf535.
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 5baf717a06..de783330c6 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -227,7 +227,6 @@ Ansariel Hiller SL-13858 SL-13697 SL-14939 - SL-14940 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 0dc2c7d326..ea0b950e62 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4132,6 +4132,8 @@ 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); bool texture_cache_mismatch = false; if (gSavedSettings.getS32("LocalCacheVersion") != LLAppViewer::getTextureCacheVersion()) @@ -4179,9 +4181,6 @@ bool LLAppViewer::initCache() gSavedSettings.setString("CacheLocationTopFolder", ""); } - const std::string cache_dir = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, cache_dir_name); - LLDiskCache::initParamSingleton(cache_dir, disk_cache_bytes, enable_cache_debug_info); - if (!read_only) { if (mPurgeCache) |