aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-09-17 01:01:12 +0100
committerJustin Clark-Casey (justincc)2010-09-17 01:01:12 +0100
commit5b18f8be256c4a932ffc9bbe1ad21c1fce1195aa (patch)
treea17228c8f5643381a023a6a71839b21cbfe90d39 /bin
parentminor: remove some mono compiler warnings (diff)
parentRemoving debug (diff)
downloadopensim-SC_OLD-5b18f8be256c4a932ffc9bbe1ad21c1fce1195aa.zip
opensim-SC_OLD-5b18f8be256c4a932ffc9bbe1ad21c1fce1195aa.tar.gz
opensim-SC_OLD-5b18f8be256c4a932ffc9bbe1ad21c1fce1195aa.tar.bz2
opensim-SC_OLD-5b18f8be256c4a932ffc9bbe1ad21c1fce1195aa.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--bin/OpenSimDefaults.ini3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 94d021d..e78f25b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1264,3 +1264,6 @@
1264 ;; default standalone, overridable in StandaloneCommon.ini 1264 ;; default standalone, overridable in StandaloneCommon.ini
1265 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData" 1265 StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
1266 1266
1267[Modules]
1268 Include-modules = "addon-modules/*/config/*.ini"
1269