diff options
author | lbsa71 | 2009-04-17 05:52:46 +0000 |
---|---|---|
committer | lbsa71 | 2009-04-17 05:52:46 +0000 |
commit | bbe1e196963fe8609a1070793b8439c293261d24 (patch) | |
tree | 32102a5e67d7e007d5efe473aef3d331f3697726 /OpenSim/Framework/RegionInfo.cs | |
parent | * Added some debug info if MXP is enabled. (diff) | |
download | opensim-SC-bbe1e196963fe8609a1070793b8439c293261d24.zip opensim-SC-bbe1e196963fe8609a1070793b8439c293261d24.tar.gz opensim-SC-bbe1e196963fe8609a1070793b8439c293261d24.tar.bz2 opensim-SC-bbe1e196963fe8609a1070793b8439c293261d24.tar.xz |
* Some more work on refactoring configs;
* Moved the constants out into a separate DefaultConfig
* Pulled configMember up
* Some minor CCC
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 8 |
1 files changed, 4 insertions, 4 deletions
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); |