From 24aa13239c476b1d886f26c9a4d6cd7a3d83d84f Mon Sep 17 00:00:00 2001 From: Melanie Date: Tue, 30 Jul 2019 18:15:09 +0100 Subject: [PATCH] Also remove the defaults from Configger --- .../Tools/Configger/ConfigurationLoader.cs | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs index fa3a5bf11a..f23c80a7b0 100644 --- a/OpenSim/Tools/Configger/ConfigurationLoader.cs +++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs @@ -117,7 +117,6 @@ namespace OpenSim.Tools.Configger } m_config = new IniConfigSource(); - m_config.Merge(DefaultConfig()); m_log.Info("[CONFIG] Reading configuration settings"); @@ -246,35 +245,5 @@ namespace OpenSim.Tools.Configger } return success; } - - /// - /// Setup a default config values in case they aren't present in the ini file - /// - /// A Configuration source containing the default configuration - 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; - } } }