ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

added one more command to the console help.

Browse Source
This commit is contained in:
Jeff Ames
2007-12-07 02:00:35 +00:00
parent 9326ee425b
commit a45118d35e
6 changed files with 19 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Framework/RegionInfo.cs
View File

@@ -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)
{

4
OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
View File

@@ -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;
}
}
}