From 3fc07dea01795b31c37dcd093ec73d190a1e188a Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 16 Sep 2020 18:53:24 -0700 Subject: First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change. --- indra/newview/app_settings/settings.xml | 44 --------------------------------- 1 file changed, 44 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a00aa86d78..592418d50d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2835,17 +2835,6 @@ Value -1 - DebugStatModeVFSPendingOps - - Comment - Mode of stat in Statistics floater - Persist - 1 - Type - S32 - Value - -1 - DebugStatModeTimeDialation Comment @@ -3638,17 +3627,6 @@ Value 4 - DumpVFSCaches - - Comment - Dump VFS caches on startup. - Persist - 1 - Type - Boolean - Value - 0 - DynamicCameraStrength Comment @@ -14250,28 +14228,6 @@ Value - VFSOldSize - - Comment - [DO NOT MODIFY] Controls resizing of local file cache - Persist - 1 - Type - U32 - Value - 0 - - VFSSalt - - Comment - [DO NOT MODIFY] Controls local file caching behavior - Persist - 1 - Type - U32 - Value - 1 - VelocityInterpolate Comment -- cgit v1.2.3 From 3092aa8aae496803707980eb456cddbb9960ef1c Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 6 Oct 2020 17:16:53 -0700 Subject: Add in the C++ filesystem based cache and clean up some indempotent functions in llfilesystem --- indra/newview/app_settings/settings.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c45d6dd7af..0123bc32af 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1351,6 +1351,17 @@ Value 23 + CacheDebugInfo + + Comment + When enabled, display additional cache debugging information + Persist + 1 + Type + Boolean + Value + 0 + CacheLocation Comment -- cgit v1.2.3 From 08dfc0836fb12855d0c07d811e2909400d5b74f3 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 7 Oct 2020 15:25:12 -0700 Subject: This changeset hooks up many things that have been in progress and moves things about between llfilesystem and lldiskcache - there is still some bookkeeping work left but this is the first version that appears to work and actively manage the cache --- indra/newview/app_settings/settings.xml | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 0123bc32af..2e65aef9a2 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1351,10 +1351,10 @@ Value 23 - CacheDebugInfo + EnableCacheDebugInfo Comment - When enabled, display additional cache debugging information + When set, display additional cache debugging information Persist 1 Type @@ -1362,6 +1362,28 @@ Value 0 + DiskCacheMaxSizeMB + + Comment + The maximum number of MB to use for the new disk cache + Persist + 1 + Type + U32 + Value + 10 + + DiskCacheDirName + + Comment + The name of the disk cache (within the standard Viewer disk cache directory) + Persist + 1 + Type + String + Value + dcache + CacheLocation Comment -- cgit v1.2.3 From a11e8ffe4bc4dee79bf199592718837ef2429a29 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 7 Oct 2020 16:50:33 -0700 Subject: remove the static cache files from the viewer and update viewer_manifest.py to not try to copy them into the installer bundle --- indra/newview/app_settings/static_data.db2 | Bin 576578 -> 0 bytes indra/newview/app_settings/static_index.db2 | Bin 9894 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 indra/newview/app_settings/static_data.db2 delete mode 100644 indra/newview/app_settings/static_index.db2 (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/static_data.db2 b/indra/newview/app_settings/static_data.db2 deleted file mode 100644 index f85aa81601..0000000000 Binary files a/indra/newview/app_settings/static_data.db2 and /dev/null differ diff --git a/indra/newview/app_settings/static_index.db2 b/indra/newview/app_settings/static_index.db2 deleted file mode 100644 index a5440f96f2..0000000000 Binary files a/indra/newview/app_settings/static_index.db2 and /dev/null differ -- cgit v1.2.3 From a818c44ef21cf6b4e4eeab0ee0325a780898fccc Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Wed, 7 Oct 2020 18:16:30 -0700 Subject: Tweak name of cache folder in the Viewer cache directory --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 2e65aef9a2..357ba4bc77 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1382,7 +1382,7 @@ Type String Value - dcache + cache CacheLocation -- cgit v1.2.3 From c66c426d6b5bfab3922471adf7402bee5d10f8ec Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 26 Oct 2020 20:01:12 +0200 Subject: SL-14148 remove redundant zeroing of the file --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index cb21adaebd..fc1437148a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1371,7 +1371,7 @@ Type U32 Value - 10 + 50 DiskCacheDirName -- cgit v1.2.3 From 391ada1150a861e899dcde8558e9efd4c5efc981 Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Tue, 27 Oct 2020 13:53:17 -0700 Subject: Fix for meta issue: SL-14211 Determine optimum cache size for VFS replacement cache --- indra/newview/app_settings/settings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index fc1437148a..142a3098ec 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1362,16 +1362,16 @@ Value 0 - DiskCacheMaxSizeMB + DiskCachePercentOfTotal Comment - The maximum number of MB to use for the new disk cache + The percent of total cache size (defined by CacheSize) to use for the disk cache Persist 1 Type - U32 + F32 Value - 50 + 20.0 DiskCacheDirName -- cgit v1.2.3 From 727b89e94cc5125c62b0eaebe304ba613f38225a Mon Sep 17 00:00:00 2001 From: Callum Prentice Date: Thu, 29 Oct 2020 12:21:11 -0700 Subject: fix for SL-14227 The 'Fatal error detected' message is displayed while downloading a new version of the SL Viewer --- indra/newview/app_settings/settings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 142a3098ec..f7f54624d4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1371,7 +1371,7 @@ Type F32 Value - 20.0 + 20.0 DiskCacheDirName @@ -11569,7 +11569,7 @@ Boolean Value 0 - + NearbyListShowMap Comment @@ -16588,7 +16588,7 @@ Type Boolean Value - 1 + 1 -- cgit v1.2.3