* Moved the DefaultConfig settings into already-existing ConfigSettings

10 files changed, 45 insertions, 54 deletions

diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index f9e6954..2c2e327 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
     {
         public string DatabaseConnect = String.Empty;
         public string DatabaseProvider = String.Empty;
-        public uint HttpPort = DefaultSettings.DefaultAssetServerHttpPort;
+        public uint HttpPort = ConfigSettings.DefaultAssetServerHttpPort;
         public string AssetSetsLocation = string.Empty;
 
         public AssetConfig(string description, string filename)
@@ -56,7 +56,7 @@ namespace OpenSim.Framework
                                                 "Database connection string", "", false);
 
             m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Http Listener port", DefaultSettings.DefaultAssetServerHttpPort.ToString(), false);
+                                                "Http Listener port", ConfigSettings.DefaultAssetServerHttpPort.ToString(), false);
 
             m_configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                         "Location of 'AssetSets.xml'",
diff --git a/OpenSim/Framework/Communications/Services/GridInfoService.cs b/OpenSim/Framework/Communications/Services/GridInfoService.cs
index 47ea61a..e53400c 100644
--- a/OpenSim/Framework/Communications/Services/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/Services/GridInfoService.cs
@@ -104,13 +104,13 @@ namespace OpenSim.Framework.Communications.Services
                     if (grid)
                         _info["login"] 
                             = netCfg.GetString(
-                                "user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString());
+                                "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
                     else
                         _info["login"] 
                             = String.Format(
                                 "http://127.0.0.1:{0}/", 
                                 netCfg.GetString(
-                                    "http_listener_port", DefaultSettings.DefaultRegionHttpPort.ToString()));
+                                    "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
                     
                     IssueWarning();
                 }
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 5f5e16f..77b05c8 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -212,5 +212,15 @@ namespace OpenSim.Framework
                 m_assetSetsXMLFile = value;
             }
         }
+
+        public const uint DefaultAssetServerHttpPort = 8003;
+        public const uint DefaultRegionHttpPort = 9000;
+        public static uint DefaultRegionRemotingPort = 8895; // This is actually assigned to, but then again, the remoting is obsolete, right?
+        public const uint DefaultUserServerHttpPort = 8002;
+        public const bool DefaultUserServerHttpSSL = false;
+        public const uint DefaultMessageServerHttpPort = 8006;
+        public const bool DefaultMessageServerHttpSSL = false;
+        public const uint DefaultGridServerHttpPort = 8001;
+        public const uint DefaultInventoryServerHttpPort = 8004;
     }
 }
diff --git a/OpenSim/Framework/DefaultSettings.cs b/OpenSim/Framework/DefaultSettings.cs
deleted file mode 100644
index 8277914..0000000
--- a/OpenSim/Framework/DefaultSettings.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Framework

-{

-    public static class DefaultSettings

-    {

-        public const uint DefaultAssetServerHttpPort = 8003;

-        public const uint DefaultRegionHttpPort = 9000;

-        public static uint DefaultRegionRemotingPort = 8895; // This is actually assigned to, but then again, the remoting is obsolete, right?

-        public const uint DefaultUserServerHttpPort = 8002;

-        public const bool DefaultUserServerHttpSSL = false;

-        public const uint DefaultMessageServerHttpPort = 8006;

-        public const bool DefaultMessageServerHttpSSL = false;

-        public const uint DefaultGridServerHttpPort = 8001;

-        public const uint DefaultInventoryServerHttpPort = 8004;

-    }

-}

diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 679c84b..b24c81f 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
         public string DatabaseConnect = String.Empty;
         public string DefaultAssetServer = String.Empty;
         public string DefaultUserServer = String.Empty;
-        public uint HttpPort = DefaultSettings.DefaultGridServerHttpPort;
+        public uint HttpPort = ConfigSettings.DefaultGridServerHttpPort;
         public string SimRecvKey = String.Empty;
         public string SimSendKey = String.Empty;
         public string UserRecvKey = String.Empty;
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
             m_configMember.addConfigurationOption("default_asset_server",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Default Asset Server URI",
-                                                "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString() + "/",
+                                                "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/",
                                                 false);
             m_configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Key to send to asset server", "null", false);
