aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs23
2 files changed, 21 insertions, 8 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index f1542f5..fa1db15 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -206,11 +206,7 @@ namespace OpenSim.Region.Communications.OGS1
206 return returnGridSettings; 206 return returnGridSettings;
207 } 207 }
208 208
209 /// <summary> 209 // see IGridServices
210 ///
211 /// </summary>
212 /// <param name="regionInfo"></param>
213 /// <returns></returns>
214 public List<SimpleRegionInfo> RequestNeighbours(uint x, uint y) 210 public List<SimpleRegionInfo> RequestNeighbours(uint x, uint y)
215 { 211 {
216 Hashtable respData = MapBlockQuery((int) x - 1, (int) y - 1, (int) x + 1, (int) y + 1); 212 Hashtable respData = MapBlockQuery((int) x - 1, (int) y - 1, (int) x + 1, (int) y + 1);
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 }