Merge branch 'master' into diva-textures

This commit is contained in:
Melanie
2009-10-02 19:03:22 +01:00
28 changed files with 481 additions and 396 deletions

View File

@@ -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