Skip to content

Commit f80d62e

Browse files
committed
#3851 Increase cache size
Increases default to 8GB and maximum to 32GB. Viewer now supports 2K textures which require more space, so altered disk cache vs textures space a little. Made spinner a bit wider to properly fit whole cache string.
1 parent 9df3b30 commit f80d62e

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

indra/newview/app_settings/settings.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,13 +1153,13 @@
11531153
<key>DiskCachePercentOfTotal</key>
11541154
<map>
11551155
<key>Comment</key>
1156-
<string>The percent of total cache size (defined by CacheSize) to use for the disk cache</string>
1156+
<string>The percent of total cache size (defined by CacheSize) to use for the disk cache (ex: asset storage, excludes textures)</string>
11571157
<key>Persist</key>
11581158
<integer>1</integer>
11591159
<key>Type</key>
11601160
<string>F32</string>
11611161
<key>Value</key>
1162-
<real>40.0</real>
1162+
<real>35.0</real>
11631163
</map>
11641164
<key>DiskCacheDirName</key>
11651165
<map>
@@ -1203,7 +1203,7 @@
12031203
<key>Type</key>
12041204
<string>U32</string>
12051205
<key>Value</key>
1206-
<integer>4096</integer>
1206+
<integer>6144</integer>
12071207
</map>
12081208
<key>CacheValidateCounter</key>
12091209
<map>

indra/newview/llappviewer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4282,8 +4282,8 @@ bool LLAppViewer::initCache()
42824282
const std::string cache_dir_name = gSavedSettings.getString("DiskCacheDirName");
42834283

42844284
const U32 MB = 1024 * 1024;
4285-
const uintmax_t MIN_CACHE_SIZE = 256 * MB;
4286-
const uintmax_t MAX_CACHE_SIZE = 9984ll * MB;
4285+
const uintmax_t MIN_CACHE_SIZE = 896 * MB;
4286+
const uintmax_t MAX_CACHE_SIZE = 32768ll * MB;
42874287
const uintmax_t setting_cache_total_size = uintmax_t(gSavedSettings.getU32("CacheSize")) * MB;
42884288
const uintmax_t cache_total_size = llclamp(setting_cache_total_size, MIN_CACHE_SIZE, MAX_CACHE_SIZE);
42894289
const F64 disk_cache_percent = gSavedSettings.getF32("DiskCachePercentOfTotal");

indra/newview/skins/default/xui/en/panel_preferences_advanced.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@
3232
height="23"
3333
increment="64"
3434
initial_value="1024"
35-
label="Cache size (256 - 9984MB)"
35+
label="Cache size (896 - 32768MB)"
3636
label_width="150"
3737
layout="topleft"
3838
left="80"
39-
max_val="9984"
40-
min_val="256"
39+
max_val="32768"
40+
min_val="896"
4141
top_pad="10"
4242
name="cachesizespinner"
43-
width="200" />
43+
width="210" />
4444
<text
4545
type="string"
4646
length="1"
@@ -59,7 +59,7 @@
5959
label="Clear Cache"
6060
label_selected="Clear Cache"
6161
layout="topleft"
62-
left_pad="30"
62+
left_pad="20"
6363
name="clear_cache"
6464
top_delta="0"
6565
width="100">

0 commit comments

Comments
 (0)