7 files changed, 60 insertions, 26 deletions

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 6a339f2..4f2e839 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "RemoteAssetServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index fb51c1f..3eeec95 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,20 +1,35 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
-    AssetCaching = "GlynnTuckerAssetCache"
+    ;AssetCaching = "GlynnTuckerAssetCache"
     ;AssetCaching = "CenomeMemoryAssetCache"
+    AssetCaching = "FlotsamAssetCache"
 
 [AssetCache]
-    ;; Optional configurations for CoreAssetCache
-    ; Number of buckets for assets
-    ;CacheBuckets = 32768
+    ;; ---- Optional configurations for FlotsamAssetCache
+    ;
+    ; The cache directory can be shared by multiple instances,
+    ; so you may want to change this! Note that you can 
+    ; specify an absolute path (starting with '/'). 
+    ; See examples in comments.
+    ; Make sure the directory you specify can be created.
+    ;
+    CacheDirectory = ./assetcache
+    ;
+    ; Some other examples:
+    ; CacheDirectory = /var/opensim/assetcache ; (Windows and linux)
+    ; CacheDirectory = ~/assetcache ; (Windows and linux)
+    ; CacheDirectory = C:\opensim\assetcache ; (Windows only)
+    
+    ;
+    ; How long {in hours} to keep assets cached on disk, 
+    ; .5 == 30 minutes; 168 = 7 days
+    ; Specify 0 if you do not want your disk cache to expire
+    ;
+    FileCacheTimeout = 168 
+    
+
+    ;; --------- endof FlotsamAssetCache --------
 
-    ;; Optional configurations for CenomeMemoryAssetCache
-    ; Cache size 128 MB (default: 134217728)
-    ; MaxSize = 134217728
-    ; Maximal asset count 
-    ; MaxCount = 4096
-    ; Asset's expiration time (minutes)
-    ; ExpirationTime = 30
 
 [AssetService]
 
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index e21f306..f22113b 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "HGAssetBroker"
diff --git a/bin/config-include/StableSettings.ini b/bin/config-include/StableSettings.ini
new file mode 100644
index 0000000..5e3cbbc
--- /dev/null
+++ b/bin/config-include/StableSettings.ini
@@ -0,0 +1,28 @@
+[AssetCache]
+    ;; ---- Optional configurations for CoreAssetCache
+    ; Number of buckets for assets
+    ;CacheBuckets = 32768
+    ;; ---- endof CoreAssetCache ----------------
+
+    ;; ---- Optional configurations for CenomeMemoryAssetCache
+    ; Cache size 128 MB (default: 134217728)
+    ; MaxSize = 134217728
+    ; Maximal asset count 
+    ; MaxCount = 4096
+    ; Asset's expiration time (minutes)
+    ; ExpirationTime = 30
+    ;; ---- endof CenomeMemoryAssetCache --------
+
+    ;; ---- Optional configurations for FlotsamAssetCache
+
+    ; Set to false for disk cache only.
+    MemoryCacheEnabled = true
+
+    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
+    MemoryCacheTimeout = 2
+
+    ; How often {in hours} should the disk be checked for expired filed
+    ; Specify 0 to disable expiration checking
+    FileCleanupTimer = .166  ;roughly every 10 minutes
+
+    ;; ---- endof FlotsamAssetCache --------
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index dd9fdb5..74c440e 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "LocalAssetServicesConnector"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d03c003..034d1e2 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,20 +1,7 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
-    AssetCaching = "GlynnTuckerAssetCache"
-    ;AssetCaching = "CenomeMemoryAssetCache"
-
-[AssetCache]
-    ;; Optional configurations for CoreAssetCache
-    ; Number of buckets for assets
-    ;CacheBuckets = 16384
-
-    ;; Optional configurations for CenomeMemoryAssetCache
-    ; Cache size 128 MB (default: 134217728)
-    ; MaxSize = 134217728
-    ; Maximal asset count 
-    ; MaxCount = 4096
-    ; Asset's expiration time (minutes)
-    ; ExpirationTime = 30
+    ;AssetCaching = "GlynnTuckerAssetCache"
+    AssetCaching = "CenomeMemoryAssetCache"
     
 [AssetService]
     ;
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a97ac7b..7c5700e 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "HGAssetBroker"