aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/SerializableRegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs98
1 files changed, 35 insertions, 63 deletions
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs
index 2c73da8..97aa8db 100644
--- a/OpenSim/Framework/SerializableRegionInfo.cs
+++ b/OpenSim/Framework/SerializableRegionInfo.cs
@@ -35,6 +35,28 @@ namespace OpenSim.Framework
35 [Serializable] 35 [Serializable]
36 public class SearializableRegionInfo 36 public class SearializableRegionInfo
37 { 37 {
38 public bool m_allow_alternate_ports;
39 protected string m_externalHostName;
40
41 /// <value>
42 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
43 ///
44 /// FIXME: Defaulting to 9000 temporarily (on the basis that this is the http port most region
45 /// servers are running) until the revision in which this change is made propogates around grids.
46 /// </value>
47 protected uint m_httpPort = 9000;
48
49 protected IPEndPoint m_internalEndPoint;
50 protected Guid m_originRegionID = LLUUID.Zero.UUID;
51 protected string m_proxyUrl;
52 protected uint? m_regionLocX;
53 protected uint? m_regionLocY;
54 protected string m_regionName;
55 public uint m_remotingPort;
56 protected string m_serverURI;
57 public Guid RegionID = LLUUID.Zero.UUID;
58 public string RemotingAddress;
59
38 /// <summary> 60 /// <summary>
39 /// This is a serializable version of RegionInfo 61 /// This is a serializable version of RegionInfo
40 /// </summary> 62 /// </summary>
@@ -52,7 +74,7 @@ namespace OpenSim.Framework
52 m_httpPort = ConvertFrom.HttpPort; 74 m_httpPort = ConvertFrom.HttpPort;
53 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; 75 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
54 RemotingAddress = ConvertFrom.RemotingAddress; 76 RemotingAddress = ConvertFrom.RemotingAddress;
55 m_proxyUrl = ConvertFrom.proxyUrl; 77 m_proxyUrl = ConvertFrom.proxyUrl;
56 OriginRegionID = ConvertFrom.originRegionID; 78 OriginRegionID = ConvertFrom.originRegionID;
57 RegionName = ConvertFrom.RegionName; 79 RegionName = ConvertFrom.RegionName;
58 ServerURI = ConvertFrom.ServerURI; 80 ServerURI = ConvertFrom.ServerURI;
@@ -77,31 +99,17 @@ namespace OpenSim.Framework
77 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); 99 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
78 } 100 }
79 101
80 public Guid RegionID = LLUUID.Zero.UUID;
81
82 public uint m_remotingPort;
83 public uint RemotingPort 102 public uint RemotingPort
84 { 103 {
85 get { return m_remotingPort; } 104 get { return m_remotingPort; }
86 set { m_remotingPort = value; } 105 set { m_remotingPort = value; }
87 } 106 }
88 107
89 /// <value>
90 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
91 ///
92 /// FIXME: Defaulting to 9000 temporarily (on the basis that this is the http port most region
93 /// servers are running) until the revision in which this change is made propogates around grids.
94 /// </value>
95 protected uint m_httpPort = 9000;
96 public uint HttpPort 108 public uint HttpPort
97 { 109 {
98 get { return m_httpPort; } 110 get { return m_httpPort; }
99 set { m_httpPort = value; } 111 set { m_httpPort = value; }
100 } 112 }
101
102 public bool m_allow_alternate_ports;
103
104 public string RemotingAddress;
105 113
106 public IPEndPoint ExternalEndPoint 114 public IPEndPoint ExternalEndPoint
107 { 115 {
@@ -138,32 +146,24 @@ namespace OpenSim.Framework
138 set { m_externalHostName = value.ToString(); } 146 set { m_externalHostName = value.ToString(); }
139 } 147 }
140 148
141 protected string m_externalHostName;
142
143 public string ExternalHostName 149 public string ExternalHostName
144 { 150 {
145 get { return m_externalHostName; } 151 get { return m_externalHostName; }
146 set { m_externalHostName = value; } 152 set { m_externalHostName = value; }
147 } 153 }
148 154
149 protected IPEndPoint m_internalEndPoint;
150
151 public IPEndPoint InternalEndPoint 155 public IPEndPoint InternalEndPoint
152 { 156 {
153 get { return m_internalEndPoint; } 157 get { return m_internalEndPoint; }
154 set { m_internalEndPoint = value; } 158 set { m_internalEndPoint = value; }
155 } 159 }
156 160
157 protected uint? m_regionLocX;
158
159 public uint RegionLocX 161 public uint RegionLocX
160 { 162 {
161 get { return m_regionLocX.Value; } 163 get { return m_regionLocX.Value; }
162 set { m_regionLocX = value; } 164 set { m_regionLocX = value; }
163 } 165 }
164 166
165 protected uint? m_regionLocY;
166
167 public uint RegionLocY 167 public uint RegionLocY
168 { 168 {
169 get { return m_regionLocY.Value; } 169 get { return m_regionLocY.Value; }
@@ -172,59 +172,31 @@ namespace OpenSim.Framework
172 172
173 public ulong RegionHandle 173 public ulong RegionHandle
174 { 174 {
175 get { return Util.UIntsToLong((RegionLocX * (uint)Constants.RegionSize), (RegionLocY * (uint)Constants.RegionSize)); } 175 get { return Util.UIntsToLong((RegionLocX * (uint) Constants.RegionSize), (RegionLocY * (uint) Constants.RegionSize)); }
176 } 176 }
177 177
178 protected string m_proxyUrl;
179 public string ProxyUrl 178 public string ProxyUrl
180 { 179 {
181 get 180 get { return m_proxyUrl; }
182 { 181 set { m_proxyUrl = value; }
183 return m_proxyUrl;
184 }
185 set
186 {
187 m_proxyUrl = value;
188 }
189 } 182 }
190 183
191 protected Guid m_originRegionID = LLUUID.Zero.UUID;
192 public LLUUID OriginRegionID 184 public LLUUID OriginRegionID
193 { 185 {
194 get 186 get { return new LLUUID(m_originRegionID); }
195 { 187 set { m_originRegionID = value.UUID; }
196 return new LLUUID(m_originRegionID);
197 }
198 set
199 {
200 m_originRegionID = value.UUID;
201 }
202 } 188 }
203 189
204 protected string m_regionName;
205 public string RegionName 190 public string RegionName
206 { 191 {
207 get 192 get { return m_regionName; }
208 { 193 set { m_regionName = value; }
209 return m_regionName;
210 }
211 set
212 {
213 m_regionName = value;
214 }
215 } 194 }
216 195
217 protected string m_serverURI;
218 public string ServerURI 196 public string ServerURI
219 { 197 {
220 get 198 get { return m_serverURI; }
221 { 199 set { m_serverURI = value; }
222 return m_serverURI;
223 }
224 set
225 {
226 m_serverURI = value;
227 }
228 } 200 }
229 } 201 }
230} 202} \ No newline at end of file