aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712009-04-17 05:52:46 +0000
committerlbsa712009-04-17 05:52:46 +0000
commitbbe1e196963fe8609a1070793b8439c293261d24 (patch)
tree32102a5e67d7e007d5efe473aef3d331f3697726
parent* Added some debug info if MXP is enabled. (diff)
downloadopensim-SC_OLD-bbe1e196963fe8609a1070793b8439c293261d24.zip
opensim-SC_OLD-bbe1e196963fe8609a1070793b8439c293261d24.tar.gz
opensim-SC_OLD-bbe1e196963fe8609a1070793b8439c293261d24.tar.bz2
opensim-SC_OLD-bbe1e196963fe8609a1070793b8439c293261d24.tar.xz
* Some more work on refactoring configs;
* Moved the constants out into a separate DefaultConfig * Pulled configMember up * Some minor CCC
Diffstat
-rw-r--r--OpenSim/Framework/AssetConfig.cs19
-rw-r--r--OpenSim/Framework/Communications/Services/GridInfoService.cs4
-rw-r--r--OpenSim/Framework/ConfigBase.cs1
-rw-r--r--OpenSim/Framework/DefaultSettings.cs19
-rw-r--r--OpenSim/Framework/EstateSettings.cs52
-rw-r--r--OpenSim/Framework/GridConfig.cs41
-rw-r--r--OpenSim/Framework/InventoryConfig.cs27
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs43
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs22
-rw-r--r--OpenSim/Framework/RegionInfo.cs8
-rw-r--r--OpenSim/Framework/UserConfig.cs53
-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
16 files changed, 160 insertions, 157 deletions
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index 804a270..f9e6954 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -35,33 +35,30 @@ namespace OpenSim.Framework
35 /// </summary> 35 /// </summary>
36 public class AssetConfig:ConfigBase 36 public class AssetConfig:ConfigBase
37 { 37 {
38 public const uint DefaultHttpPort = 8003;
39
40 private ConfigurationMember configMember;
41 public string DatabaseConnect = String.Empty; 38 public string DatabaseConnect = String.Empty;
42 public string DatabaseProvider = String.Empty; 39 public string DatabaseProvider = String.Empty;
43 public uint HttpPort = DefaultHttpPort; 40 public uint HttpPort = DefaultSettings.DefaultAssetServerHttpPort;
44 public string AssetSetsLocation = string.Empty; 41 public string AssetSetsLocation = string.Empty;
45 42
46 public AssetConfig(string description, string filename) 43 public AssetConfig(string description, string filename)
47 { 44 {
48 configMember = 45 m_configMember =
49 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true); 46 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
50 configMember.performConfigurationRetrieve(); 47 m_configMember.performConfigurationRetrieve();
51 } 48 }
52 49
53 public void loadConfigurationOptions() 50 public void loadConfigurationOptions()
54 { 51 {
55 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 52 m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
56 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 53 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
57 54
58 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 55 m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
59 "Database connection string", "", false); 56 "Database connection string", "", false);
60 57
61 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 58 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
62 "Http Listener port", DefaultHttpPort.ToString(), false); 59 "Http Listener port", DefaultSettings.DefaultAssetServerHttpPort.ToString(), false);
63 60
64 configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 61 m_configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
65 "Location of 'AssetSets.xml'", 62 "Location of 'AssetSets.xml'",
66 string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar), false); 63 string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar), false);
67 } 64 }
diff --git a/OpenSim/Framework/Communications/Services/GridInfoService.cs b/OpenSim/Framework/Communications/Services/GridInfoService.cs
index 030ea61..47ea61a 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:" + UserConfig.DefaultHttpPort.ToString()); 107 "user_server_url", "http://127.0.0.1:" + DefaultSettings.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", NetworkServersInfo.DefaultHttpListenerPort.ToString())); 113 "http_listener_port", DefaultSettings.DefaultRegionHttpPort.ToString()));
114 114
115 IssueWarning(); 115 IssueWarning();
116 } 116 }
diff --git a/OpenSim/Framework/ConfigBase.cs b/OpenSim/Framework/ConfigBase.cs
index 5479f2f..2617796 100644
--- a/OpenSim/Framework/ConfigBase.cs
+++ b/OpenSim/Framework/ConfigBase.cs
@@ -6,5 +6,6 @@ namespace OpenSim.Framework
6{ 6{
7 public abstract class ConfigBase 7 public abstract class ConfigBase
8 { 8 {
9 protected ConfigurationMember m_configMember;
9 } 10 }
10} 11}
diff --git a/OpenSim/Framework/DefaultSettings.cs b/OpenSim/Framework/DefaultSettings.cs
new file mode 100644
index 0000000..8277914
--- /dev/null
+++ b/OpenSim/Framework/DefaultSettings.cs
@@ -0,0 +1,19 @@
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/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index b84d1d7..4552a2f 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework
35 public class EstateSettings 35 public class EstateSettings
36 { 36 {
37 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 37 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
38 private ConfigurationMember configMember; 38 private readonly ConfigurationMember m_configMember;
39 39
40 public delegate void SaveDelegate(EstateSettings rs); 40 public delegate void SaveDelegate(EstateSettings rs);
41 41
@@ -43,12 +43,12 @@ namespace OpenSim.Framework
43 43
44 // Only the client uses these 44 // Only the client uses these
45 // 45 //
46 private uint m_EstateID = 100; 46 private uint m_estateId = 100;
47 47
48 public uint EstateID 48 public uint EstateID
49 { 49 {
50 get { return m_EstateID; } 50 get { return m_estateId; }
51 set { m_EstateID = value; } 51 set { m_estateId = value; }
52 } 52 }
53 53
54 private string m_EstateName; 54 private string m_EstateName;
@@ -273,20 +273,20 @@ namespace OpenSim.Framework
273 273
274 public EstateSettings() 274 public EstateSettings()
275 { 275 {
276 if (configMember == null) 276 if (m_configMember == null)
277 { 277 {
278 try 278 try
279 { 279 {
280 // Load legacy defaults 280 // Load legacy defaults
281 // 281 //
282 configMember = 282 m_configMember =
283 new ConfigurationMember(Path.Combine(Util.configDir(), 283 new ConfigurationMember(Path.Combine(Util.configDir(),
284 "estate_settings.xml"), "ESTATE SETTINGS", 284 "estate_settings.xml"), "ESTATE SETTINGS",
285 loadConfigurationOptions, 285 loadConfigurationOptions,
286 handleIncomingConfiguration, true); 286 handleIncomingConfiguration, true);
287 287
288 l_EstateManagers.Clear(); 288 l_EstateManagers.Clear();
289 configMember.performConfigurationRetrieve(); 289 m_configMember.performConfigurationRetrieve();
290 } 290 }
291 catch (Exception) 291 catch (Exception)
292 { 292 {
@@ -360,75 +360,75 @@ namespace OpenSim.Framework
360 360
361 public void loadConfigurationOptions() 361 public void loadConfigurationOptions()
362 { 362 {
363 configMember.addConfigurationOption("billable_factor", 363 m_configMember.addConfigurationOption("billable_factor",
364 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, 364 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
365 String.Empty, "0.0", true); 365 String.Empty, "0.0", true);
366 366
367// configMember.addConfigurationOption("estate_id", 367// m_configMember.addConfigurationOption("estate_id",
368// ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 368// ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
369// String.Empty, "100", true); 369// String.Empty, "100", true);
370 370
371// configMember.addConfigurationOption("parent_estate_id", 371// m_configMember.addConfigurationOption("parent_estate_id",
372// ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 372// ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
373// String.Empty, "1", true); 373// String.Empty, "1", true);
374 374
375 configMember.addConfigurationOption("redirect_grid_x", 375 m_configMember.addConfigurationOption("redirect_grid_x",
376 ConfigurationOption.ConfigurationTypes.TYPE_INT32, 376 ConfigurationOption.ConfigurationTypes.TYPE_INT32,
377 String.Empty, "0", true); 377 String.Empty, "0", true);
378 378
379 configMember.addConfigurationOption("redirect_grid_y", 379 m_configMember.addConfigurationOption("redirect_grid_y",
380 ConfigurationOption.ConfigurationTypes.TYPE_INT32, 380 ConfigurationOption.ConfigurationTypes.TYPE_INT32,
381 String.Empty, "0", true); 381 String.Empty, "0", true);
382 382
383 configMember.addConfigurationOption("price_per_meter", 383 m_configMember.addConfigurationOption("price_per_meter",
384 ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 384 ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
385 String.Empty, "1", true); 385 String.Empty, "1", true);
386 386
387 configMember.addConfigurationOption("estate_name", 387 m_configMember.addConfigurationOption("estate_name",
388 ConfigurationOption.ConfigurationTypes.TYPE_STRING, 388 ConfigurationOption.ConfigurationTypes.TYPE_STRING,
389 String.Empty, "My Estate", true); 389 String.Empty, "My Estate", true);
390 390
391 configMember.addConfigurationOption("estate_manager_0", 391 m_configMember.addConfigurationOption("estate_manager_0",
392 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 392 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
393 String.Empty, "00000000-0000-0000-0000-000000000000", true); 393 String.Empty, "00000000-0000-0000-0000-000000000000", true);
394 394
395 configMember.addConfigurationOption("estate_manager_1", 395 m_configMember.addConfigurationOption("estate_manager_1",
396 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 396 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
397 String.Empty, "00000000-0000-0000-0000-000000000000", true); 397 String.Empty, "00000000-0000-0000-0000-000000000000", true);
398 398
399 configMember.addConfigurationOption("estate_manager_2", 399 m_configMember.addConfigurationOption("estate_manager_2",
400 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 400 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
401 String.Empty, "00000000-0000-0000-0000-000000000000", true); 401 String.Empty, "00000000-0000-0000-0000-000000000000", true);
402 402
403 configMember.addConfigurationOption("estate_manager_3", 403 m_configMember.addConfigurationOption("estate_manager_3",
404 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 404 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
405 String.Empty, "00000000-0000-0000-0000-000000000000", true); 405 String.Empty, "00000000-0000-0000-0000-000000000000", true);
406 406
407 configMember.addConfigurationOption("estate_manager_4", 407 m_configMember.addConfigurationOption("estate_manager_4",
408 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 408 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
409 String.Empty, "00000000-0000-0000-0000-000000000000", true); 409 String.Empty, "00000000-0000-0000-0000-000000000000", true);
410 410
411 configMember.addConfigurationOption("estate_manager_5", 411 m_configMember.addConfigurationOption("estate_manager_5",
412 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 412 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
413 String.Empty, "00000000-0000-0000-0000-000000000000", true); 413 String.Empty, "00000000-0000-0000-0000-000000000000", true);
414 414
415 configMember.addConfigurationOption("estate_manager_6", 415 m_configMember.addConfigurationOption("estate_manager_6",
416 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 416 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
417 String.Empty, "00000000-0000-0000-0000-000000000000", true); 417 String.Empty, "00000000-0000-0000-0000-000000000000", true);
418 418
419 configMember.addConfigurationOption("estate_manager_7", 419 m_configMember.addConfigurationOption("estate_manager_7",
420 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 420 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
421 String.Empty, "00000000-0000-0000-0000-000000000000", true); 421 String.Empty, "00000000-0000-0000-0000-000000000000", true);
422 422
423 configMember.addConfigurationOption("estate_manager_8", 423 m_configMember.addConfigurationOption("estate_manager_8",
424 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 424 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
425 String.Empty, "00000000-0000-0000-0000-000000000000", true); 425 String.Empty, "00000000-0000-0000-0000-000000000000", true);
426 426
427 configMember.addConfigurationOption("estate_manager_9", 427 m_configMember.addConfigurationOption("estate_manager_9",
428 ConfigurationOption.ConfigurationTypes.TYPE_UUID, 428 ConfigurationOption.ConfigurationTypes.TYPE_UUID,
429 String.Empty, "00000000-0000-0000-0000-000000000000", true); 429 String.Empty, "00000000-0000-0000-0000-000000000000", true);
430 430
431 configMember.addConfigurationOption("region_flags", 431 m_configMember.addConfigurationOption("region_flags",
432 ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 432 ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
433 String.Empty, "336723974", true); 433 String.Empty, "336723974", true);
434 } 434 }
@@ -466,7 +466,7 @@ namespace OpenSim.Framework
466 m_BillableFactor = (float) configuration_result; 466 m_BillableFactor = (float) configuration_result;
467 break; 467 break;
468// case "estate_id": 468// case "estate_id":
469// m_EstateID = (uint) configuration_result; 469// m_estateId = (uint) configuration_result;
470// break; 470// break;
471// case "parent_estate_id": 471// case "parent_estate_id":
472// m_ParentEstateID = (uint) configuration_result; 472// m_ParentEstateID = (uint) configuration_result;
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 640eeaa..679c84b 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -31,19 +31,16 @@ namespace OpenSim.Framework
31{ 31{
32 public class GridConfig:ConfigBase 32 public class GridConfig:ConfigBase
33 { 33 {
34 public static uint DefaultHttpPort = 8001;
35
36 public string AllowForcefulBanlines = "TRUE"; 34 public string AllowForcefulBanlines = "TRUE";
37 public bool AllowRegionRegistration = true; 35 public bool AllowRegionRegistration = true;
38 public string AssetRecvKey = String.Empty; 36 public string AssetRecvKey = String.Empty;
39 public string AssetSendKey = String.Empty; 37 public string AssetSendKey = String.Empty;
40 38
41 private ConfigurationMember configMember;
42 public string DatabaseProvider = String.Empty; 39 public string DatabaseProvider = String.Empty;
43 public string DatabaseConnect = String.Empty; 40 public string DatabaseConnect = String.Empty;
44 public string DefaultAssetServer = String.Empty; 41 public string DefaultAssetServer = String.Empty;
45 public string DefaultUserServer = String.Empty; 42 public string DefaultUserServer = String.Empty;
46 public uint HttpPort = DefaultHttpPort; 43 public uint HttpPort = DefaultSettings.DefaultGridServerHttpPort;
47 public string SimRecvKey = String.Empty; 44 public string SimRecvKey = String.Empty;
48 public string SimSendKey = String.Empty; 45 public string SimSendKey = String.Empty;
49 public string UserRecvKey = String.Empty; 46 public string UserRecvKey = String.Empty;
@@ -51,49 +48,49 @@ namespace OpenSim.Framework
51 48
52 public GridConfig(string description, string filename) 49 public GridConfig(string description, string filename)
53 { 50 {
54 configMember = 51 m_configMember =
55 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true); 52 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
56 configMember.performConfigurationRetrieve(); 53 m_configMember.performConfigurationRetrieve();
57 } 54 }
58 55
59 public void loadConfigurationOptions() 56 public void loadConfigurationOptions()
60 { 57 {
61 configMember.addConfigurationOption("default_asset_server", 58 m_configMember.addConfigurationOption("default_asset_server",
62 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 59 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
63 "Default Asset Server URI", 60 "Default Asset Server URI",
64 "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/", 61 "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString() + "/",
65 false); 62 false);
66 configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 63 m_configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
67 "Key to send to asset server", "null", false); 64 "Key to send to asset server", "null", false);
68 configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 65 m_configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
69 "Key to expect from asset server", "null", false); 66 "Key to expect from asset server", "null", false);
70 67
71 configMember.addConfigurationOption("default_user_server", 68 m_configMember.addConfigurationOption("default_user_server",
72 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 69 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
73 "Default User Server URI", 70 "Default User Server URI",
74 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/", false); 71 "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString() + "/", false);
75 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 72 m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
76 "Key to send to user server", "null", false); 73 "Key to send to user server", "null", false);
77 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 74 m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
78 "Key to expect from user server", "null", false); 75 "Key to expect from user server", "null", false);
79 76
80 configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 77 m_configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
81 "Key to send to a simulator", "null", false); 78 "Key to send to a simulator", "null", false);
82 configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 79 m_configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
83 "Key to expect from a simulator", "null", false); 80 "Key to expect from a simulator", "null", false);
84 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 81 m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
85 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 82 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
86 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 83 m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
87 "Database connect string", "", false); 84 "Database connect string", "", false);
88 85
89 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 86 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
90 "Http Listener port", DefaultHttpPort.ToString(), false); 87 "Http Listener port", DefaultSettings.DefaultGridServerHttpPort.ToString(), false);
91 88
92 configMember.addConfigurationOption("allow_forceful_banlines", 89 m_configMember.addConfigurationOption("allow_forceful_banlines",
93 ConfigurationOption.ConfigurationTypes.TYPE_STRING, 90 ConfigurationOption.ConfigurationTypes.TYPE_STRING,
94 "Allow Forceful Banlines", "TRUE", true); 91 "Allow Forceful Banlines", "TRUE", true);
95 92
96 configMember.addConfigurationOption("allow_region_registration", 93 m_configMember.addConfigurationOption("allow_region_registration",
97 ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 94 ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
98 "Allow regions to register immediately upon grid server startup? true/false", 95 "Allow regions to register immediately upon grid server startup? true/false",
99 "True", 96 "True",
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 8141290..aafb6de 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -34,13 +34,10 @@ namespace OpenSim.Framework
34 /// </summary> 34 /// </summary>
35 public class InventoryConfig:ConfigBase 35 public class InventoryConfig:ConfigBase
36 { 36 {
37 public static uint DefaultHttpPort = 8004;
38
39 private ConfigurationMember configMember;
40 public string DatabaseConnect = String.Empty; 37 public string DatabaseConnect = String.Empty;
41 public string DatabaseProvider = String.Empty; 38 public string DatabaseProvider = String.Empty;
42 public string DefaultStartupMsg = String.Empty; 39 public string DefaultStartupMsg = String.Empty;
43 public uint HttpPort = DefaultHttpPort; 40 public uint HttpPort = DefaultSettings.DefaultInventoryServerHttpPort;
44 public string InventoryServerURL = String.Empty; 41 public string InventoryServerURL = String.Empty;
45 public string UserServerURL = String.Empty; 42 public string UserServerURL = String.Empty;
46 public string AssetServerURL = String.Empty; 43 public string AssetServerURL = String.Empty;
@@ -49,34 +46,34 @@ namespace OpenSim.Framework
49 46
50 public InventoryConfig(string description, string filename) 47 public InventoryConfig(string description, string filename)
51 { 48 {
52 configMember = 49 m_configMember =
53 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true); 50 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
54 configMember.performConfigurationRetrieve(); 51 m_configMember.performConfigurationRetrieve();
55 } 52 }
56 53
57 public void loadConfigurationOptions() 54 public void loadConfigurationOptions()
58 { 55 {
59 configMember.addConfigurationOption("default_inventory_server", 56 m_configMember.addConfigurationOption("default_inventory_server",
60 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 57 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
61 "Default Inventory Server URI (this server's external name)", 58 "Default Inventory Server URI (this server's external name)",
62 "http://127.0.0.1:8004", false); 59 "http://127.0.0.1:8004", false);
63 configMember.addConfigurationOption("default_user_server", 60 m_configMember.addConfigurationOption("default_user_server",
64 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 61 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
65 "Default User Server URI", 62 "Default User Server URI",
66 "http://127.0.0.1:8002", false); 63 "http://127.0.0.1:8002", false);
67 configMember.addConfigurationOption("default_asset_server", 64 m_configMember.addConfigurationOption("default_asset_server",
68 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 65 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
69 "Default Asset Server URI", 66 "Default Asset Server URI",
70 "http://127.0.0.1:8003", false); 67 "http://127.0.0.1:8003", false);
71 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 68 m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
72 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 69 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
73 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 70 m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
74 "Database Connect String", "", false); 71 "Database Connect String", "", false);
75 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 72 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
76 "Http Listener port", DefaultHttpPort.ToString(), false); 73 "Http Listener port", DefaultSettings.DefaultInventoryServerHttpPort.ToString(), false);
77 configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 74 m_configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
78 "Enable session lookup security", "False", false); 75 "Enable session lookup security", "False", false);
79 configMember.addConfigurationOption("region_access", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 76 m_configMember.addConfigurationOption("region_access", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
80 "Allow direct region access to users inventories? (Keep True if you don't know what this is about)", "True", false); 77 "Allow direct region access to users inventories? (Keep True if you don't know what this is about)", "True", false);
81 } 78 }
82 79
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index 1af9b13..1e4b818 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -34,17 +34,14 @@ namespace OpenSim.Framework
34 /// </summary> 34 /// </summary>
35 public class MessageServerConfig:ConfigBase 35 public class MessageServerConfig:ConfigBase
36 { 36 {
37 public static uint DefaultHttpPort = 8006;
38 public static bool DefaultHttpSSL = false;
39 private ConfigurationMember configMember;
40 public string DatabaseProvider = String.Empty; 37 public string DatabaseProvider = String.Empty;
41 public string DatabaseConnect = String.Empty; 38 public string DatabaseConnect = String.Empty;
42 public string GridCommsProvider = String.Empty; 39 public string GridCommsProvider = String.Empty;
43 public string GridRecvKey = String.Empty; 40 public string GridRecvKey = String.Empty;
44 public string GridSendKey = String.Empty; 41 public string GridSendKey = String.Empty;
45 public string GridServerURL = String.Empty; 42 public string GridServerURL = String.Empty;
46 public uint HttpPort = DefaultHttpPort; 43 public uint HttpPort = DefaultSettings.DefaultMessageServerHttpPort;
47 public bool HttpSSL = DefaultHttpSSL; 44 public bool HttpSSL = DefaultSettings.DefaultMessageServerHttpSSL;
48 public string MessageServerIP = String.Empty; 45 public string MessageServerIP = String.Empty;
49 public string UserRecvKey = String.Empty; 46 public string UserRecvKey = String.Empty;
50 public string UserSendKey = String.Empty; 47 public string UserSendKey = String.Empty;
@@ -52,44 +49,44 @@ namespace OpenSim.Framework
52 49
53 public MessageServerConfig(string description, string filename) 50 public MessageServerConfig(string description, string filename)
54 { 51 {
55 configMember = 52 m_configMember =
56 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true); 53 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
57 configMember.performConfigurationRetrieve(); 54 m_configMember.performConfigurationRetrieve();
58 } 55 }
59 56
60 public void loadConfigurationOptions() 57 public void loadConfigurationOptions()
61 { 58 {
62 configMember.addConfigurationOption("default_user_server", 59 m_configMember.addConfigurationOption("default_user_server",
63 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 60 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
64 "Default User Server URI", 61 "Default User Server URI",
65 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/", false); 62 "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString() + "/", false);
66 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 63 m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
67 "Key to send to user server", "null", false); 64 "Key to send to user server", "null", false);
68 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 65 m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
69 "Key to expect from user server", "null", false); 66 "Key to expect from user server", "null", false);
70 configMember.addConfigurationOption("default_grid_server", 67 m_configMember.addConfigurationOption("default_grid_server",
71 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 68 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
72 "Default Grid Server URI", 69 "Default Grid Server URI",
73 "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false); 70 "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString() + "/", false);
74 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 71 m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
75 "Key to send to grid server", "null", false); 72 "Key to send to grid server", "null", false);
76 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 73 m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
77 "Key to expect from grid server", "null", false); 74 "Key to expect from grid server", "null", false);
78 75
79 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 76 m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
80 "Connection String for Database", "", false); 77 "Connection String for Database", "", false);
81 78
82 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 79 m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
83 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 80 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
84 81
85 configMember.addConfigurationOption("region_comms_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 82 m_configMember.addConfigurationOption("region_comms_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
86 "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false); 83 "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false);
87 84
88 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 85 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
89 "Http Listener port", DefaultHttpPort.ToString(), false); 86 "Http Listener port", DefaultSettings.DefaultMessageServerHttpPort.ToString(), false);
90 configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 87 m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
91 "Use SSL? true/false", DefaultHttpSSL.ToString(), false); 88 "Use SSL? true/false", DefaultSettings.DefaultMessageServerHttpSSL.ToString(), false);
92 configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 89 m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
93 "My Published IP Address", "127.0.0.1", false); 90 "My Published IP Address", "127.0.0.1", false);
94 } 91 }
95 92
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}
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 202b587..8d8b25a 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) NetworkServersInfo.DefaultHttpListenerPort); 369 source.Configs[sectionName].GetInt("internal_ip_port", (int) DefaultSettings.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")
@@ -412,7 +412,7 @@ namespace OpenSim.Framework
412 "Grid Location (X Axis)", m_regionLocX.ToString(), true); 412 "Grid Location (X Axis)", m_regionLocX.ToString(), true);
413 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 413 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
414 "Grid Location (Y Axis)", m_regionLocY.ToString(), true); 414 "Grid Location (Y Axis)", m_regionLocY.ToString(), true);
415 //configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false); 415 //m_configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
416 configMember.addConfigurationOption("internal_ip_address", 416 configMember.addConfigurationOption("internal_ip_address",
417 ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, 417 ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS,
418 "Internal IP Address for incoming UDP client connections", 418 "Internal IP Address for incoming UDP client connections",
@@ -468,14 +468,14 @@ namespace OpenSim.Framework
468 "Grid Location (X Axis)", "1000", false); 468 "Grid Location (X Axis)", "1000", false);
469 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 469 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
470 "Grid Location (Y Axis)", "1000", false); 470 "Grid Location (Y Axis)", "1000", false);
471 //configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false); 471 //m_configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
472 configMember.addConfigurationOption("internal_ip_address", 472 configMember.addConfigurationOption("internal_ip_address",
473 ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, 473 ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS,
474 "Internal IP Address for incoming UDP client connections", "0.0.0.0", 474 "Internal IP Address for incoming UDP client connections", "0.0.0.0",
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 NetworkServersInfo.DefaultHttpListenerPort.ToString(), false); 478 DefaultSettings.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 49668af..b898f89 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -35,9 +35,6 @@ namespace OpenSim.Framework
35 /// </summary> 35 /// </summary>
36 public class UserConfig:ConfigBase 36 public class UserConfig:ConfigBase
37 { 37 {
38 public static uint DefaultHttpPort = 8002;
39 public static bool DefaultHttpSSL = false;
40 private ConfigurationMember configMember;
41 public string DatabaseProvider = String.Empty; 38 public string DatabaseProvider = String.Empty;
42 public string DatabaseConnect = String.Empty; 39 public string DatabaseConnect = String.Empty;
43 public string DefaultStartupMsg = String.Empty; 40 public string DefaultStartupMsg = String.Empty;
@@ -45,8 +42,8 @@ namespace OpenSim.Framework
45 public uint DefaultY = 1000; 42 public uint DefaultY = 1000;
46 public string GridRecvKey = String.Empty; 43 public string GridRecvKey = String.Empty;
47 public string GridSendKey = String.Empty; 44 public string GridSendKey = String.Empty;
48 public uint HttpPort = DefaultHttpPort; 45 public uint HttpPort = DefaultSettings.DefaultUserServerHttpPort;
49 public bool HttpSSL = DefaultHttpSSL; 46 public bool HttpSSL = DefaultSettings.DefaultUserServerHttpSSL;
50 public uint DefaultUserLevel = 0; 47 public uint DefaultUserLevel = 0;
51 public string LibraryXmlfile = ""; 48 public string LibraryXmlfile = "";
52 49
@@ -101,61 +98,61 @@ namespace OpenSim.Framework
101 } 98 }
102 public UserConfig(string description, string filename) 99 public UserConfig(string description, string filename)
103 { 100 {
104 configMember = 101 m_configMember =
105 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true); 102 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
106 configMember.performConfigurationRetrieve(); 103 m_configMember.performConfigurationRetrieve();
107 } 104 }
108 105
109 public void loadConfigurationOptions() 106 public void loadConfigurationOptions()
110 { 107 {
111 configMember.addConfigurationOption("default_startup_message", 108 m_configMember.addConfigurationOption("default_startup_message",
112 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 109 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
113 "Default Startup Message", "Welcome to OGS", false); 110 "Default Startup Message", "Welcome to OGS", false);
114 111
115 configMember.addConfigurationOption("default_grid_server", 112 m_configMember.addConfigurationOption("default_grid_server",
116 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 113 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
117 "Default Grid Server URI", 114 "Default Grid Server URI",
118 "http://127.0.0.1:" + GridConfig.DefaultHttpPort + "/", false); 115 "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort + "/", false);
119 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 116 m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
120 "Key to send to grid server", "null", false); 117 "Key to send to grid server", "null", false);
121 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 118 m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
122 "Key to expect from grid server", "null", false); 119 "Key to expect from grid server", "null", false);
123 120
124 configMember.addConfigurationOption("default_inventory_server", 121 m_configMember.addConfigurationOption("default_inventory_server",
125 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 122 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
126 "Default Inventory Server URI", 123 "Default Inventory Server URI",
127 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort + "/", 124 "http://127.0.0.1:" + DefaultSettings.DefaultInventoryServerHttpPort + "/",
128 false); 125 false);
129 configMember.addConfigurationOption("default_authentication_server", 126 m_configMember.addConfigurationOption("default_authentication_server",
130 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 127 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
131 "User Server (this) External URI for authentication keys", 128 "User Server (this) External URI for authentication keys",
132 "http://localhost:" + UserConfig.DefaultHttpPort + "/", 129 "http://localhost:" + DefaultSettings.DefaultUserServerHttpPort + "/",
133 false); 130 false);
134 configMember.addConfigurationOption("library_location", 131 m_configMember.addConfigurationOption("library_location",
135 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 132 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
136 "Path to library control file", 133 "Path to library control file",
137 string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false); 134 string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar), false);
138 135
139 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 136 m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
140 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 137 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
141 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 138 m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
142 "Connection String for Database", "", false); 139 "Connection String for Database", "", false);
143 140
144 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 141 m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
145 "Http Listener port", DefaultHttpPort.ToString(), false); 142 "Http Listener port", DefaultSettings.DefaultUserServerHttpPort.ToString(), false);
146 configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 143 m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
147 "Use SSL? true/false", DefaultHttpSSL.ToString(), false); 144 "Use SSL? true/false", DefaultSettings.DefaultUserServerHttpSSL.ToString(), false);
148 configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 145 m_configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
149 "Known good region X", "1000", false); 146 "Known good region X", "1000", false);
150 configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 147 m_configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
151 "Known good region Y", "1000", false); 148 "Known good region Y", "1000", false);
152 configMember.addConfigurationOption("enable_llsd_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 149 m_configMember.addConfigurationOption("enable_llsd_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
153 "Enable LLSD login support [Currently used by libsl based clients/bots]? true/false", true.ToString(), false); 150 "Enable LLSD login support [Currently used by libsl based clients/bots]? true/false", true.ToString(), false);
154 151
155 configMember.addConfigurationOption("enable_hg_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 152 m_configMember.addConfigurationOption("enable_hg_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
156 "Enable Hypergrid login support [Currently used by GridSurfer-proxied clients]? true/false", true.ToString(), false); 153 "Enable Hypergrid login support [Currently used by GridSurfer-proxied clients]? true/false", true.ToString(), false);
157 154
158 configMember.addConfigurationOption("default_loginLevel", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 155 m_configMember.addConfigurationOption("default_loginLevel", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
159 "Minimum Level a user should have to login [0 default]", "0", false); 156 "Minimum Level a user should have to login [0 default]", "0", false);
160 157
161 } 158 }
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 8aa8dde..f609cc5 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", NetworkServersInfo.DefaultHttpListenerPort); 255 config.Set("http_listener_port", DefaultSettings.DefaultRegionHttpPort);
256 config.Set("remoting_listener_port", NetworkServersInfo.RemotingListenerPort); 256 config.Set("remoting_listener_port", DefaultSettings.DefaultRegionRemotingPort);
257 config.Set("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()); 257 config.Set("grid_server_url", "http://127.0.0.1:" + DefaultSettings.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:" + UserConfig.DefaultHttpPort.ToString()); 260 config.Set("user_server_url", "http://127.0.0.1:" + DefaultSettings.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:" + AssetConfig.DefaultHttpPort.ToString()); 263 config.Set("asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString());
264 config.Set("inventory_server_url", "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString()); 264 config.Set("inventory_server_url", "http://127.0.0.1:" + DefaultSettings.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 43faead..05dd8e1 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"] = NetworkServersInfo.RemotingListenerPort.ToString(); 555 hash["remoting_port"] = DefaultSettings.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"] = NetworkServersInfo.RemotingListenerPort.ToString(); ; 643 loginParams["home_remoting"] = DefaultSettings.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 f47abe8..aae5d83 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"] = NetworkServersInfo.RemotingListenerPort.ToString(); 122 GridParams["remoting_port"] = DefaultSettings.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 bc7e7b2..9a768ac 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 = NetworkServersInfo.DefaultHttpListenerPort.ToString(); 67 public string m_listener_port = DefaultSettings.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:" + GridConfig.DefaultHttpPort.ToString())); 109 "grid_server_url", "http://127.0.0.1:" + DefaultSettings.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:" + UserConfig.DefaultHttpPort.ToString())); 113 "user_server_url", "http://127.0.0.1:" + DefaultSettings.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:" + AssetConfig.DefaultHttpPort.ToString())); 117 "asset_server_url", "http://127.0.0.1:" + DefaultSettings.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 0964821..c120b24 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:" + UserConfig.DefaultHttpPort.ToString()); 8811 "user_server_url", "http://127.0.0.1:" + DefaultSettings.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-11-09 21:06:48 +0000