Merge branch 'master' into bulletsim

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs

1 files changed, 8 insertions, 5 deletions

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index ee0523f..431dce1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -45,14 +45,15 @@
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
     ;; Copy the config .example file into your own .ini file and change configs there
+    ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
 
-    ;AssetCaching = "GlynnTuckerAssetCache"
+    AssetCaching = "FlotsamAssetCache"
+    Include-FlotsamCache = "config-include/FlotsamCache.ini"
 
-    ;AssetCaching = "FlotsamAssetCache"
-    ;Include-FlotsamCache = "config-include/FlotsamCache.ini"
+    ;AssetCaching = "GlynnTuckerAssetCache"
 
-    AssetCaching = "CenomeMemoryAssetCache"
-    Include-CenomeCache = "config-include/CenomeCache.ini"
+    ; AssetCaching = "CenomeMemoryAssetCache"
+    ; Include-CenomeCache = "config-include/CenomeCache.ini"
 
     ;; Authorization is not on by default, as it depends on external php
     ;AuthorizationServices = "LocalAuthorizationServicesConnector"
@@ -99,6 +100,8 @@
         ;; For Viewer 2
         MapTileURL = "http://127.0.0.1:9000/"
 
+    ;Currency = ""
+
         ;; Regular expressions for controlling which client versions are accepted/denied.
         ;; An empty string means nothing is checked.
         ;;