diff options
Diffstat (limited to 'OpenSim/Region')
3 files changed, 7 insertions, 7 deletions
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 | |||
227 | return false; | 227 | return false; |
228 | } | 228 | } |
229 | 229 | ||
230 | public virtual bool RegionUp(SearializableRegionInfo sregion, ulong regionhandle) | 230 | public virtual bool RegionUp(SerializableRegionInfo sregion, ulong regionhandle) |
231 | { | 231 | { |
232 | RegionInfo region = new RegionInfo(sregion); | 232 | RegionInfo region = new RegionInfo(sregion); |
233 | 233 | ||
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 | |||
852 | } | 852 | } |
853 | 853 | ||
854 | // UGLY! | 854 | // UGLY! |
855 | public bool RegionUp(SearializableRegionInfo region, ulong regionhandle) | 855 | public bool RegionUp(SerializableRegionInfo region, ulong regionhandle) |
856 | { | 856 | { |
857 | SearializableRegionInfo regInfo = null; | 857 | SerializableRegionInfo regInfo = null; |
858 | try | 858 | try |
859 | { | 859 | { |
860 | // You may ask why this is in here... | 860 | // You may ask why this is in here... |
@@ -863,7 +863,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
863 | // it's own remoting port! How special. | 863 | // it's own remoting port! How special. |
864 | RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port); | 864 | RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port); |
865 | 865 | ||
866 | region = new SearializableRegionInfo(RequestNeighbourInfo(region.RegionHandle)); | 866 | region = new SerializableRegionInfo(RequestNeighbourInfo(region.RegionHandle)); |
867 | region.RemotingAddress = region.ExternalHostName; | 867 | region.RemotingAddress = region.ExternalHostName; |
868 | region.RemotingPort = NetworkServersInfo.RemotingListenerPort; | 868 | region.RemotingPort = NetworkServersInfo.RemotingListenerPort; |
869 | region.HttpPort = serversInfo.HttpListenerPort; | 869 | region.HttpPort = serversInfo.HttpListenerPort; |
@@ -873,7 +873,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
873 | return true; | 873 | return true; |
874 | } | 874 | } |
875 | 875 | ||
876 | regInfo = new SearializableRegionInfo(RequestNeighbourInfo(regionhandle)); | 876 | regInfo = new SerializableRegionInfo(RequestNeighbourInfo(regionhandle)); |
877 | if (regInfo != null) | 877 | if (regInfo != null) |
878 | { | 878 | { |
879 | // If we're not trying to remote to ourselves. | 879 | // 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 | |||
356 | //RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port); | 356 | //RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port); |
357 | 357 | ||
358 | bool regionAccepted = | 358 | bool regionAccepted = |
359 | m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region), regionhandle); | 359 | m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region), regionhandle); |
360 | 360 | ||
361 | if (regionAccepted) | 361 | if (regionAccepted) |
362 | { | 362 | { |
@@ -399,7 +399,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
399 | } | 399 | } |
400 | } | 400 | } |
401 | 401 | ||
402 | //bool val = m_commsProvider.InterRegion.RegionUp(new SearializableRegionInfo(region)); | 402 | //bool val = m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region)); |
403 | } | 403 | } |
404 | 404 | ||
405 | public delegate void SendChildAgentDataUpdateDelegate(ChildAgentDataUpdate cAgentData, ScenePresence presence); | 405 | public delegate void SendChildAgentDataUpdateDelegate(ChildAgentDataUpdate cAgentData, ScenePresence presence); |