Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions indra/newview/app_settings/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1153,13 +1153,13 @@
<key>DiskCachePercentOfTotal</key>
<map>
<key>Comment</key>
<string>The percent of total cache size (defined by CacheSize) to use for the disk cache</string>
<string>The percent of total cache size (defined by CacheSize) to use for the disk cache (ex: asset storage, excludes textures)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>40.0</real>
<real>35.0</real>
</map>
<key>DiskCacheDirName</key>
<map>
Expand Down Expand Up @@ -1203,7 +1203,7 @@
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>4096</integer>
<integer>6144</integer>
</map>
<key>CacheValidateCounter</key>
<map>
Expand Down
4 changes: 2 additions & 2 deletions indra/newview/llappviewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4282,8 +4282,8 @@ bool LLAppViewer::initCache()
const std::string cache_dir_name = gSavedSettings.getString("DiskCacheDirName");

const U32 MB = 1024 * 1024;
const uintmax_t MIN_CACHE_SIZE = 256 * MB;
const uintmax_t MAX_CACHE_SIZE = 9984ll * MB;
const uintmax_t MIN_CACHE_SIZE = 896 * MB;
const uintmax_t MAX_CACHE_SIZE = 32768ll * MB;
const uintmax_t setting_cache_total_size = uintmax_t(gSavedSettings.getU32("CacheSize")) * MB;
const uintmax_t cache_total_size = llclamp(setting_cache_total_size, MIN_CACHE_SIZE, MAX_CACHE_SIZE);
const F64 disk_cache_percent = gSavedSettings.getF32("DiskCachePercentOfTotal");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
height="23"
increment="64"
initial_value="1024"
label="Cache size (256 - 9984MB)"
label="Cache size (896 - 32768MB)"
label_width="150"
layout="topleft"
left="80"
max_val="9984"
min_val="256"
max_val="32768"
min_val="896"
top_pad="10"
name="cachesizespinner"
width="200" />
width="210" />
<text
type="string"
length="1"
Expand All @@ -59,7 +59,7 @@
label="Clear Cache"
label_selected="Clear Cache"
layout="topleft"
left_pad="30"
left_pad="20"
name="clear_cache"
top_delta="0"
width="100">
Expand Down
Loading