diff options
7 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Framework/Communications/IInterRegionCommunications.cs b/OpenSim/Framework/Communications/IInterRegionCommunications.cs index f018dd6..28b0e12 100644 --- a/OpenSim/Framework/Communications/IInterRegionCommunications.cs +++ b/OpenSim/Framework/Communications/IInterRegionCommunications.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Communications | |||
36 | void CheckRegion(string address, uint port); | 36 | void CheckRegion(string address, uint port); |
37 | bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData); | 37 | bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData); |
38 | bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod); | 38 | bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod); |
39 | bool RegionUp(SearializableRegionInfo region, ulong regionhandle); | 39 | bool RegionUp(SerializableRegionInfo region, ulong regionhandle); |
40 | bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); | 40 | bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData); |
41 | 41 | ||
42 | bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); | 42 | bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); |
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 8380633..158ddde 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -233,7 +233,7 @@ namespace OpenSim.Framework | |||
233 | { | 233 | { |
234 | } | 234 | } |
235 | 235 | ||
236 | public RegionInfo(SearializableRegionInfo ConvertFrom) | 236 | public RegionInfo(SerializableRegionInfo ConvertFrom) |
237 | { | 237 | { |
238 | m_regionLocX = ConvertFrom.RegionLocX; | 238 | m_regionLocX = ConvertFrom.RegionLocX; |
239 | m_regionLocY = ConvertFrom.RegionLocY; | 239 | m_regionLocY = ConvertFrom.RegionLocY; |
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs index a87d5ef..44081b2 100644 --- a/OpenSim/Framework/SerializableRegionInfo.cs +++ b/OpenSim/Framework/SerializableRegionInfo.cs | |||
@@ -33,7 +33,7 @@ using libsecondlife; | |||
33 | namespace OpenSim.Framework | 33 | namespace OpenSim.Framework |
34 | { | 34 | { |
35 | [Serializable] | 35 | [Serializable] |
36 | public class SearializableRegionInfo | 36 | public class SerializableRegionInfo |
37 | { | 37 | { |
38 | public bool m_allow_alternate_ports; | 38 | public bool m_allow_alternate_ports; |
39 | protected string m_externalHostName; | 39 | protected string m_externalHostName; |
@@ -60,11 +60,11 @@ namespace OpenSim.Framework | |||
60 | /// <summary> | 60 | /// <summary> |
61 | /// This is a serializable version of RegionInfo | 61 | /// This is a serializable version of RegionInfo |
62 | /// </summary> | 62 | /// </summary> |
63 | public SearializableRegionInfo() | 63 | public SerializableRegionInfo() |
64 | { | 64 | { |
65 | } | 65 | } |
66 | 66 | ||
67 | public SearializableRegionInfo(RegionInfo ConvertFrom) | 67 | public SerializableRegionInfo(RegionInfo ConvertFrom) |
68 | { | 68 | { |
69 | m_regionLocX = ConvertFrom.RegionLocX; | 69 | m_regionLocX = ConvertFrom.RegionLocX; |
70 | m_regionLocY = ConvertFrom.RegionLocY; | 70 | m_regionLocY = ConvertFrom.RegionLocY; |
@@ -80,7 +80,7 @@ namespace OpenSim.Framework | |||
80 | ServerURI = ConvertFrom.ServerURI; | 80 | ServerURI = ConvertFrom.ServerURI; |
81 | } | 81 | } |
82 | 82 | ||
83 | public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) | 83 | public SerializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) |
84 | { | 84 | { |
85 | m_regionLocX = regionLocX; | 85 | m_regionLocX = regionLocX; |
86 | m_regionLocY = regionLocY; | 86 | m_regionLocY = regionLocY; |
@@ -89,7 +89,7 @@ namespace OpenSim.Framework | |||
89 | m_externalHostName = externalUri; | 89 | m_externalHostName = externalUri; |
90 | } | 90 | } |
91 | 91 | ||
92 | public SearializableRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) | 92 | public SerializableRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) |
93 | { | 93 | { |
94 | m_regionLocX = regionLocX; | 94 | m_regionLocX = regionLocX; |
95 | m_regionLocY = regionLocY; | 95 | m_regionLocY = regionLocY; |
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); |
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs index 9d3bba3..25147d0 100644 --- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs +++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | |||
@@ -422,7 +422,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
422 | } | 422 | } |
423 | 423 | ||
424 | // serialization of region data | 424 | // serialization of region data |
425 | SearializableRegionInfo dst_region = new SearializableRegionInfo(src_region); | 425 | SerializableRegionInfo dst_region = new SerializableRegionInfo(src_region); |
426 | 426 | ||
427 | string filename = export_dir + "RegionInfo_" + src_region.RegionID + ".bin"; | 427 | string filename = export_dir + "RegionInfo_" + src_region.RegionID + ".bin"; |
428 | Util.SerializeToFile(filename, dst_region); | 428 | Util.SerializeToFile(filename, dst_region); |
@@ -480,7 +480,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
480 | { | 480 | { |
481 | m_log.InfoFormat("[BALANCER] RegionInfo filename = [{0}]", filename); | 481 | m_log.InfoFormat("[BALANCER] RegionInfo filename = [{0}]", filename); |
482 | 482 | ||
483 | dst_region = new RegionInfo((SearializableRegionInfo) Util.DeserializeFromFile(filename)); | 483 | dst_region = new RegionInfo((SerializableRegionInfo) Util.DeserializeFromFile(filename)); |
484 | 484 | ||
485 | m_log.InfoFormat("[BALANCER] " + "RegionID = [{0}]", dst_region.RegionID.ToString()); | 485 | m_log.InfoFormat("[BALANCER] " + "RegionID = [{0}]", dst_region.RegionID.ToString()); |
486 | m_log.InfoFormat("[BALANCER] " + "RegionHandle = [{0}]", dst_region.RegionHandle); | 486 | m_log.InfoFormat("[BALANCER] " + "RegionHandle = [{0}]", dst_region.RegionHandle); |