diff options
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Services/Interfaces/IGridService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 47 |
1 files changed, 40 insertions, 7 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index ce432ab..2290530 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Services.Interfaces | |||
50 | /// <param name="regionID"></param> | 50 | /// <param name="regionID"></param> |
51 | /// <returns></returns> | 51 | /// <returns></returns> |
52 | /// <exception cref="System.Exception">Thrown if region deregistration failed</exception> | 52 | /// <exception cref="System.Exception">Thrown if region deregistration failed</exception> |
53 | bool DeregisterRegion(UUID regionID); | 53 | bool DeregisterRegion(UUID regionID); |
54 | 54 | ||
55 | /// <summary> | 55 | /// <summary> |
56 | /// Get information about the regions neighbouring the given co-ordinates (in meters). | 56 | /// Get information about the regions neighbouring the given co-ordinates (in meters). |
@@ -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,11 @@ 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 | public string RegionSecret; | ||
150 | |||
149 | public GridRegion() | 151 | public GridRegion() |
150 | { | 152 | { |
151 | } | 153 | } |
@@ -183,11 +185,29 @@ namespace OpenSim.Services.Interfaces | |||
183 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | 185 | m_internalEndPoint = ConvertFrom.InternalEndPoint; |
184 | m_externalHostName = ConvertFrom.ExternalHostName; | 186 | m_externalHostName = ConvertFrom.ExternalHostName; |
185 | m_httpPort = ConvertFrom.HttpPort; | 187 | m_httpPort = ConvertFrom.HttpPort; |
186 | m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; | 188 | RegionID = ConvertFrom.RegionID; |
187 | RegionID = UUID.Zero; | ||
188 | ServerURI = ConvertFrom.ServerURI; | 189 | ServerURI = ConvertFrom.ServerURI; |
190 | TerrainImage = ConvertFrom.RegionSettings.TerrainImageID; | ||
191 | Access = ConvertFrom.AccessLevel; | ||
192 | Maturity = ConvertFrom.RegionSettings.Maturity; | ||
193 | RegionSecret = ConvertFrom.regionSecret; | ||
189 | } | 194 | } |
190 | 195 | ||
196 | public GridRegion(GridRegion ConvertFrom) | ||
197 | { | ||
198 | m_regionName = ConvertFrom.RegionName; | ||
199 | m_regionLocX = ConvertFrom.RegionLocX; | ||
200 | m_regionLocY = ConvertFrom.RegionLocY; | ||
201 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | ||
202 | m_externalHostName = ConvertFrom.ExternalHostName; | ||
203 | m_httpPort = ConvertFrom.HttpPort; | ||
204 | RegionID = ConvertFrom.RegionID; | ||
205 | ServerURI = ConvertFrom.ServerURI; | ||
206 | TerrainImage = ConvertFrom.TerrainImage; | ||
207 | Access = ConvertFrom.Access; | ||
208 | Maturity = ConvertFrom.Maturity; | ||
209 | RegionSecret = ConvertFrom.RegionSecret; | ||
210 | } | ||
191 | 211 | ||
192 | /// <value> | 212 | /// <value> |
193 | /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw. | 213 | /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw. |
@@ -268,7 +288,10 @@ namespace OpenSim.Services.Interfaces | |||
268 | kvp["serverHttpPort"] = HttpPort.ToString(); | 288 | kvp["serverHttpPort"] = HttpPort.ToString(); |
269 | kvp["serverURI"] = ServerURI; | 289 | kvp["serverURI"] = ServerURI; |
270 | kvp["serverPort"] = InternalEndPoint.Port.ToString(); | 290 | kvp["serverPort"] = InternalEndPoint.Port.ToString(); |
271 | 291 | kvp["regionMapTexture"] = TerrainImage.ToString(); | |
292 | kvp["access"] = Access.ToString(); | ||
293 | kvp["regionSecret"] = RegionSecret; | ||
294 | // Maturity doesn't seem to exist in the DB | ||
272 | return kvp; | 295 | return kvp; |
273 | } | 296 | } |
274 | 297 | ||
@@ -312,6 +335,16 @@ namespace OpenSim.Services.Interfaces | |||
312 | 335 | ||
313 | if (kvp.ContainsKey("serverURI")) | 336 | if (kvp.ContainsKey("serverURI")) |
314 | ServerURI = (string)kvp["serverURI"]; | 337 | ServerURI = (string)kvp["serverURI"]; |
338 | |||
339 | if (kvp.ContainsKey("regionMapTexture")) | ||
340 | UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage); | ||
341 | |||
342 | if (kvp.ContainsKey("access")) | ||
343 | Access = Byte.Parse((string)kvp["access"]); | ||
344 | |||
345 | if (kvp.ContainsKey("regionSecret")) | ||
346 | RegionSecret =(string)kvp["regionSecret"]; | ||
347 | |||
315 | } | 348 | } |
316 | } | 349 | } |
317 | 350 | ||