Merge branch 'master' into careminster-presence-refactor

3 files changed, 12 insertions, 10 deletions

diff --git a/bin/config-include/CenomeCache.ini.example b/bin/config-include/CenomeCache.ini.example
index 8ef4e03..4340493 100644
--- a/bin/config-include/CenomeCache.ini.example
+++ b/bin/config-include/CenomeCache.ini.example
@@ -1,13 +1,14 @@
 [AssetCache]
     ;;
-    ;; Options for CenmoeAssetCache
+    ;; Options for CenomeAssetCache
     ;;
 
-    ; 256 MB (default: 134217728)
-    MaxSize =  268435456
+    ; Max size of the cache in bytes
+    ; 134217728 = 128 MB, 26843556 = 256 MB, etc (default: 134217728)
+    MaxSize = 134217728
 
-    ; How many assets it is possible to store cache (default: 4096)
-    MaxCount = 16384
+    ; How many assets it is possible to store in the cache (default: 4096)
+    MaxCount = 4096
 
-    ; Expiration time - 1 hour (default: 30 minutes)
-    ExpirationTime = 60
+    ; Expiration time in minutes (default: 30)
+    ExpirationTime = 30
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index 026dee7..ad38ad1 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -29,7 +29,7 @@
 
     ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
     ; Specify 0 if you do not want your disk cache to expire
-    FileCacheTimeout = 0
+    FileCacheTimeout = 48
 
     ; How often {in hours} should the disk be checked for expired filed
     ; Specify 0 to disable expiration checking
@@ -38,6 +38,7 @@
     ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
     ; long (in miliseconds) to block a request thread while trying to complete
     ; an existing write to disk.
+    ; NOTE: THIS PARAMETER IS NOT CURRENTLY USED BY THE CACHE
     ; WaitOnInprogressTimeout = 3000
 
     ; Number of tiers to use for cache directories (current valid
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index e2e6459..27f262f 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -10,9 +10,9 @@
     ; Uncomment these lines if you want to use mysql storage
     ; Change the connection string to your db details
     ;StorageProvider = "OpenSim.Data.MySQL.dll"
-    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
     ; Uncomment this line if you are using MySQL and want to use a different database for estates
-    ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;"
+    ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
 
     ; MSSQL
     ; Uncomment these lines if you want to use MSSQL storage