diff options
author | Justin Clarke Casey | 2008-08-25 21:26:58 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-08-25 21:26:58 +0000 |
commit | 7402c2d288045fc817c2da8ae6b336253a57b290 (patch) | |
tree | db52a8cc35d3da5c4d41f0e2fa5d2f128a416935 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | Add the same delay factor in the XEngine section for the XEngine (diff) | |
download | opensim-SC-7402c2d288045fc817c2da8ae6b336253a57b290.zip opensim-SC-7402c2d288045fc817c2da8ae6b336253a57b290.tar.gz opensim-SC-7402c2d288045fc817c2da8ae6b336253a57b290.tar.bz2 opensim-SC-7402c2d288045fc817c2da8ae6b336253a57b290.tar.xz |
* Deal with a WebException thrown if a grid server cannot be contacted for region information
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 6f3267a..9b91176 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2897,12 +2897,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
2897 | public void RequestTeleportLandmark(IClientAPI remoteClient, LLUUID regionID, LLVector3 position) | 2897 | public void RequestTeleportLandmark(IClientAPI remoteClient, LLUUID regionID, LLVector3 position) |
2898 | { | 2898 | { |
2899 | RegionInfo info = CommsManager.GridService.RequestNeighbourInfo(regionID); | 2899 | RegionInfo info = CommsManager.GridService.RequestNeighbourInfo(regionID); |
2900 | |||
2900 | if (info == null) | 2901 | if (info == null) |
2901 | { | 2902 | { |
2902 | // can't find the region: Tell viewer and abort | 2903 | // can't find the region: Tell viewer and abort |
2903 | remoteClient.SendTeleportFailed("The teleport destination could not be found."); | 2904 | remoteClient.SendTeleportFailed("The teleport destination could not be found."); |
2904 | return; | 2905 | return; |
2905 | } | 2906 | } |
2907 | |||
2906 | lock (m_scenePresences) | 2908 | lock (m_scenePresences) |
2907 | { | 2909 | { |
2908 | if (m_scenePresences.ContainsKey(remoteClient.AgentId)) | 2910 | if (m_scenePresences.ContainsKey(remoteClient.AgentId)) |