aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorMelanie2009-10-02 19:03:22 +0100
committerMelanie2009-10-02 19:03:22 +0100
commitce8974539e2de92e0a16a49ae560ecf5aac5e7d3 (patch)
treea8f426b248dd22581c05f786498d6347b62f5825 /bin/OpenSim.ini.example
parentMerge branch 'diva-textures-osgrid' into diva-textures (diff)
parentAdded a default for grid services in standalone. (diff)
downloadopensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.zip
opensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.gz
opensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.bz2
opensim-SC_OLD-ce8974539e2de92e0a16a49ae560ecf5aac5e7d3.tar.xz
Merge branch 'master' into diva-textures
Diffstat (limited to 'bin/OpenSim.ini.example')
-rw-r--r--bin/OpenSim.ini.example4
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 @@
1374;; zero configuration 1374;; zero configuration
1375;; 1375;;
1376[DatabaseService] 1376[DatabaseService]
1377 ;; default standalone, overridable in StandaloneCommon.ini
1377 StorageProvider = "OpenSim.Data.SQLite.dll" 1378 StorageProvider = "OpenSim.Data.SQLite.dll"
1378 1379
1379 1380
@@ -1381,6 +1382,9 @@
1381 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 1382 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
1382 AssetLoaderArgs = "assets/AssetSets.xml" 1383 AssetLoaderArgs = "assets/AssetSets.xml"
1383 1384
1385[GridService]
1386 ;; default standalone, overridable in StandaloneCommon.ini
1387 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
1384 1388
1385 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1389 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1386 ;; The following is the configuration section for the new style services 1390 ;; The following is the configuration section for the new style services