diff options
| author | Justin Clark-Casey (justincc) | 2010-09-17 01:01:12 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-09-17 01:01:12 +0100 |
| commit | 5b18f8be256c4a932ffc9bbe1ad21c1fce1195aa (patch) | |
| tree | a17228c8f5643381a023a6a71839b21cbfe90d39 /bin | |
| parent | minor: remove some mono compiler warnings (diff) | |
| parent | Removing debug (diff) | |
| download | opensim-SC-5b18f8be256c4a932ffc9bbe1ad21c1fce1195aa.zip opensim-SC-5b18f8be256c4a932ffc9bbe1ad21c1fce1195aa.tar.gz opensim-SC-5b18f8be256c4a932ffc9bbe1ad21c1fce1195aa.tar.bz2 opensim-SC-5b18f8be256c4a932ffc9bbe1ad21c1fce1195aa.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 3 |
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 | |||