aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tools
diff options
context:
space:
mode:
authorMelanie2011-10-12 00:10:15 +0200
committerMelanie2011-10-12 00:10:15 +0200
commit1c2b5d99c9601a3d301f4bc0f53389cca831ee04 (patch)
tree97fa9c758f429d5dee64234e442f2c83cd1b9994 /OpenSim/Tools
parentMerge branch 'careminster-presence-refactor' into bigmerge (diff)
parentMerge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge (diff)
downloadopensim-SC_OLD-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.zip
opensim-SC_OLD-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.gz
opensim-SC_OLD-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.bz2
opensim-SC_OLD-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.xz
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Tools')
-rw-r--r--OpenSim/Tools/Configger/ConfigurationLoader.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index 3914652..28bcc99 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -233,6 +233,7 @@ namespace OpenSim.Tools.Configger
233 config = defaultConfig.AddConfig("Startup"); 233 config = defaultConfig.AddConfig("Startup");
234 234
235 config.Set("region_info_source", "filesystem"); 235 config.Set("region_info_source", "filesystem");
236 config.Set("allow_regionless", false);
236 237
237 config.Set("gridmode", false); 238 config.Set("gridmode", false);
238 config.Set("physics", "OpenDynamicsEngine"); 239 config.Set("physics", "OpenDynamicsEngine");