aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712009-04-17 15:09:37 +0000
committerlbsa712009-04-17 15:09:37 +0000
commita189da844a1ec48b321674f49a81c4e0a71c8b81 (patch)
treeeb55b24007c0f221a7d9f84bdbb12282d161c777
parent* remind me to never touch EstateSettings ever again. Ever. (diff)
downloadopensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.zip
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.gz
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.bz2
opensim-SC_OLD-a189da844a1ec48b321674f49a81c4e0a71c8b81.tar.xz
* Moved the DefaultConfig settings into already-existing ConfigSettings
Diffstat
-rw-r--r--OpenSim/Framework/AssetConfig.cs4
-rw-r--r--OpenSim/Framework/Communications/Services/GridInfoService.cs4
-rw-r--r--OpenSim/Framework/ConfigSettings.cs10
-rw-r--r--OpenSim/Framework/DefaultSettings.cs19
-rw-r--r--OpenSim/Framework/GridConfig.cs8
-rw-r--r--OpenSim/Framework/InventoryConfig.cs4
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs12
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs20
-rw-r--r--OpenSim/Framework/RegionInfo.cs4
-rw-r--r--OpenSim/Framework/UserConfig.cs14
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs12
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
15 files changed, 59 insertions, 68 deletions
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index f9e6954..2c2e327 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 { 37 {
38 public string DatabaseConnect = String.Empty; 38 public string DatabaseConnect = String.Empty;
39 public string DatabaseProvider = String.Empty; 39 public string DatabaseProvider = String.Empty;
40 public uint HttpPort = DefaultSettings.DefaultAssetServerHttpPort; 40 public uint HttpPort = ConfigSettings.DefaultAssetServerHttpPort;
41 public string AssetSetsLocation = string.Empty; 41 public string AssetSetsLocation = string.Empty;
42 42
43 public AssetConfig(string description, string filename) 43 public AssetConfig(string description, string filename)
@@ -56,7 +56,7 @@ namespace OpenSim.Framework
56 "Database connection string", "", false); 56 "Database connection string", "", false);
57 57
58 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 58 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
59 "Http Listener port", DefaultSettings.DefaultAssetServerHttpPort.ToString(), false); 59 "Http Listener port", ConfigSettings.DefaultAssetServerHttpPort.ToString(), false);
60 60
61 m_configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 61 m_configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
62 "Location of 'AssetSets.xml'", 62 "Location of 'AssetSets.xml'",
diff --git a/OpenSim/Framework/Communications/Services/GridInfoService.cs b/OpenSim/Framework/Communications/Services/GridInfoService.cs
index 47ea61a..e53400c 100644
--- a/OpenSim/Framework/Communications/Services/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/Services/GridInfoService.cs
@@ -104,13 +104,13 @@ namespace OpenSim.Framework.Communications.Services
104 if (grid) 104 if (grid)
105 _info["login"] 105 _info["login"]
106 = netCfg.GetString( 106 = netCfg.GetString(
107 "user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); 107 "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
108 else 108 else
109 _info["login"] 109 _info["login"]
110 = String.Format( 110 = String.Format(
111 "http://127.0.0.1:{0}/", 111 "http://127.0.0.1:{0}/",
112 netCfg.GetString( 112 netCfg.GetString(
113 "http_listener_port", DefaultSettings.DefaultRegionHttpPort.ToString())); 113 "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
114 114
115 IssueWarning(); 115 IssueWarning();
116 } 116 }
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 5f5e16f..77b05c8 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -212,5 +212,15 @@ namespace OpenSim.Framework
212 m_assetSetsXMLFile = value; 212 m_assetSetsXMLFile = value;
213 } 213 }
214 } 214 }
215
216 public const uint DefaultAssetServerHttpPort = 8003;
217 public const uint DefaultRegionHttpPort = 9000;
218 public static uint DefaultRegionRemotingPort = 8895; // This is actually assigned to, but then again, the remoting is obsolete, right?
219 public const uint DefaultUserServerHttpPort = 8002;
220 public const bool DefaultUserServerHttpSSL = false;
221 public const uint DefaultMessageServerHttpPort = 8006;
222 public const bool DefaultMessageServerHttpSSL = false;
223 public const uint DefaultGridServerHttpPort = 8001;
224 public const uint DefaultInventoryServerHttpPort = 8004;
215 } 225 }
216} 226}
diff --git a/OpenSim/Framework/DefaultSettings.cs b/OpenSim/Framework/DefaultSettings.cs
deleted file mode 100644
index 8277914..0000000
--- a/OpenSim/Framework/DefaultSettings.cs
+++ /dev/null
@@ -1,19 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.Framework
6{
7 public static class DefaultSettings
8 {
9 public const uint DefaultAssetServerHttpPort = 8003;
10 public const uint DefaultRegionHttpPort = 9000;
11 public static uint DefaultRegionRemotingPort = 8895; // This is actually assigned to, but then again, the remoting is obsolete, right?
12 public const uint DefaultUserServerHttpPort = 8002;
13 public const bool DefaultUserServerHttpSSL = false;
14 public const uint DefaultMessageServerHttpPort = 8006;
15 public const bool DefaultMessageServerHttpSSL = false;
16 public const uint DefaultGridServerHttpPort = 8001;
17 public const uint DefaultInventoryServerHttpPort = 8004;
18 }
19}
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 679c84b..b24c81f 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
40 public string DatabaseConnect = String.Empty; 40 public string DatabaseConnect = String.Empty;
41 public string DefaultAssetServer = String.Empty; 41 public string DefaultAssetServer = String.Empty;
42 public string DefaultUserServer = String.Empty; 42 public string DefaultUserServer = String.Empty;
43 public uint HttpPort = DefaultSettings.DefaultGridServerHttpPort; 43 public uint HttpPort = ConfigSettings.DefaultGridServerHttpPort;
44 public string SimRecvKey = String.Empty; 44 public string SimRecvKey = String.Empty;
45 public string SimSendKey = String.Empty; 45 public string SimSendKey = String.Empty;
46 public string UserRecvKey = String.Empty; 46 public string UserRecvKey = String.Empty;
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
58 m_configMember.addConfigurationOption("default_asset_server", 58 m_configMember.addConfigurationOption("default_asset_server",
59 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 59 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
60 "Default Asset Server URI", 60 "Default Asset Server URI",
61 "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString() + "/", 61 "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/",
62 false); 62 false);
63 m_configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 63 m_configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
64 "Key to send to asset server", "null", false); 64 "Key to send to asset server", "null", false);
@@ -68,7 +68,7 @@ namespace OpenSim.Framework
68 m_configMember.addConfigurationOption("default_user_server", 68 m_configMember.addConfigurationOption("default_user_server",
69 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 69 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
70 "Default User Server URI", 70 "Default User Server URI",
71 "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString() + "/", false); 71 "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString() + "/", false);
72 m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 72 m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
73 "Key to send to user server", "null", false); 73 "Key to send to user server", "null", false);
74 m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 74 m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -84,7 +84,7 @@ namespace OpenSim.Framework
84 "Database connect string", "", false); 84 "Database connect string", "", false);
85 85
86 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 86 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
87 "Http Listener port", DefaultSettings.DefaultGridServerHttpPort.ToString(), false); 87 "Http Listener port", ConfigSettings.DefaultGridServerHttpPort.ToString(), false);
88 88
89 m_configMember.addConfigurationOption("allow_forceful_banlines", 89 m_configMember.addConfigurationOption("allow_forceful_banlines",
90 ConfigurationOption.ConfigurationTypes.TYPE_STRING, 90 ConfigurationOption.ConfigurationTypes.TYPE_STRING,
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index aafb6de..858d168 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework
37 public string DatabaseConnect = String.Empty; 37 public string DatabaseConnect = String.Empty;
38 public string DatabaseProvider = String.Empty; 38 public string DatabaseProvider = String.Empty;
39 public string DefaultStartupMsg = String.Empty; 39 public string DefaultStartupMsg = String.Empty;
40 public uint HttpPort = DefaultSettings.DefaultInventoryServerHttpPort; 40 public uint HttpPort = ConfigSettings.DefaultInventoryServerHttpPort;
41 public string InventoryServerURL = String.Empty; 41 public string InventoryServerURL = String.Empty;
42 public string UserServerURL = String.Empty; 42 public string UserServerURL = String.Empty;
43 public string AssetServerURL = String.Empty; 43 public string AssetServerURL = String.Empty;
@@ -70,7 +70,7 @@ namespace OpenSim.Framework
70 m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 70 m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
71 "Database Connect String", "", false); 71 "Database Connect String", "", false);
72 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 72 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
73 "Http Listener port", DefaultSettings.DefaultInventoryServerHttpPort.ToString(), false); 73 "Http Listener port", ConfigSettings.DefaultInventoryServerHttpPort.ToString(), false);
74 m_configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 74 m_configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
75 "Enable session lookup security", "False", false); 75 "Enable session lookup security", "False", false);
76 m_configMember.addConfigurationOption("region_access", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 76 m_configMember.addConfigurationOption("region_access", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index 1e4b818..abbaee0 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -40,8 +40,8 @@ namespace OpenSim.Framework
40 public string GridRecvKey = String.Empty; 40 public string GridRecvKey = String.Empty;
41 public string GridSendKey = String.Empty; 41 public string GridSendKey = String.Empty;
42 public string GridServerURL = String.Empty; 42 public string GridServerURL = String.Empty;
43 public uint HttpPort = DefaultSettings.DefaultMessageServerHttpPort; 43 public uint HttpPort = ConfigSettings.DefaultMessageServerHttpPort;
44 public bool HttpSSL = DefaultSettings.DefaultMessageServerHttpSSL; 44 public bool HttpSSL = ConfigSettings.DefaultMessageServerHttpSSL;
45 public string MessageServerIP = String.Empty; 45 public string MessageServerIP = String.Empty;
46 public string UserRecvKey = String.Empty; 46 public string UserRecvKey = String.Empty;
47 public string UserSendKey = String.Empty; 47 public string UserSendKey = String.Empty;
@@ -59,7 +59,7 @@ namespace OpenSim.Framework
59 m_configMember.addConfigurationOption("default_user_server", 59 m_configMember.addConfigurationOption("default_user_server",
60 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 60 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
61 "Default User Server URI", 61 "Default User Server URI",
62 "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString() + "/", false); 62 "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString() + "/", false);
63 m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 63 m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
64 "Key to send to user server", "null", false); 64 "Key to send to user server", "null", false);
65 m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 65 m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -67,7 +67,7 @@ namespace OpenSim.Framework
67 m_configMember.addConfigurationOption("default_grid_server", 67 m_configMember.addConfigurationOption("default_grid_server",
68 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 68 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
69 "Default Grid Server URI", 69 "Default Grid Server URI",
70 "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString() + "/", false); 70 "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString() + "/", false);
71 m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 71 m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
72 "Key to send to grid server", "null", false); 72 "Key to send to grid server", "null", false);
73 m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 73 m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -83,9 +83,9 @@ namespace OpenSim.Framework
83 "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false); 83 "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false);
84 84
85 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 85 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
86 "Http Listener port", DefaultSettings.DefaultMessageServerHttpPort.ToString(), false); 86 "Http Listener port", ConfigSettings.DefaultMessageServerHttpPort.ToString(), false);
87 m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 87 m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
88 "Use SSL? true/false", DefaultSettings.DefaultMessageServerHttpSSL.ToString(), false); 88 "Use SSL? true/false", ConfigSettings.DefaultMessageServerHttpSSL.ToString(), false);
89 m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 89 m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
90 "My Published IP Address", "127.0.0.1", false); 90 "My Published IP Address", "127.0.0.1", false);
91 } 91 }
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}
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 8d8b25a..a0f536a 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -366,7 +366,7 @@ namespace OpenSim.Framework
366 errorMessage = "needs an IP Address (IPAddress)"; 366 errorMessage = "needs an IP Address (IPAddress)";
367 } 367 }
368 m_internalEndPoint.Port = 368 m_internalEndPoint.Port =
369 source.Configs[sectionName].GetInt("internal_ip_port", (int) DefaultSettings.DefaultRegionHttpPort); 369 source.Configs[sectionName].GetInt("internal_ip_port", (int) ConfigSettings.DefaultRegionHttpPort);
370 370
371 string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1"); 371 string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1");
372 if (externalHost != "SYSTEMIP") 372 if (externalHost != "SYSTEMIP")
@@ -475,7 +475,7 @@ namespace OpenSim.Framework
475 false); 475 false);
476 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 476 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
477 "Internal IP Port for incoming UDP client connections", 477 "Internal IP Port for incoming UDP client connections",
478 DefaultSettings.DefaultRegionHttpPort.ToString(), false); 478 ConfigSettings.DefaultRegionHttpPort.ToString(), false);
479 configMember.addConfigurationOption("allow_alternate_ports", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 479 configMember.addConfigurationOption("allow_alternate_ports", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
480 "Allow sim to find alternate UDP ports when ports are in use?", 480 "Allow sim to find alternate UDP ports when ports are in use?",
481 "false", true); 481 "false", true);
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index b898f89..57ead7e 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -42,8 +42,8 @@ namespace OpenSim.Framework
42 public uint DefaultY = 1000; 42 public uint DefaultY = 1000;
43 public string GridRecvKey = String.Empty; 43 public string GridRecvKey = String.Empty;
44 public string GridSendKey = String.Empty; 44 public string GridSendKey = String.Empty;
45 public uint HttpPort = DefaultSettings.DefaultUserServerHttpPort; 45 public uint HttpPort = ConfigSettings.DefaultUserServerHttpPort;
46 public bool HttpSSL = DefaultSettings.DefaultUserServerHttpSSL; 46 public bool HttpSSL = ConfigSettings.DefaultUserServerHttpSSL;
47 public uint DefaultUserLevel = 0; 47 public uint DefaultUserLevel = 0;
48 public string LibraryXmlfile = ""; 48 public string LibraryXmlfile = "";
49 49
@@ -112,7 +112,7 @@ namespace OpenSim.Framework
112 m_configMember.addConfigurationOption("default_grid_server", 112 m_configMember.addConfigurationOption("default_grid_server",
113 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 113 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
114 "Default Grid Server URI", 114 "Default Grid Server URI",
115 "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort + "/", false); 115 "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort + "/", false);
116 m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 116 m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
117 "Key to send to grid server", "null", false); 117 "Key to send to grid server", "null", false);
118 m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 118 m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -121,12 +121,12 @@ namespace OpenSim.Framework
121 m_configMember.addConfigurationOption("default_inventory_server", 121 m_configMember.addConfigurationOption("default_inventory_server",
122 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 122 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
123 "Default Inventory Server URI", 123 "Default Inventory Server URI",
124 "http://127.0.0.1:" + DefaultSettings.DefaultInventoryServerHttpPort + "/", 124 "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort + "/",
125 false); 125 false);
126 m_configMember.addConfigurationOption("default_authentication_server", 126 m_configMember.addConfigurationOption("default_authentication_server",
127 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 127 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
128 "User Server (this) External URI for authentication keys", 128 "User Server (this) External URI for authentication keys",
129 "http://localhost:" + DefaultSettings.DefaultUserServerHttpPort + "/", 129 "http://localhost:" + ConfigSettings.DefaultUserServerHttpPort + "/",
130 false); 130 false);
131 m_configMember.addConfigurationOption("library_location", 131 m_configMember.addConfigurationOption("library_location",
132 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 132 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -139,9 +139,9 @@ namespace OpenSim.Framework
139 "Connection String for Database", "", false); 139 "Connection String for Database", "", false);
140 140
141 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 141 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
142 "Http Listener port", DefaultSettings.DefaultUserServerHttpPort.ToString(), false); 142 "Http Listener port", ConfigSettings.DefaultUserServerHttpPort.ToString(), false);
143 m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 143 m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
144 "Use SSL? true/false", DefaultSettings.DefaultUserServerHttpSSL.ToString(), false); 144 "Use SSL? true/false", ConfigSettings.DefaultUserServerHttpSSL.ToString(), false);
145 m_configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 145 m_configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
146 "Known good region X", "1000", false); 146 "Known good region X", "1000", false);
147 m_configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 147 m_configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index f609cc5..fea3e94 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -252,16 +252,16 @@ namespace OpenSim
252 252
253 config.Set("default_location_x", 1000); 253 config.Set("default_location_x", 1000);
254 config.Set("default_location_y", 1000); 254 config.Set("default_location_y", 1000);
255 config.Set("http_listener_port", DefaultSettings.DefaultRegionHttpPort); 255 config.Set("http_listener_port", ConfigSettings.DefaultRegionHttpPort);
256 config.Set("remoting_listener_port", DefaultSettings.DefaultRegionRemotingPort); 256 config.Set("remoting_listener_port", ConfigSettings.DefaultRegionRemotingPort);
257 config.Set("grid_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString()); 257 config.Set("grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString());
258 config.Set("grid_send_key", "null"); 258 config.Set("grid_send_key", "null");
259 config.Set("grid_recv_key", "null"); 259 config.Set("grid_recv_key", "null");
260 config.Set("user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); 260 config.Set("user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
261 config.Set("user_send_key", "null"); 261 config.Set("user_send_key", "null");
262 config.Set("user_recv_key", "null"); 262 config.Set("user_recv_key", "null");
263 config.Set("asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString()); 263 config.Set("asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString());
264 config.Set("inventory_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultInventoryServerHttpPort.ToString()); 264 config.Set("inventory_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort.ToString());
265 config.Set("secure_inventory_server", "true"); 265 config.Set("secure_inventory_server", "true");
266 } 266 }
267 267
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 05dd8e1..fc3a134 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -552,7 +552,7 @@ namespace OpenSim.Region.Communications.Hypergrid
552 hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString(); 552 hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString();
553 hash["region_name"] = regInfo.RegionName; 553 hash["region_name"] = regInfo.RegionName;
554 hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); 554 hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
555 hash["remoting_port"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); 555 hash["remoting_port"] = ConfigSettings.DefaultRegionRemotingPort.ToString();
556 //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port); 556 //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port);
557 557
558 558
@@ -640,7 +640,7 @@ namespace OpenSim.Region.Communications.Hypergrid
640 m_log.Debug(" >> " + loginParams["home_address"] + " <<"); 640 m_log.Debug(" >> " + loginParams["home_address"] + " <<");
641 m_log.Debug(" --------- ------------ -------"); 641 m_log.Debug(" --------- ------------ -------");
642 loginParams["home_port"] = rinfo.HttpPort.ToString(); 642 loginParams["home_port"] = rinfo.HttpPort.ToString();
643 loginParams["home_remoting"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); ; 643 loginParams["home_remoting"] = ConfigSettings.DefaultRegionRemotingPort.ToString(); ;
644 } 644 }
645 } 645 }
646 else 646 else
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index aae5d83..27b20ef 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Communications.OGS1
119 GridParams["region_locy"] = regionInfo.RegionLocY.ToString(); 119 GridParams["region_locy"] = regionInfo.RegionLocY.ToString();
120 GridParams["sim_name"] = regionInfo.RegionName; 120 GridParams["sim_name"] = regionInfo.RegionName;
121 GridParams["http_port"] = serversInfo.HttpListenerPort.ToString(); 121 GridParams["http_port"] = serversInfo.HttpListenerPort.ToString();
122 GridParams["remoting_port"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); 122 GridParams["remoting_port"] = ConfigSettings.DefaultRegionRemotingPort.ToString();
123 GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString(); 123 GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString();
124 GridParams["originUUID"] = regionInfo.originRegionID.ToString(); 124 GridParams["originUUID"] = regionInfo.originRegionID.ToString();
125 GridParams["server_uri"] = regionInfo.ServerURI; 125 GridParams["server_uri"] = regionInfo.ServerURI;
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 9a768ac..fd5c142 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.DataSnapshot
64 64
65 //DataServices and networking 65 //DataServices and networking
66 private string m_dataServices = "noservices"; 66 private string m_dataServices = "noservices";
67 public string m_listener_port = DefaultSettings.DefaultRegionHttpPort.ToString(); 67 public string m_listener_port = ConfigSettings.DefaultRegionHttpPort.ToString();
68 public string m_hostname = "127.0.0.1"; 68 public string m_hostname = "127.0.0.1";
69 69
70 //Update timers 70 //Update timers
@@ -106,15 +106,15 @@ namespace OpenSim.Region.DataSnapshot
106 m_gridinfo.Add( 106 m_gridinfo.Add(
107 "gridserverURL", 107 "gridserverURL",
108 config.Configs["Network"].GetString( 108 config.Configs["Network"].GetString(
109 "grid_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString())); 109 "grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()));
110 m_gridinfo.Add( 110 m_gridinfo.Add(
111 "userserverURL", 111 "userserverURL",
112 config.Configs["Network"].GetString( 112 config.Configs["Network"].GetString(
113 "user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString())); 113 "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()));
114 m_gridinfo.Add( 114 m_gridinfo.Add(
115 "assetserverURL", 115 "assetserverURL",
116 config.Configs["Network"].GetString( 116 config.Configs["Network"].GetString(
117 "asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString())); 117 "asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString()));
118 } 118 }
119 119
120 m_gridinfo.Add( 120 m_gridinfo.Add(
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c120b24..cc43d08 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8808,7 +8808,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8808 { 8808 {
8809 shard 8809 shard
8810 = config.Configs["Network"].GetString( 8810 = config.Configs["Network"].GetString(
8811 "user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); 8811 "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
8812 shard = config.Configs["Network"].GetString("shard", shard); 8812 shard = config.Configs["Network"].GetString("shard", shard);
8813 } 8813 }
8814 8814
generated by cgit v1.1 at 2024-12-23 17:23:09 +0000