From: Dr Schofield <hud@zurich.ibm.com>

Rename SearializableRegionInfo to SerializableRegionInfo (class was already named correctly)
This commit is contained in:
Justin Clarke Casey
2008-05-14 17:03:25 +00:00
parent cbb15ff446
commit 8fe9943293
7 changed files with 16 additions and 16 deletions

View File

@@ -227,7 +227,7 @@ namespace OpenSim.Region.Communications.Local
return false;
}
public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle)
public virtual bool RegionUp(SerializableRegionInfo sregion, ulong regionhandle)
{
RegionInfo region = new RegionInfo(sregion);

View File

@@ -852,9 +852,9 @@ namespace OpenSim.Region.Communications.OGS1
}
// UGLY!
public bool RegionUp(SearializableRegionInfo region, ulong regionhandle)
public bool RegionUp(SerializableRegionInfo region, ulong regionhandle)
{
SearializableRegionInfo regInfo = null;
SerializableRegionInfo regInfo = null;
try
{
// You may ask why this is in here...
@@ -863,7 +863,7 @@ namespace OpenSim.Region.Communications.OGS1
// it's own remoting port! How special.
RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port);
region = new SearializableRegionInfo(RequestNeighbourInfo(region.RegionHandle));
region = new SerializableRegionInfo(RequestNeighbourInfo(region.RegionHandle));
region.RemotingAddress = region.ExternalHostName;
region.RemotingPort = NetworkServersInfo.RemotingListenerPort;
region.HttpPort = serversInfo.HttpListenerPort;
@@ -873,7 +873,7 @@ namespace OpenSim.Region.Communications.OGS1
return true;
}
regInfo = new SearializableRegionInfo(RequestNeighbourInfo(regionhandle));
regInfo = new SerializableRegionInfo(RequestNeighbourInfo(regionhandle));
if (regInfo != null)
{
// If we're not trying to remote to ourselves.

View File

@@ -356,7 +356,7 @@ namespace OpenSim.Region.Environment.Scenes
//RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port);
bool regionAccepted =
m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region), regionhandle);
m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region), regionhandle);
if (regionAccepted)
{
@@ -399,7 +399,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
//bool val = m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region));
//bool val = m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region));
}
public delegate void SendChildAgentDataUpdateDelegate(ChildAgentDataUpdate cAgentData, ScenePresence presence);