aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorMelanie2009-10-02 19:04:46 +0100
committerMelanie2009-10-02 19:04:46 +0100
commit46955f42608ceb2b76731432f536e04e85521a12 (patch)
tree37e8591bd95de33ad0c485626c6f40f7d4bd91b5 /bin/OpenSim.ini.example
parentRevert "* Adding Scale to EntityBase * Fixing the incorrect initialization of... (diff)
parentAdded a default for grid services in standalone. (diff)
downloadopensim-SC-46955f42608ceb2b76731432f536e04e85521a12.zip
opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.gz
opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.bz2
opensim-SC-46955f42608ceb2b76731432f536e04e85521a12.tar.xz
Merge branch 'master' into vehicles
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 2a8a7bb..1aae98a 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1387,6 +1387,7 @@
1387;; zero configuration 1387;; zero configuration
1388;; 1388;;
1389[DatabaseService] 1389[DatabaseService]
1390 ;; default standalone, overridable in StandaloneCommon.ini
1390 StorageProvider = "OpenSim.Data.SQLite.dll" 1391 StorageProvider = "OpenSim.Data.SQLite.dll"
1391 1392
1392 1393
@@ -1394,6 +1395,9 @@
1394 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" 1395 DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
1395 AssetLoaderArgs = "assets/AssetSets.xml" 1396 AssetLoaderArgs = "assets/AssetSets.xml"
1396 1397
1398[GridService]
1399 ;; default standalone, overridable in StandaloneCommon.ini
1400 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
1397 1401
1398 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1402 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1399 ;; The following is the configuration section for the new style services 1403 ;; The following is the configuration section for the new style services