From a45118d35e35c3f46ad165f978efd8d87e0da2b1 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 7 Dec 2007 02:00:35 +0000 Subject: added one more command to the console help. --- OpenSim/Framework/RegionInfo.cs | 9 +-------- .../Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs | 4 +--- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'OpenSim/Framework') diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index d94a890..5dc11ad 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -48,7 +48,6 @@ namespace OpenSim.Framework public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) { - m_regionLocX = regionLocX; m_regionLocY = regionLocY; @@ -83,7 +82,6 @@ namespace OpenSim.Framework public string RemotingAddress; - public IPEndPoint ExternalEndPoint { get @@ -99,7 +97,6 @@ namespace OpenSim.Framework // Reset for next check ia = null; - // New method favors IPv4 foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) { @@ -111,7 +108,6 @@ namespace OpenSim.Framework ia = Adr; break; } - } return new IPEndPoint(ia, m_internalEndPoint.Port); @@ -209,10 +205,10 @@ namespace OpenSim.Framework return m_estateSettings; } - } public ConfigurationMember configMember; + public RegionInfo(string description, string filename) { configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); @@ -226,13 +222,10 @@ namespace OpenSim.Framework public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) : base(regionLocX, regionLocY, internalEndPoint, externalUri) { - - } public RegionInfo() { - } public RegionInfo(SearializableRegionInfo ConvertFrom) { diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs index 7179a7f..068c7c4 100644 --- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs +++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs @@ -39,6 +39,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem public void SetIniConfigSource(IniConfigSource configSource) { } + public RegionInfo[] LoadRegions() { string regionConfigPath = Path.Combine(Util.configDir(), "Regions"); @@ -59,14 +60,11 @@ namespace OpenSim.Framework.RegionLoader.Filesystem RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; for (int i = 0; i < configFiles.Length; i++) { - RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]); regionInfos[i] = regionInfo; } - return regionInfos; } - } } -- cgit v1.1