From 8fe9943293f7e6230538bb1e661e85fa89217da6 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 14 May 2008 17:03:25 +0000 Subject: [PATCH] From: Dr Schofield Rename SearializableRegionInfo to SerializableRegionInfo (class was already named correctly) --- .../Communications/IInterRegionCommunications.cs | 2 +- OpenSim/Framework/RegionInfo.cs | 2 +- OpenSim/Framework/SerializableRegionInfo.cs | 10 +++++----- .../Communications/Local/LocalBackEndServices.cs | 2 +- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 8 ++++---- .../Environment/Scenes/SceneCommunicationService.cs | 4 ++-- ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs index f018dd6729..28b0e12beb 100644 --- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs +++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs @@ -36,7 +36,7 @@ namespace OpenSim.Framework.Communications void CheckRegion(string address, uint port); bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData); bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod); - bool RegionUp(SearializableRegionInfo region, ulong regionhandle); + bool RegionUp(SerializableRegionInfo region, ulong regionhandle); bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 8380633a6a..158ddde546 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs @@ -233,7 +233,7 @@ namespace OpenSim.Framework { } - public RegionInfo(SearializableRegionInfo ConvertFrom) + public RegionInfo(SerializableRegionInfo ConvertFrom) { m_regionLocX = ConvertFrom.RegionLocX; m_regionLocY = ConvertFrom.RegionLocY; diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs index a87d5ef171..44081b23a7 100644 --- a/OpenSim/Framework/SerializableRegionInfo.cs +++ b/OpenSim/Framework/SerializableRegionInfo.cs @@ -33,7 +33,7 @@ using libsecondlife; namespace OpenSim.Framework { [Serializable] - public class SearializableRegionInfo + public class SerializableRegionInfo { public bool m_allow_alternate_ports; protected string m_externalHostName; @@ -60,11 +60,11 @@ namespace OpenSim.Framework /// /// This is a serializable version of RegionInfo /// - public SearializableRegionInfo() + public SerializableRegionInfo() { } - public SearializableRegionInfo(RegionInfo ConvertFrom) + public SerializableRegionInfo(RegionInfo ConvertFrom) { m_regionLocX = ConvertFrom.RegionLocX; m_regionLocY = ConvertFrom.RegionLocY; @@ -80,7 +80,7 @@ namespace OpenSim.Framework ServerURI = ConvertFrom.ServerURI; } - public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) + public SerializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) { m_regionLocX = regionLocX; m_regionLocY = regionLocY; @@ -89,7 +89,7 @@ namespace OpenSim.Framework m_externalHostName = externalUri; } - public SearializableRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) + public SerializableRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) { m_regionLocX = regionLocX; m_regionLocY = regionLocY; diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index b2550af93e..39cf911671 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 03fd44833a..fb8dcf67a1 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 f922f1f634..18ce61a9b9 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); diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs index 9d3bba3e7d..25147d0c4e 100644 --- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs +++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs @@ -422,7 +422,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer } // serialization of region data - SearializableRegionInfo dst_region = new SearializableRegionInfo(src_region); + SerializableRegionInfo dst_region = new SerializableRegionInfo(src_region); string filename = export_dir + "RegionInfo_" + src_region.RegionID + ".bin"; Util.SerializeToFile(filename, dst_region); @@ -480,7 +480,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer { m_log.InfoFormat("[BALANCER] RegionInfo filename = [{0}]", filename); - dst_region = new RegionInfo((SearializableRegionInfo) Util.DeserializeFromFile(filename)); + dst_region = new RegionInfo((SerializableRegionInfo) Util.DeserializeFromFile(filename)); m_log.InfoFormat("[BALANCER] " + "RegionID = [{0}]", dst_region.RegionID.ToString()); m_log.InfoFormat("[BALANCER] " + "RegionHandle = [{0}]", dst_region.RegionHandle);