diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/General/Configuration/AssetConfig.cs | 5 | ||||
-rw-r--r-- | OpenSim/Framework/General/Configuration/GridConfig.cs | 10 | ||||
-rw-r--r-- | OpenSim/Framework/General/Configuration/UserConfig.cs | 8 |
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 | |||
41 | 41 | ||
42 | public string DatabaseProvider = ""; | 42 | public string DatabaseProvider = ""; |
43 | 43 | ||
44 | public uint HttpPort = 8003; | 44 | public static uint DefaultHttpPort = 8003; |
45 | public uint HttpPort = DefaultHttpPort; | ||
45 | 46 | ||
46 | private ConfigurationMember configMember; | 47 | private ConfigurationMember configMember; |
47 | 48 | ||
@@ -57,7 +58,7 @@ namespace OpenSim.Framework.Configuration | |||
57 | 58 | ||
58 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | 59 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); |
59 | 60 | ||
60 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8003", false); | 61 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false); |
61 | 62 | ||
62 | } | 63 | } |
63 | 64 | ||
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 | |||
48 | 48 | ||
49 | public string DatabaseProvider = ""; | 49 | public string DatabaseProvider = ""; |
50 | 50 | ||
51 | public uint HttpPort = 8001; | 51 | public static uint DefaultHttpPort = 8001; |
52 | public uint HttpPort = DefaultHttpPort; | ||
52 | 53 | ||
53 | private ConfigurationMember configMember; | 54 | private ConfigurationMember configMember; |
54 | public GridConfig(string description, string filename) | 55 | public GridConfig(string description, string filename) |
@@ -60,11 +61,11 @@ namespace OpenSim.Framework.Configuration | |||
60 | public void loadConfigurationOptions() | 61 | public void loadConfigurationOptions() |
61 | { | 62 | { |
62 | configMember.addConfigurationOption("grid_owner", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "OGS Grid Owner", "OGS development team", false); | 63 | configMember.addConfigurationOption("grid_owner", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "OGS Grid Owner", "OGS development team", false); |
63 | configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:8003/", false); | 64 | configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/", false); |
64 | configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false); | 65 | configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false); |
65 | configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from asset server", "null", false); | 66 | configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from asset server", "null", false); |
66 | 67 | ||
67 | configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:8002/", false); | 68 | configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/", false); |
68 | configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); | 69 | configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); |
69 | configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false); | 70 | configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false); |
70 | 71 | ||
@@ -72,7 +73,7 @@ namespace OpenSim.Framework.Configuration | |||
72 | configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false); | 73 | configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false); |
73 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); | 74 | configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); |
74 | 75 | ||
75 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", "8001" , false); | 76 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false); |
76 | } | 77 | } |
77 | 78 | ||
78 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 79 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -109,7 +110,6 @@ namespace OpenSim.Framework.Configuration | |||
109 | case "database_provider": | 110 | case "database_provider": |
110 | this.DatabaseProvider = (string)configuration_result; | 111 | this.DatabaseProvider = (string)configuration_result; |
111 | break; | 112 | break; |
112 | |||
113 | case "http_port": | 113 | case "http_port": |
114 | HttpPort = (uint)configuration_result; | 114 | HttpPort = (uint)configuration_result; |
115 | break; | 115 | 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 | |||
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; |