Merge branch 'master' into diva-textures

1 files changed, 4 insertions, 0 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 50198b3..fa8dc9d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1374,6 +1374,7 @@
 ;; zero configuration
 ;;
 [DatabaseService]
+    ;; default standalone, overridable in StandaloneCommon.ini
     StorageProvider = "OpenSim.Data.SQLite.dll"
 
 
@@ -1381,6 +1382,9 @@
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
+[GridService]
+    ;; default standalone, overridable in StandaloneCommon.ini
+        StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
     ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     ;; The following is the configuration section for the new style services