diff options
Diffstat (limited to 'OpenSim/Services/Interfaces/IGridService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index ce432ab..c5495fb 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -122,9 +122,6 @@ namespace OpenSim.Services.Interfaces | |||
122 | } | 122 | } |
123 | protected string m_regionName = String.Empty; | 123 | protected string m_regionName = String.Empty; |
124 | 124 | ||
125 | protected bool Allow_Alternate_Ports; | ||
126 | public bool m_allow_alternate_ports; | ||
127 | |||
128 | protected string m_externalHostName; | 125 | protected string m_externalHostName; |
129 | 126 | ||
130 | protected IPEndPoint m_internalEndPoint; | 127 | protected IPEndPoint m_internalEndPoint; |
@@ -146,6 +143,10 @@ namespace OpenSim.Services.Interfaces | |||
146 | public UUID RegionID = UUID.Zero; | 143 | public UUID RegionID = UUID.Zero; |
147 | public UUID ScopeID = UUID.Zero; | 144 | public UUID ScopeID = UUID.Zero; |
148 | 145 | ||
146 | public UUID TerrainImage = UUID.Zero; | ||
147 | public byte Access; | ||
148 | public int Maturity; | ||
149 | |||
149 | public GridRegion() | 150 | public GridRegion() |
150 | { | 151 | { |
151 | } | 152 | } |
@@ -183,11 +184,27 @@ namespace OpenSim.Services.Interfaces | |||
183 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | 184 | m_internalEndPoint = ConvertFrom.InternalEndPoint; |
184 | m_externalHostName = ConvertFrom.ExternalHostName; | 185 | m_externalHostName = ConvertFrom.ExternalHostName; |
185 | m_httpPort = ConvertFrom.HttpPort; | 186 | m_httpPort = ConvertFrom.HttpPort; |
186 | m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; | 187 | RegionID = ConvertFrom.RegionID; |
187 | RegionID = UUID.Zero; | ||
188 | ServerURI = ConvertFrom.ServerURI; | 188 | ServerURI = ConvertFrom.ServerURI; |
189 | TerrainImage = ConvertFrom.RegionSettings.TerrainImageID; | ||
190 | Access = ConvertFrom.AccessLevel; | ||
191 | Maturity = ConvertFrom.RegionSettings.Maturity; | ||
189 | } | 192 | } |
190 | 193 | ||
194 | public GridRegion(GridRegion ConvertFrom) | ||
195 | { | ||
196 | m_regionName = ConvertFrom.RegionName; | ||
197 | m_regionLocX = ConvertFrom.RegionLocX; | ||
198 | m_regionLocY = ConvertFrom.RegionLocY; | ||
199 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | ||
200 | m_externalHostName = ConvertFrom.ExternalHostName; | ||
201 | m_httpPort = ConvertFrom.HttpPort; | ||
202 | RegionID = ConvertFrom.RegionID; | ||
203 | ServerURI = ConvertFrom.ServerURI; | ||
204 | TerrainImage = ConvertFrom.TerrainImage; | ||
205 | Access = ConvertFrom.Access; | ||
206 | Maturity = ConvertFrom.Maturity; | ||
207 | } | ||
191 | 208 | ||
192 | /// <value> | 209 | /// <value> |
193 | /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw. | 210 | /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw. |
@@ -268,7 +285,9 @@ namespace OpenSim.Services.Interfaces | |||
268 | kvp["serverHttpPort"] = HttpPort.ToString(); | 285 | kvp["serverHttpPort"] = HttpPort.ToString(); |
269 | kvp["serverURI"] = ServerURI; | 286 | kvp["serverURI"] = ServerURI; |
270 | kvp["serverPort"] = InternalEndPoint.Port.ToString(); | 287 | kvp["serverPort"] = InternalEndPoint.Port.ToString(); |
271 | 288 | kvp["regionMapTexture"] = TerrainImage.ToString(); | |
289 | kvp["access"] = Access.ToString(); | ||
290 | // Maturity doesn't seem to exist in the DB | ||
272 | return kvp; | 291 | return kvp; |
273 | } | 292 | } |
274 | 293 | ||
@@ -312,6 +331,16 @@ namespace OpenSim.Services.Interfaces | |||
312 | 331 | ||
313 | if (kvp.ContainsKey("serverURI")) | 332 | if (kvp.ContainsKey("serverURI")) |
314 | ServerURI = (string)kvp["serverURI"]; | 333 | ServerURI = (string)kvp["serverURI"]; |
334 | |||
335 | if (kvp.ContainsKey("regionMapTexture")) | ||
336 | { | ||
337 | UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage); | ||
338 | } | ||
339 | |||
340 | if (kvp.ContainsKey("access")) | ||
341 | { | ||
342 | Access = Byte.Parse((string)kvp["access"]); ; | ||
343 | } | ||
315 | } | 344 | } |
316 | } | 345 | } |
317 | 346 | ||