aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorlbsa712009-04-17 15:09:37 +0000
committerlbsa712009-04-17 15:09:37 +0000
commita189da844a1ec48b321674f49a81c4e0a71c8b81 (patch)
treeeb55b24007c0f221a7d9f84bdbb12282d161c777 /OpenSim/Framework/RegionInfo.cs
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 (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs4
1 files changed, 2 insertions, 2 deletions
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);