* Applied Chillken patch #419: consolidate_ports-r2096-3.patch - consolidated port number defaults. Thankx Chillken!

2 files changed, 11 insertions, 10 deletions

diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index b65488a..9e4bdb1 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Types
 {
     public class NetworkServersInfo
     {
-        public string AssetURL = "http://127.0.0.1:8003/";
+        public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
         public string AssetSendKey = "";
 
         public string GridURL = "";
@@ -46,7 +46,9 @@ namespace OpenSim.Framework.Types
         public string UserRecvKey = "";
         public bool isSandbox;
 
-        public int HttpListenerPort = 9000;
+        public static int DefaultHttpListenerPort = 9000;
+        public int HttpListenerPort = DefaultHttpListenerPort;
+
         public int RemotingListenerPort = 8895;
 
 
@@ -77,15 +79,15 @@ namespace OpenSim.Framework.Types
             m_defaultHomeLocX = (uint)config.Configs["StandAlone"].GetInt("default_location_x", 1000);
             m_defaultHomeLocY = (uint)config.Configs["StandAlone"].GetInt("default_location_y", 1000);
 
-            HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", 9000);
-            RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", 8895);
-            GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:8001");
+            HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort);
+            RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort);
+            GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.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:8002");
+            UserURL = config.Configs["Network"].GetString("user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.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", "http://127.0.0.1:8003");
+            AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
 
         }
     }
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index c1e040d..5054510 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Framework.Types
             {
                 errorMessage = "needs an IP Address (IPAddress)";
             }
-            this.m_internalEndPoint.Port = source.Configs[sectionName].GetInt("internal_ip_port", (int)9000);
+            this.m_internalEndPoint.Port = source.Configs[sectionName].GetInt("internal_ip_port", NetworkServersInfo.DefaultHttpListenerPort);
 
             string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1");
             if (externalHost != "SYSTEMIP")
@@ -226,12 +226,11 @@ namespace OpenSim.Framework.Types
             configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (Y Axis)", "1000", false);
             configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
             configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false);
-            configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", "9000", false);
+            configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false);
             configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false);
             configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false);
             configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false);
             configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false);
-
         }
 
         public bool handleIncomingConfiguration(string configuration_key, object configuration_result)