diff options
Diffstat (limited to 'OpenSim/Services/Interfaces/IGridService.cs')
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 6ed681f..cecbe9e 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -340,9 +340,13 @@ namespace OpenSim.Services.Interfaces | |||
340 | } | 340 | } |
341 | catch (SocketException e) | 341 | catch (SocketException e) |
342 | { | 342 | { |
343 | throw new Exception( | 343 | /*throw new Exception( |
344 | "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + | 344 | "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + |
345 | e + "' attached to this exception", e); | 345 | e + "' attached to this exception", e);*/ |
346 | // Don't throw a fatal exception here, instead, return Null and handle it in the caller. | ||
347 | // Reason is, on systems such as OSgrid it has occured that known hostnames stop | ||
348 | // resolving and thus make surrounding regions crash out with this exception. | ||
349 | return null; | ||
346 | } | 350 | } |
347 | 351 | ||
348 | return new IPEndPoint(ia, m_internalEndPoint.Port); | 352 | return new IPEndPoint(ia, m_internalEndPoint.Port); |
@@ -401,6 +405,12 @@ namespace OpenSim.Services.Interfaces | |||
401 | if (kvp.ContainsKey("regionName")) | 405 | if (kvp.ContainsKey("regionName")) |
402 | RegionName = (string)kvp["regionName"]; | 406 | RegionName = (string)kvp["regionName"]; |
403 | 407 | ||
408 | if (kvp.ContainsKey("access")) | ||
409 | { | ||
410 | byte access = Convert.ToByte((string)kvp["access"]); | ||
411 | Maturity = (int)Util.ConvertAccessLevelToMaturity(access); | ||
412 | } | ||
413 | |||
404 | if (kvp.ContainsKey("serverIP")) | 414 | if (kvp.ContainsKey("serverIP")) |
405 | { | 415 | { |
406 | //int port = 0; | 416 | //int port = 0; |