diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/ConfigSettings.cs | 7 | ||||
-rw-r--r-- | OpenSim/Framework/NetworkServersInfo.cs | 31 |
2 files changed, 0 insertions, 38 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs index 50328d7..b0bdebe 100644 --- a/OpenSim/Framework/ConfigSettings.cs +++ b/OpenSim/Framework/ConfigSettings.cs | |||
@@ -37,13 +37,6 @@ namespace OpenSim.Framework | |||
37 | public bool PhysicalPrim { get; set; } | 37 | public bool PhysicalPrim { get; set; } |
38 | public string LibrariesXMLFile { get; set; } | 38 | public string LibrariesXMLFile { get; set; } |
39 | 39 | ||
40 | public const uint DefaultAssetServerHttpPort = 8003; | ||
41 | public const uint DefaultRegionHttpPort = 9000; | 40 | public const uint DefaultRegionHttpPort = 9000; |
42 | public const uint DefaultUserServerHttpPort = 8002; | ||
43 | public const bool DefaultUserServerHttpSSL = false; | ||
44 | public const uint DefaultMessageServerHttpPort = 8006; | ||
45 | public const bool DefaultMessageServerHttpSSL = false; | ||
46 | public const uint DefaultGridServerHttpPort = 8003; | ||
47 | public const uint DefaultInventoryServerHttpPort = 8003; | ||
48 | } | 41 | } |
49 | } \ No newline at end of file | 42 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs index 5bb4111..4b7d4c7 100644 --- a/OpenSim/Framework/NetworkServersInfo.cs +++ b/OpenSim/Framework/NetworkServersInfo.cs | |||
@@ -32,19 +32,9 @@ namespace OpenSim.Framework | |||
32 | { | 32 | { |
33 | public class NetworkServersInfo | 33 | public class NetworkServersInfo |
34 | { | 34 | { |
35 | public string AssetSendKey = String.Empty; | ||
36 | public string AssetURL = "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/"; | ||
37 | |||
38 | public string GridRecvKey = String.Empty; | ||
39 | public string GridSendKey = String.Empty; | ||
40 | public string GridURL = String.Empty; | ||
41 | public uint HttpListenerPort = ConfigSettings.DefaultRegionHttpPort; | 35 | public uint HttpListenerPort = ConfigSettings.DefaultRegionHttpPort; |
42 | public string InventoryURL = String.Empty; | ||
43 | public bool secureInventoryServer = false; | 36 | public bool secureInventoryServer = false; |
44 | public bool isSandbox; | 37 | public bool isSandbox; |
45 | public string UserRecvKey = String.Empty; | ||
46 | public string UserSendKey = String.Empty; | ||
47 | public string UserURL = String.Empty; | ||
48 | public bool HttpUsesSSL = false; | 38 | public bool HttpUsesSSL = false; |
49 | public string HttpSSLCN = ""; | 39 | public string HttpSSLCN = ""; |
50 | public uint httpSSLPort = 9001; | 40 | public uint httpSSLPort = 9001; |
@@ -55,8 +45,6 @@ namespace OpenSim.Framework | |||
55 | public string cert_path = String.Empty; | 45 | public string cert_path = String.Empty; |
56 | public string cert_pass = String.Empty; | 46 | public string cert_pass = String.Empty; |
57 | 47 | ||
58 | public string MessagingURL = String.Empty; | ||
59 | |||
60 | public NetworkServersInfo() | 48 | public NetworkServersInfo() |
61 | { | 49 | { |
62 | } | 50 | } |
@@ -65,33 +53,14 @@ namespace OpenSim.Framework | |||
65 | { | 53 | { |
66 | } | 54 | } |
67 | 55 | ||
68 | |||
69 | public void loadFromConfiguration(IConfigSource config) | 56 | public void loadFromConfiguration(IConfigSource config) |
70 | { | 57 | { |
71 | |||
72 | HttpListenerPort = | 58 | HttpListenerPort = |
73 | (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort); | 59 | (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort); |
74 | httpSSLPort = | 60 | httpSSLPort = |
75 | (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1)); | 61 | (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1)); |
76 | HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); | 62 | HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); |
77 | HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost"); | 63 | HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost"); |
78 | GridURL = | ||
79 | config.Configs["Network"].GetString("grid_server_url", | ||
80 | "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()); | ||
81 | GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null"); | ||
82 | GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null"); | ||
83 | UserURL = | ||
84 | config.Configs["Network"].GetString("user_server_url", | ||
85 | "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); | ||
86 | UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); | ||
87 | UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); | ||
88 | AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL); | ||
89 | InventoryURL = config.Configs["Network"].GetString("inventory_server_url", | ||
90 | "http://127.0.0.1:" + | ||
91 | ConfigSettings.DefaultInventoryServerHttpPort.ToString()); | ||
92 | secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true); | ||
93 | |||
94 | MessagingURL = config.Configs["Network"].GetString("messaging_server_url", string.Empty); | ||
95 | 64 | ||
96 | // "Out of band management https" | 65 | // "Out of band management https" |
97 | ssl_listener = config.Configs["Network"].GetBoolean("https_listener",false); | 66 | ssl_listener = config.Configs["Network"].GetBoolean("https_listener",false); |