diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/NetworkServersInfo.cs | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs index 23b1627..11ea709 100644 --- a/OpenSim/Framework/NetworkServersInfo.cs +++ b/OpenSim/Framework/NetworkServersInfo.cs | |||
@@ -32,15 +32,13 @@ namespace OpenSim.Framework | |||
32 | { | 32 | { |
33 | public class NetworkServersInfo | 33 | public class NetworkServersInfo |
34 | { | 34 | { |
35 | public static readonly uint DefaultHttpListenerPort = 9000; | ||
36 | public static uint RemotingListenerPort = 8895; | ||
37 | public string AssetSendKey = String.Empty; | 35 | public string AssetSendKey = String.Empty; |
38 | public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/"; | 36 | public string AssetURL = "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString() + "/"; |
39 | 37 | ||
40 | public string GridRecvKey = String.Empty; | 38 | public string GridRecvKey = String.Empty; |
41 | public string GridSendKey = String.Empty; | 39 | public string GridSendKey = String.Empty; |
42 | public string GridURL = String.Empty; | 40 | public string GridURL = String.Empty; |
43 | public uint HttpListenerPort = DefaultHttpListenerPort; | 41 | public uint HttpListenerPort = DefaultSettings.DefaultRegionHttpPort; |
44 | public string InventoryURL = String.Empty; | 42 | public string InventoryURL = String.Empty; |
45 | public bool secureInventoryServer = false; | 43 | public bool secureInventoryServer = false; |
46 | public bool isSandbox; | 44 | public bool isSandbox; |
@@ -81,31 +79,31 @@ namespace OpenSim.Framework | |||
81 | m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000); | 79 | m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000); |
82 | 80 | ||
83 | HttpListenerPort = | 81 | HttpListenerPort = |
84 | (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultHttpListenerPort); | 82 | (uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultSettings.DefaultRegionHttpPort); |
85 | httpSSLPort = | 83 | httpSSLPort = |
86 | (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1)); | 84 | (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultSettings.DefaultRegionHttpPort+1)); |
87 | HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); | 85 | HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); |
88 | HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost"); | 86 | HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost"); |
89 | RemotingListenerPort = | 87 | DefaultSettings.DefaultRegionRemotingPort = |
90 | (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort); | 88 | (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) DefaultSettings.DefaultRegionRemotingPort); |
91 | GridURL = | 89 | GridURL = |
92 | config.Configs["Network"].GetString("grid_server_url", | 90 | config.Configs["Network"].GetString("grid_server_url", |
93 | "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()); | 91 | "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString()); |
94 | GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null"); | 92 | GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null"); |
95 | GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null"); | 93 | GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null"); |
96 | UserURL = | 94 | UserURL = |
97 | config.Configs["Network"].GetString("user_server_url", | 95 | config.Configs["Network"].GetString("user_server_url", |
98 | "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString()); | 96 | "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); |
99 | UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); | 97 | UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); |
100 | UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); | 98 | UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); |
101 | AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL); | 99 | AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL); |
102 | InventoryURL = config.Configs["Network"].GetString("inventory_server_url", | 100 | InventoryURL = config.Configs["Network"].GetString("inventory_server_url", |
103 | "http://127.0.0.1:" + | 101 | "http://127.0.0.1:" + |
104 | InventoryConfig.DefaultHttpPort.ToString()); | 102 | DefaultSettings.DefaultInventoryServerHttpPort.ToString()); |
105 | secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true); | 103 | secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true); |
106 | 104 | ||
107 | MessagingURL = config.Configs["Network"].GetString("messaging_server_url", | 105 | MessagingURL = config.Configs["Network"].GetString("messaging_server_url", |
108 | "http://127.0.0.1:" + MessageServerConfig.DefaultHttpPort); | 106 | "http://127.0.0.1:" + DefaultSettings.DefaultMessageServerHttpPort); |
109 | } | 107 | } |
110 | } | 108 | } |
111 | } | 109 | } |