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