diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs index d9c34e4..2089f07 100644 --- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | |||
@@ -278,9 +278,26 @@ namespace OpenSim.Region.Environment.Scenes | |||
278 | agent.child = true; | 278 | agent.child = true; |
279 | 279 | ||
280 | InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; | 280 | InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; |
281 | d.BeginInvoke(avatar, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint, | 281 | |
282 | InformClientOfNeighbourCompleted, | 282 | try |
283 | d); | 283 | { |
284 | d.BeginInvoke(avatar, agent, neighbours[i].RegionHandle, neighbours[i].ExternalEndPoint, | ||
285 | InformClientOfNeighbourCompleted, | ||
286 | d); | ||
287 | } | ||
288 | catch (Exception e) | ||
289 | { | ||
290 | m_log.ErrorFormat( | ||
291 | "[REGIONINFO]: Could not resolve external hostname {0} for region {1} ({2}, {3})", | ||
292 | neighbours[i].ExternalHostName, | ||
293 | neighbours[i].RegionHandle, | ||
294 | neighbours[i].RegionLocX, | ||
295 | neighbours[i].RegionLocY); | ||
296 | |||
297 | // FIXME: Okay, even though we've failed, we're still going to throw the exception on, | ||
298 | // since I don't know what will happen if we just let the client continue | ||
299 | throw e; | ||
300 | } | ||
284 | } | 301 | } |
285 | } | 302 | } |
286 | } | 303 | } |