diff options
-rw-r--r-- | OpenSim/Tools/Configger/ConfigurationLoader.cs | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs index fa3a5bf..f23c80a 100644 --- a/OpenSim/Tools/Configger/ConfigurationLoader.cs +++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs | |||
@@ -117,7 +117,6 @@ namespace OpenSim.Tools.Configger | |||
117 | } | 117 | } |
118 | 118 | ||
119 | m_config = new IniConfigSource(); | 119 | m_config = new IniConfigSource(); |
120 | m_config.Merge(DefaultConfig()); | ||
121 | 120 | ||
122 | m_log.Info("[CONFIG] Reading configuration settings"); | 121 | m_log.Info("[CONFIG] Reading configuration settings"); |
123 | 122 | ||
@@ -246,35 +245,5 @@ namespace OpenSim.Tools.Configger | |||
246 | } | 245 | } |
247 | return success; | 246 | return success; |
248 | } | 247 | } |
249 | |||
250 | /// <summary> | ||
251 | /// Setup a default config values in case they aren't present in the ini file | ||
252 | /// </summary> | ||
253 | /// <returns>A Configuration source containing the default configuration</returns> | ||
254 | private static IConfigSource DefaultConfig() | ||
255 | { | ||
256 | IConfigSource defaultConfig = new IniConfigSource(); | ||
257 | |||
258 | { | ||
259 | IConfig config = defaultConfig.Configs["Startup"]; | ||
260 | |||
261 | if (null == config) | ||
262 | config = defaultConfig.AddConfig("Startup"); | ||
263 | |||
264 | config.Set("region_info_source", "filesystem"); | ||
265 | config.Set("allow_regionless", false); | ||
266 | |||
267 | config.Set("physics", "OpenDynamicsEngine"); | ||
268 | config.Set("meshing", "Meshmerizer"); | ||
269 | config.Set("physical_prim", true); | ||
270 | config.Set("serverside_object_permissions", true); | ||
271 | config.Set("startup_console_commands_file", String.Empty); | ||
272 | config.Set("shutdown_console_commands_file", String.Empty); | ||
273 | config.Set("DefaultScriptEngine", "XEngine"); | ||
274 | config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); | ||
275 | } | ||
276 | |||
277 | return defaultConfig; | ||
278 | } | ||
279 | } | 248 | } |
280 | } | 249 | } |