From ada8ad1bc21665631f030c3194a567ea6f6a2a72 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 4 Mar 2021 12:49:48 +0200
Subject: SL-14940 Fixed ignoring custom cache path
---
doc/contributions.txt | 1 +
indra/newview/llappviewer.cpp | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 877d38c2a1..bf95989f19 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -227,6 +227,7 @@ Ansariel Hiller
SL-13858
SL-13697
SL-14939
+ SL-14940
SL-14941
Aralara Rajal
Arare Chantilly
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index ea0b950e62..6ede9ec0e7 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4132,8 +4132,6 @@ 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())
@@ -4181,6 +4179,9 @@ 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)
--
cgit v1.2.3