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

3 files changed, 12 insertions, 11 deletions

diff --git a/OpenSim/Framework/General/Configuration/AssetConfig.cs b/OpenSim/Framework/General/Configuration/AssetConfig.cs
index 95f578c..a7c87ad 100644
--- a/OpenSim/Framework/General/Configuration/AssetConfig.cs
+++ b/OpenSim/Framework/General/Configuration/AssetConfig.cs
@@ -41,7 +41,8 @@ namespace OpenSim.Framework.Configuration
 

         public string DatabaseProvider = "";

 

-        public uint HttpPort = 8003;

+        public static uint DefaultHttpPort = 8003;

+        public uint HttpPort = DefaultHttpPort;

 

         private ConfigurationMember configMember;

 

@@ -57,7 +58,7 @@ namespace OpenSim.Framework.Configuration
 

             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);

 

-            configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8003", false);

+            configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false);

 

         }

 

diff --git a/OpenSim/Framework/General/Configuration/GridConfig.cs b/OpenSim/Framework/General/Configuration/GridConfig.cs
index 2910c5c..9020404 100644
--- a/OpenSim/Framework/General/Configuration/GridConfig.cs
+++ b/OpenSim/Framework/General/Configuration/GridConfig.cs
@@ -48,7 +48,8 @@ namespace OpenSim.Framework.Configuration
 
         public string DatabaseProvider = "";
 
-        public uint HttpPort = 8001;
+        public static uint DefaultHttpPort = 8001;
+        public uint HttpPort = DefaultHttpPort;
         
         private ConfigurationMember configMember;
         public GridConfig(string description, string filename)
@@ -60,11 +61,11 @@ namespace OpenSim.Framework.Configuration
         public void loadConfigurationOptions()
         {
             configMember.addConfigurationOption("grid_owner", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "OGS Grid Owner", "OGS development team", false);
-            configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:8003/", false);
+            configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/", false);
             configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false);
             configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from asset server", "null", false);
 
-            configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:8002/", false);
+            configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/", false);
             configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false);
             configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false);
 
@@ -72,7 +73,7 @@ namespace OpenSim.Framework.Configuration
             configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false);
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
 
-            configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8001" , false);
+            configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false);
         }
 
         public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -109,7 +110,6 @@ namespace OpenSim.Framework.Configuration
                 case "database_provider":
                     this.DatabaseProvider = (string)configuration_result;
                     break;
-
                 case "http_port":
                     HttpPort = (uint)configuration_result;
                     break;
diff --git a/OpenSim/Framework/General/Configuration/UserConfig.cs b/OpenSim/Framework/General/Configuration/UserConfig.cs
index feeccdf..d664e94 100644
--- a/OpenSim/Framework/General/Configuration/UserConfig.cs
+++ b/OpenSim/Framework/General/Configuration/UserConfig.cs
@@ -44,7 +44,8 @@ namespace OpenSim.Framework.Configuration
 
         public string DatabaseProvider = "";
 
-        public uint HttpPort = 8002;
+        public static uint DefaultHttpPort = 8002;
+        public uint HttpPort = DefaultHttpPort;
 
         private ConfigurationMember configMember;
 
@@ -58,12 +59,12 @@ namespace OpenSim.Framework.Configuration
         {
             configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false);
 
-            configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false);
+            configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false);
             configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);
             configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);
             configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
 
-            configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8002", false);
+            configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false);
 
         }
 
@@ -86,7 +87,6 @@ namespace OpenSim.Framework.Configuration
                 case "database_provider":
                     this.DatabaseProvider = (string)configuration_result;
                     break;
-
                 case "http_port":
                     HttpPort = (uint)configuration_result;
                     break;