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 ee06225..8cf846b 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -287,9 +287,13 @@ namespace OpenSim.Services.Interfaces | |||
287 | } | 287 | } |
288 | catch (SocketException e) | 288 | catch (SocketException e) |
289 | { | 289 | { |
290 | throw new Exception( | 290 | /*throw new Exception( |
291 | "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + | 291 | "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + |
292 | e + "' attached to this exception", e); | 292 | e + "' attached to this exception", e);*/ |
293 | // Don't throw a fatal exception here, instead, return Null and handle it in the caller. | ||
294 | // Reason is, on systems such as OSgrid it has occured that known hostnames stop | ||
295 | // resolving and thus make surrounding regions crash out with this exception. | ||
296 | return null; | ||
293 | } | 297 | } |
294 | 298 | ||
295 | return new IPEndPoint(ia, m_internalEndPoint.Port); | 299 | return new IPEndPoint(ia, m_internalEndPoint.Port); |
@@ -347,6 +351,12 @@ namespace OpenSim.Services.Interfaces | |||
347 | if (kvp.ContainsKey("regionName")) | 351 | if (kvp.ContainsKey("regionName")) |
348 | RegionName = (string)kvp["regionName"]; | 352 | RegionName = (string)kvp["regionName"]; |
349 | 353 | ||
354 | if (kvp.ContainsKey("access")) | ||
355 | { | ||
356 | byte access = Convert.ToByte((string)kvp["access"]); | ||
357 | Maturity = (int)Util.ConvertAccessLevelToMaturity(access); | ||
358 | } | ||
359 | |||
350 | if (kvp.ContainsKey("serverIP")) | 360 | if (kvp.ContainsKey("serverIP")) |
351 | { | 361 | { |
352 | //int port = 0; | 362 | //int port = 0; |