aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/ConfigSettings.cs7
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs31
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs18
5 files changed, 6 insertions, 54 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);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index b8a4e8e..9d37cdf 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
147// /// <summary> 147// /// <summary>
148// /// Test adding a client to the stack 148// /// Test adding a client to the stack
149// /// </summary> 149// /// </summary>
150// [Test, LongRunning] 150// [Test]
151// public void TestAddClient() 151// public void TestAddClient()
152// { 152// {
153// TestHelper.InMethod(); 153// TestHelper.InMethod();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0820d01..53c9297 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9842,8 +9842,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9842 IConfigSource config = m_ScriptEngine.ConfigSource; 9842 IConfigSource config = m_ScriptEngine.ConfigSource;
9843 if (config.Configs["Network"] != null) 9843 if (config.Configs["Network"] != null)
9844 { 9844 {
9845 shard = config.Configs["Network"].GetString(
9846 "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
9847 shard = config.Configs["Network"].GetString("shard", shard); 9845 shard = config.Configs["Network"].GetString("shard", shard);
9848 } 9846 }
9849 9847
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
index 0da9fc1..afe2f27 100644
--- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
+++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs
@@ -67,12 +67,9 @@ namespace OpenSim.Server.Handlers.Grid
67 _info["platform"] = "OpenSim"; 67 _info["platform"] = "OpenSim";
68 try 68 try
69 { 69 {
70 IConfig startupCfg = configSource.Configs["Startup"];
71 IConfig gridCfg = configSource.Configs["GridInfoService"]; 70 IConfig gridCfg = configSource.Configs["GridInfoService"];
72 IConfig netCfg = configSource.Configs["Network"]; 71 IConfig netCfg = configSource.Configs["Network"];
73 72
74 bool grid = startupCfg.GetBoolean("gridmode", false);
75
76 if (null != gridCfg) 73 if (null != gridCfg)
77 { 74 {
78 foreach (string k in gridCfg.GetKeys()) 75 foreach (string k in gridCfg.GetKeys())
@@ -82,16 +79,11 @@ namespace OpenSim.Server.Handlers.Grid
82 } 79 }
83 else if (null != netCfg) 80 else if (null != netCfg)
84 { 81 {
85 if (grid) 82 _info["login"]
86 _info["login"] 83 = String.Format(
87 = netCfg.GetString( 84 "http://127.0.0.1:{0}/",
88 "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); 85 netCfg.GetString(
89 else 86 "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
90 _info["login"]
91 = String.Format(
92 "http://127.0.0.1:{0}/",
93 netCfg.GetString(
94 "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
95 87
96 IssueWarning(); 88 IssueWarning();
97 } 89 }