aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c31e6f7..b42c46e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -422,6 +422,8 @@ namespace OpenSim.Region.Framework.Scenes
422 /// <returns>True after all operations complete, throws exceptions otherwise.</returns> 422 /// <returns>True after all operations complete, throws exceptions otherwise.</returns>
423 public override bool OtherRegionUp(RegionInfo otherRegion) 423 public override bool OtherRegionUp(RegionInfo otherRegion)
424 { 424 {
425 m_log.InfoFormat("[SCENE]: Region {0} up in coords {1}-{2}", otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY);
426
425 if (RegionInfo.RegionHandle != otherRegion.RegionHandle) 427 if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
426 { 428 {
427 for (int i = 0; i < m_neighbours.Count; i++) 429 for (int i = 0; i < m_neighbours.Count; i++)
@@ -517,6 +519,13 @@ namespace OpenSim.Region.Framework.Scenes
517 return found; 519 return found;
518 } 520 }
519 521
522
523 // Alias IncomingHelloNeighbour OtherRegionUp, for now
524 public bool IncomingHelloNeighbour(RegionInfo neighbour)
525 {
526 return OtherRegionUp(neighbour);
527 }
528
520 /// <summary> 529 /// <summary>
521 /// Given float seconds, this will restart the region. 530 /// Given float seconds, this will restart the region.
522 /// </summary> 531 /// </summary>
@@ -2569,7 +2578,7 @@ namespace OpenSim.Region.Framework.Scenes
2569 /// <param name="region"></param> 2578 /// <param name="region"></param>
2570 public void InformClientOfNeighbor(ScenePresence presence, RegionInfo region) 2579 public void InformClientOfNeighbor(ScenePresence presence, RegionInfo region)
2571 { 2580 {
2572 m_sceneGridService.InformNeighborChildAgent(presence, region, m_neighbours); 2581 m_sceneGridService.InformNeighborChildAgent(presence, region);
2573 } 2582 }
2574 2583
2575 /// <summary> 2584 /// <summary>