diff options
| author | Melanie | 2012-09-16 04:11:20 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-16 04:11:20 +0100 |
| commit | db774d4292588db1e2ac4a9fafe977ddbec353ee (patch) | |
| tree | 5fc381d7cb96cc0d2b47e4807821f488c339ec13 /bin/config-include/FlotsamCache.ini.example | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.zip opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.gz opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.bz2 opensim-SC_OLD-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
Diffstat (limited to 'bin/config-include/FlotsamCache.ini.example')
| -rw-r--r-- | bin/config-include/FlotsamCache.ini.example | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example index b9c6d84..ad74fc1 100644 --- a/bin/config-include/FlotsamCache.ini.example +++ b/bin/config-include/FlotsamCache.ini.example | |||
| @@ -54,10 +54,3 @@ | |||
| 54 | 54 | ||
| 55 | ; Warning level for cache directory size | 55 | ; Warning level for cache directory size |
| 56 | ;CacheWarnAt = 30000 | 56 | ;CacheWarnAt = 30000 |
| 57 | |||
| 58 | ; Perform a deep scan of all assets within all regions, looking for all assets | ||
| 59 | ; present or referenced. Mark all assets found that are already present in the | ||
| 60 | ; cache, and request all assets that are found that are not already cached (this | ||
| 61 | ; will cause those assets to be cached) | ||
| 62 | ; | ||
| 63 | DeepScanBeforePurge = true | ||