From 8fe9943293f7e6230538bb1e661e85fa89217da6 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 14 May 2008 17:03:25 +0000 Subject: From: Dr Schofield Rename SearializableRegionInfo to SerializableRegionInfo (class was already named correctly) --- OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 2 +- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 8 ++++---- OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index b2550af..39cf911 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs @@ -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); diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 03fd448..fb8dcf6 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -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. diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index f922f1f..18ce61a 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs @@ -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); -- cgit v1.1