aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/IInterRegionCommunications.cs2
-rw-r--r--OpenSim/Framework/RegionInfo.cs2
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs10
3 files changed, 7 insertions, 7 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;
33namespace OpenSim.Framework 33namespace 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;