diff options
| author | Melanie | 2012-04-13 03:00:48 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-13 03:00:48 +0100 |
| commit | fe65b518765a8c88c1f3067b47d775b9b1142961 (patch) | |
| tree | 3a97f13715090d8c925543ae49ecae1930578d5d /bin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Mantis 55025 Implement script time. (diff) | |
| download | opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.zip opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.gz opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.bz2 opensim-SC_OLD-fe65b518765a8c88c1f3067b47d775b9b1142961.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/config-include/FlotsamCache.ini.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example index cd39f8c..b9c6d84 100644 --- a/bin/config-include/FlotsamCache.ini.example +++ b/bin/config-include/FlotsamCache.ini.example | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | ; How often {in hours} should the disk be checked for expired filed | 37 | ; How often {in hours} should the disk be checked for expired filed |
| 38 | ; Specify 0 to disable expiration checking | 38 | ; Specify 0 to disable expiration checking |
| 39 | FileCleanupTimer = .166 ;roughly every 10 minutes | 39 | FileCleanupTimer = 1.0 ;every hour |
| 40 | 40 | ||
| 41 | ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how | 41 | ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how |
| 42 | ; long (in miliseconds) to block a request thread while trying to complete | 42 | ; long (in miliseconds) to block a request thread while trying to complete |
| @@ -60,4 +60,4 @@ | |||
| 60 | ; cache, and request all assets that are found that are not already cached (this | 60 | ; cache, and request all assets that are found that are not already cached (this |
| 61 | ; will cause those assets to be cached) | 61 | ; will cause those assets to be cached) |
| 62 | ; | 62 | ; |
| 63 | ; DeepScanBeforePurge = false | 63 | DeepScanBeforePurge = true |