diff options
* Applied Chillken patch #419: consolidate_ports-r2096-3.patch - consolidated port number defaults. Thankx Chillken!
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/Configuration/UserConfig.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
44 | 44 | ||
45 | public string DatabaseProvider = ""; | 45 | public string DatabaseProvider = ""; |
46 | 46 | ||
47 | public uint HttpPort = 8002; | 47 | public static uint DefaultHttpPort = 8002; |
48 | public uint HttpPort = DefaultHttpPort; | ||
48 | 49 | ||
49 | private ConfigurationMember configMember; | 50 | private ConfigurationMember configMember; |
50 | 51 | ||
@@ -58,12 +59,12 @@ namespace OpenSim.Framework.Configuration | |||
58 | { | 59 | { |
59 | configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false); | 60 | configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false); |
60 | 61 | ||
61 | configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false); | 62 | configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false); |
62 | configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false); | 63 | configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false); |
63 | configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false); | 64 | configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false); |
64 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | 65 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); |
65 | 66 | ||
66 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8002", false); | 67 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false); |
67 | 68 | ||
68 | } | 69 | } |
69 | 70 | ||
@@ -86,7 +87,6 @@ namespace OpenSim.Framework.Configuration | |||
86 | case "database_provider": | 87 | case "database_provider": |
87 | this.DatabaseProvider = (string)configuration_result; | 88 | this.DatabaseProvider = (string)configuration_result; |
88 | break; | 89 | break; |
89 | |||
90 | case "http_port": | 90 | case "http_port": |
91 | HttpPort = (uint)configuration_result; | 91 | HttpPort = (uint)configuration_result; |
92 | break; | 92 | break; |