diff options
author | Tom Grimshaw | 2010-05-29 01:03:59 -0700 |
---|---|---|
committer | Tom Grimshaw | 2010-05-29 01:03:59 -0700 |
commit | 2f409116db570be77fc75df188a4044250dce226 (patch) | |
tree | 424980e50591e1d4b7d89fe88960e457b19c457d /OpenSim/Services/LLLoginService | |
parent | Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/car... (diff) | |
download | opensim-SC-2f409116db570be77fc75df188a4044250dce226.zip opensim-SC-2f409116db570be77fc75df188a4044250dce226.tar.gz opensim-SC-2f409116db570be77fc75df188a4044250dce226.tar.bz2 opensim-SC-2f409116db570be77fc75df188a4044250dce226.tar.xz |
Stop IGridService from throwing a fatal exception when an IPEndPoint cannot be resolved, and add some handlers to deal with this cleanly; a condition was observed on OSGrid where a neighbouring region with an invalid (unresolveable) hostname would prevent a region from starting. This is bad.
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index edf41bc..6a2cbeb 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -327,6 +327,7 @@ namespace OpenSim.Services.LLLoginService | |||
327 | private void FillOutRegionData(GridRegion destination) | 327 | private void FillOutRegionData(GridRegion destination) |
328 | { | 328 | { |
329 | IPEndPoint endPoint = destination.ExternalEndPoint; | 329 | IPEndPoint endPoint = destination.ExternalEndPoint; |
330 | if (endPoint == null) return; | ||
330 | SimAddress = endPoint.Address.ToString(); | 331 | SimAddress = endPoint.Address.ToString(); |
331 | SimPort = (uint)endPoint.Port; | 332 | SimPort = (uint)endPoint.Port; |
332 | RegionX = (uint)destination.RegionLocX; | 333 | RegionX = (uint)destination.RegionLocX; |