7 files changed, 19 insertions, 7 deletions

diff --git a/bin/HttpServer.dll b/bin/HttpServer.dll
deleted file mode 100755
index 717ceed..0000000
--- a/bin/HttpServer.dll
+++ /dev/null
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index bcfaf76..c36d2a4 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -151,6 +151,7 @@
     ;; OpenDynamicsEngine is by some distance the most developed physics engine
     ;; basicphysics effectively does not model physics at all, making all
     ;; objects phantom
+    ;; The Bullet plugins do not work properly right now.  A better Bullet plugin is on the way.
     ;; Default is OpenDynamicsEngine
     ; physics = OpenDynamicsEngine
     ; physics = basicphysics
@@ -318,8 +319,8 @@
     ; meant to override the MapImage and search server url given at login, and varying 
     ; on a sim-basis.
     ; Viewers that don't understand it, will ignore it
-    ;MapImageServerURI = "http://127.0.0.1:9000/
-    ;SearchServerURI = "http://127.0.0.1:9000/
+    ;MapImageServerURI = "http://127.0.0.1:9000/"
+    ;SearchServerURI = "http://127.0.0.1:9000/"
 
 
 [Chat]
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 2877541..e38c0ea 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -217,6 +217,9 @@
     ;WorldMapModule = "WorldMap"
     ;MapImageModule = "MapImageModule"
 
+    ; World map blacklist timeout in seconds
+    ;BlacklistTimeout = 600
+
     ; Set to false to not generate any maptiles
     ;GenerateMaptiles = true
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index ea271b8..b760abd 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -203,6 +203,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     UserAgentService = "OpenSim.Services.HypergridService.dll:UserAgentService"
     FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
 
+    ;Currency = ""
+
     WelcomeMessage = "Welcome, Avatar!"
     AllowRemoteSetLoginLevel = "false"
     
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 14f79aa..a36d255 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -188,6 +188,8 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     LibraryService = "OpenSim.Services.InventoryService.dll:LibraryService"
     FriendsService = "OpenSim.Services.FriendsService.dll:FriendsService"
 
+    ;Currency = ""
+
     WelcomeMessage = "Welcome, Avatar!"
     AllowRemoteSetLoginLevel = "false"
 
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4e34059..c5598c0 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -122,6 +122,7 @@
 [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 = "FlotsamAssetCache"
     Include-FlotsamCache = "config-include/FlotsamCache.ini"
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.
         ;;