From 08c9ad6a5b3346bd157fa70d4a0b8d120af59682 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 30 Jul 2019 18:03:01 +0100
Subject: Remove the outdated and no longer useful hardcoded config defaults

---
 OpenSim/Region/Application/ConfigurationLoader.cs | 39 -----------------------
 1 file changed, 39 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 62bd4f4..66e46cb 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");
 
@@ -329,44 +328,6 @@ namespace OpenSim
         }
 
         /// <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("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;
-        }
-
-        /// <summary>
         /// Read initial region settings from the ConfigSource
         /// </summary>
         protected virtual void ReadConfigSettings()
-- 
cgit v1.1