Merge branch 'master' into httptests

2 files changed, 11 insertions, 4 deletions

diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index db8d4db..6666812 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -20,15 +20,20 @@
     HitRateDisplay = 100
 
     ; Set to false for no memory cache
-    MemoryCacheEnabled = false
+    ; assets can be requested several times in short periods
+    ; so even a small memory cache is usefull
+    MemoryCacheEnabled = true
 
     ; Set to false for no file cache
     FileCacheEnabled = true
 
     ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
-    ; Optimization: for VPS or limited memory system installs set Timeout to .016 (1 minute)
-    ; increases performance without large memory impact
-    MemoryCacheTimeout = 2
+    ; even a few minutes may mean many assets loaded to memory, if not all.
+    ; this is good if memory is not a problem.
+    ; if memory is a problem then a few seconds may actually save same.
+    ; reducing duplications.
+    ; see hit rates with console comand: fcache status
+    MemoryCacheTimeout = .001 // 3.6s ie around 4s (1s resolution)
 
     ; 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
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index a064f09..b96688b 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -37,6 +37,8 @@
   ; To enable for individuals or groups, set it to a comma separated list. This checks
   ;    against the owner of the object containing the script.
   ;    The comma separated entries in the list may be one of:
+  ;           "GRID_GOD" -- enable for users with UserLevel >= 200
+  ;           "GOD" -- enable for users with any type of god rights
   ;           "ESTATE_MANAGER" -- enable for estate manager
   ;           "ESTATE_OWNER" -- enable for estate owner
   ;           "PARCEL_OWNER" -- enable for parcel owner