diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 62bd4f4ab6..66e46cb087 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs @@ -140,7 +140,6 @@ namespace OpenSim m_config = new OpenSimConfigSource(); m_config.Source = new IniConfigSource(); - m_config.Source.Merge(DefaultConfig()); m_log.Info("[CONFIG]: Reading configuration settings"); @@ -328,44 +327,6 @@ namespace OpenSim 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("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"); - } - - { - IConfig config = defaultConfig.Configs["Network"]; - - if (null == config) - config = defaultConfig.AddConfig("Network"); - - config.Set("http_listener_port", ConfigSettings.DefaultRegionHttpPort); - } - - return defaultConfig; - } - /// /// Read initial region settings from the ConfigSource ///