OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Also remove the defaults from Configger

0.9.1.0-post-fixes
Melanie 2019-07-30 18:15:09 +01:00
parent d29ffbf551
commit 24aa13239c
1 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
OpenSim/Tools/Configger/ConfigurationLoader.cs
View File

@ -117,7 +117,6 @@ namespace OpenSim.Tools.Configger
} }
m_config = new IniConfigSource(); m_config = new IniConfigSource();
m_config.Merge(DefaultConfig());
m_log.Info("[CONFIG] Reading configuration settings"); m_log.Info("[CONFIG] Reading configuration settings");
@ -246,35 +245,5 @@ namespace OpenSim.Tools.Configger
} }
return success; return success;
} }
/// <summary>
/// Setup a default config values in case they aren't present in the ini file
/// </summary>
/// <returns>A Configuration source containing the default configuration</returns>
private static IConfigSource DefaultConfig()
{
IConfigSource defaultConfig = new IniConfigSource();
{
IConfig config = defaultConfig.Configs["Startup"];
if (null == config)
config = defaultConfig.AddConfig("Startup");
config.Set("region_info_source", "filesystem");
config.Set("allow_regionless", false);
config.Set("physics", "OpenDynamicsEngine");
config.Set("meshing", "Meshmerizer");
config.Set("physical_prim", true);
config.Set("serverside_object_permissions", true);
config.Set("startup_console_commands_file", String.Empty);
config.Set("shutdown_console_commands_file", String.Empty);
config.Set("DefaultScriptEngine", "XEngine");
config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
}
return defaultConfig;
}
} }
} }