aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/SerializableRegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs79
1 files changed, 21 insertions, 58 deletions
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs
index 5df22cd..18a3829 100644
--- a/OpenSim/Framework/SerializableRegionInfo.cs
+++ b/OpenSim/Framework/SerializableRegionInfo.cs
@@ -26,15 +26,10 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Globalization;
30using System.Net; 29using System.Net;
31using System.Xml;
32using System.Net.Sockets; 30using System.Net.Sockets;
33using libsecondlife; 31using libsecondlife;
34 32
35
36
37
38namespace OpenSim.Framework 33namespace OpenSim.Framework
39{ 34{
40 [Serializable] 35 [Serializable]
@@ -46,7 +41,8 @@ namespace OpenSim.Framework
46 public SearializableRegionInfo() 41 public SearializableRegionInfo()
47 { 42 {
48 } 43 }
49 public SearializableRegionInfo(RegionInfo ConvertFrom) 44
45 public SearializableRegionInfo(RegionInfo ConvertFrom)
50 { 46 {
51 m_regionLocX = ConvertFrom.RegionLocX; 47 m_regionLocX = ConvertFrom.RegionLocX;
52 m_regionLocY = ConvertFrom.RegionLocY; 48 m_regionLocY = ConvertFrom.RegionLocY;
@@ -55,9 +51,9 @@ namespace OpenSim.Framework
55 m_remotingPort = ConvertFrom.RemotingPort; 51 m_remotingPort = ConvertFrom.RemotingPort;
56 RemotingAddress = ConvertFrom.RemotingAddress; 52 RemotingAddress = ConvertFrom.RemotingAddress;
57 } 53 }
54
58 public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) 55 public SearializableRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
59 { 56 {
60
61 m_regionLocX = regionLocX; 57 m_regionLocX = regionLocX;
62 m_regionLocY = regionLocY; 58 m_regionLocY = regionLocY;
63 59
@@ -78,16 +74,11 @@ namespace OpenSim.Framework
78 public Guid RegionID = LLUUID.Zero.UUID; 74 public Guid RegionID = LLUUID.Zero.UUID;
79 75
80 public uint m_remotingPort; 76 public uint m_remotingPort;
77
81 public uint RemotingPort 78 public uint RemotingPort
82 { 79 {
83 get 80 get { return m_remotingPort; }
84 { 81 set { m_remotingPort = value; }
85 return m_remotingPort;
86 }
87 set
88 {
89 m_remotingPort = value;
90 }
91 } 82 }
92 83
93 public string RemotingAddress; 84 public string RemotingAddress;
@@ -120,77 +111,49 @@ namespace OpenSim.Framework
120 ia = Adr; 111 ia = Adr;
121 break; 112 break;
122 } 113 }
123
124 } 114 }
125 115
126 return new IPEndPoint(ia, m_internalEndPoint.Port); 116 return new IPEndPoint(ia, m_internalEndPoint.Port);
127 } 117 }
128 118
129 set 119 set { m_externalHostName = value.ToString(); }
130 {
131 m_externalHostName = value.ToString();
132 }
133 } 120 }
134 121
135 protected string m_externalHostName; 122 protected string m_externalHostName;
123
136 public string ExternalHostName 124 public string ExternalHostName
137 { 125 {
138 get 126 get { return m_externalHostName; }
139 { 127 set { m_externalHostName = value; }
140 return m_externalHostName;
141 }
142 set
143 {
144 m_externalHostName = value;
145 }
146 } 128 }
147 129
148 protected IPEndPoint m_internalEndPoint; 130 protected IPEndPoint m_internalEndPoint;
131
149 public IPEndPoint InternalEndPoint 132 public IPEndPoint InternalEndPoint
150 { 133 {
151 get 134 get { return m_internalEndPoint; }
152 { 135 set { m_internalEndPoint = value; }
153 return m_internalEndPoint;
154 }
155 set
156 {
157 m_internalEndPoint = value;
158 }
159 } 136 }
160 137
161 protected uint? m_regionLocX; 138 protected uint? m_regionLocX;
139
162 public uint RegionLocX 140 public uint RegionLocX
163 { 141 {
164 get 142 get { return m_regionLocX.Value; }
165 { 143 set { m_regionLocX = value; }
166 return m_regionLocX.Value;
167 }
168 set
169 {
170 m_regionLocX = value;
171 }
172 } 144 }
173 145
174 protected uint? m_regionLocY; 146 protected uint? m_regionLocY;
147
175 public uint RegionLocY 148 public uint RegionLocY
176 { 149 {
177 get 150 get { return m_regionLocY.Value; }
178 { 151 set { m_regionLocY = value; }
179 return m_regionLocY.Value;
180 }
181 set
182 {
183 m_regionLocY = value;
184 }
185 } 152 }
186 153
187 public ulong RegionHandle 154 public ulong RegionHandle
188 { 155 {
189 get 156 get { return Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); }
190 {
191 return Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
192 }
193 } 157 }
194 } 158 }
195 159} \ No newline at end of file
196}