diff options
Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
Diffstat (limited to 'OpenSim/Tools')
| -rw-r--r-- | OpenSim/Tools/Configger/ConfigurationLoader.cs | 1 |
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"); |