@@ -68,7 +68,7 @@ namespace OpenSim.Framework
             m_configMember.addConfigurationOption("default_user_server",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Default User Server URI",
-                                                "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString() + "/", false);
+                                                "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString() + "/", false);
             m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Key to send to user server", "null", false);
             m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -84,7 +84,7 @@ namespace OpenSim.Framework
                                                 "Database connect string", "", false);
 
             m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Http Listener port", DefaultSettings.DefaultGridServerHttpPort.ToString(), false);
+                                                "Http Listener port", ConfigSettings.DefaultGridServerHttpPort.ToString(), false);
 
             m_configMember.addConfigurationOption("allow_forceful_banlines",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING,
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index aafb6de..858d168 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
         public string DatabaseConnect = String.Empty;
         public string DatabaseProvider = String.Empty;
         public string DefaultStartupMsg = String.Empty;
-        public uint HttpPort = DefaultSettings.DefaultInventoryServerHttpPort;
+        public uint HttpPort = ConfigSettings.DefaultInventoryServerHttpPort;
         public string InventoryServerURL = String.Empty;
         public string UserServerURL = String.Empty;
         public string AssetServerURL = String.Empty;
@@ -70,7 +70,7 @@ namespace OpenSim.Framework
             m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Database Connect String", "", false);
             m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Http Listener port", DefaultSettings.DefaultInventoryServerHttpPort.ToString(), false);
+                                                "Http Listener port", ConfigSettings.DefaultInventoryServerHttpPort.ToString(), false);
             m_configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
                                                 "Enable session lookup security", "False", false);
             m_configMember.addConfigurationOption("region_access", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index 1e4b818..abbaee0 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -40,8 +40,8 @@ namespace OpenSim.Framework
         public string GridRecvKey = String.Empty;
         public string GridSendKey = String.Empty;
         public string GridServerURL = String.Empty;
-        public uint HttpPort = DefaultSettings.DefaultMessageServerHttpPort;
-        public bool HttpSSL = DefaultSettings.DefaultMessageServerHttpSSL;
+        public uint HttpPort = ConfigSettings.DefaultMessageServerHttpPort;
+        public bool HttpSSL = ConfigSettings.DefaultMessageServerHttpSSL;
         public string MessageServerIP = String.Empty;
         public string UserRecvKey = String.Empty;
         public string UserSendKey = String.Empty;
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
             m_configMember.addConfigurationOption("default_user_server",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Default User Server URI",
-                                                "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString() + "/", false);
+                                                "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString() + "/", false);
             m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Key to send to user server", "null", false);
             m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -67,7 +67,7 @@ namespace OpenSim.Framework
             m_configMember.addConfigurationOption("default_grid_server",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Default Grid Server URI",
-                                                "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString() + "/", false);
+                                                "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString() + "/", false);
             m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Key to send to grid server", "null", false);
             m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -83,9 +83,9 @@ namespace OpenSim.Framework
                                                 "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false);
 
             m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Http Listener port", DefaultSettings.DefaultMessageServerHttpPort.ToString(), false);
+                                                "Http Listener port", ConfigSettings.DefaultMessageServerHttpPort.ToString(), false);
             m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
-                                                "Use SSL? true/false", DefaultSettings.DefaultMessageServerHttpSSL.ToString(), false);
+                                                "Use SSL? true/false", ConfigSettings.DefaultMessageServerHttpSSL.ToString(), false);
             m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "My Published IP Address", "127.0.0.1", false);
         }
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 11ea709..293602d 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -33,12 +33,12 @@ namespace OpenSim.Framework
     public class NetworkServersInfo
     {
         public string AssetSendKey = String.Empty;        
-        public string AssetURL = "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString() + "/";
+        public string AssetURL = "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/";
 
         public string GridRecvKey = String.Empty;
         public string GridSendKey = String.Empty;
         public string GridURL = String.Empty;
-        public uint HttpListenerPort = DefaultSettings.DefaultRegionHttpPort;
+        public uint HttpListenerPort = ConfigSettings.DefaultRegionHttpPort;
         public string InventoryURL = String.Empty;
         public bool secureInventoryServer = false;
         public bool isSandbox;
@@ -79,31 +79,31 @@ namespace OpenSim.Framework
             m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
 
             HttpListenerPort =
-                (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultSettings.DefaultRegionHttpPort);
+                (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort);
             httpSSLPort =
-                (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultSettings.DefaultRegionHttpPort+1));
+                (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1));
             HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
             HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
-            DefaultSettings.DefaultRegionRemotingPort =
-                (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) DefaultSettings.DefaultRegionRemotingPort);
+            ConfigSettings.DefaultRegionRemotingPort =
+                (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) ConfigSettings.DefaultRegionRemotingPort);
             GridURL =
                 config.Configs["Network"].GetString("grid_server_url",
-                                                    "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString());
+                                                    "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString());
             GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");
             GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");
             UserURL =
                 config.Configs["Network"].GetString("user_server_url",
-                                                    "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString());
+                                                    "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
             UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
             UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
             AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
             InventoryURL = config.Configs["Network"].GetString("inventory_server_url",
                                                                "http://127.0.0.1:" +
-                                                               DefaultSettings.DefaultInventoryServerHttpPort.ToString());
+                                                               ConfigSettings.DefaultInventoryServerHttpPort.ToString());
             secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
 
             MessagingURL = config.Configs["Network"].GetString("messaging_server_url",
-                                                               "http://127.0.0.1:" + DefaultSettings.DefaultMessageServerHttpPort);
+                                                               "http://127.0.0.1:" + ConfigSettings.DefaultMessageServerHttpPort);
         }
     }
 }
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 8d8b25a..a0f536a 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -366,7 +366,7 @@ namespace OpenSim.Framework
                 errorMessage = "needs an IP Address (IPAddress)";
             }
             m_internalEndPoint.Port =
-                source.Configs[sectionName].GetInt("internal_ip_port", (int) DefaultSettings.DefaultRegionHttpPort);
+                source.Configs[sectionName].GetInt("internal_ip_port", (int) ConfigSettings.DefaultRegionHttpPort);
 
             string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1");
             if (externalHost != "SYSTEMIP")
@@ -475,7 +475,7 @@ namespace OpenSim.Framework
                                                 false);
             configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
                                                 "Internal IP Port for incoming UDP client connections",
-                                                DefaultSettings.DefaultRegionHttpPort.ToString(), false);
+                                                ConfigSettings.DefaultRegionHttpPort.ToString(), false);
             configMember.addConfigurationOption("allow_alternate_ports", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
                                                 "Allow sim to find alternate UDP ports when ports are in use?",
                                                 "false", true);
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index b898f89..57ead7e 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -42,8 +42,8 @@ namespace OpenSim.Framework
         public uint DefaultY = 1000;
         public string GridRecvKey = String.Empty;
         public string GridSendKey = String.Empty;
-        public uint HttpPort = DefaultSettings.DefaultUserServerHttpPort;
-        public bool HttpSSL = DefaultSettings.DefaultUserServerHttpSSL;
+        public uint HttpPort = ConfigSettings.DefaultUserServerHttpPort;
+        public bool HttpSSL = ConfigSettings.DefaultUserServerHttpSSL;
         public uint DefaultUserLevel = 0;
         public string LibraryXmlfile = "";
 
@@ -112,7 +112,7 @@ namespace OpenSim.Framework
             m_configMember.addConfigurationOption("default_grid_server",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Default Grid Server URI",
-                                                "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort + "/", false);
+                                                "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort + "/", false);
             m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "Key to send to grid server", "null", false);
             m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -121,12 +121,12 @@ namespace OpenSim.Framework
             m_configMember.addConfigurationOption("default_inventory_server",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "Default Inventory Server URI",
-                                                "http://127.0.0.1:" + DefaultSettings.DefaultInventoryServerHttpPort + "/",
+                                                "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort + "/",
                                                 false);
             m_configMember.addConfigurationOption("default_authentication_server",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
                                                 "User Server (this) External URI for authentication keys",
-                                                "http://localhost:" + DefaultSettings.DefaultUserServerHttpPort + "/",
+                                                "http://localhost:" + ConfigSettings.DefaultUserServerHttpPort + "/",
                                                 false);
             m_configMember.addConfigurationOption("library_location",
                                                 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -139,9 +139,9 @@ namespace OpenSim.Framework
                                                 "Connection String for Database", "", false);
 
             m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
-                                                "Http Listener port", DefaultSettings.DefaultUserServerHttpPort.ToString(), false);
+                                                "Http Listener port", ConfigSettings.DefaultUserServerHttpPort.ToString(), false);
             m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
-                                                "Use SSL? true/false", DefaultSettings.DefaultUserServerHttpSSL.ToString(), false);
+                                                "Use SSL? true/false", ConfigSettings.DefaultUserServerHttpSSL.ToString(), false);
             m_configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Known good region X", "1000", false);
             m_configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,