From 217ffee8cb50e0a7ddfc0d4c4e4bb6a68de909d8 Mon Sep 17 00:00:00 2001
From: diva
Date: Sat, 14 Feb 2009 16:37:55 +0000
Subject: Moved RegionUp to REST/LocalComms. The original functionality has
been entirely maintained, although it will have to be revisited soon, because
it's buggy.
---
OpenSim/Region/Framework/Scenes/Scene.cs | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
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
/// True after all operations complete, throws exceptions otherwise.
public override bool OtherRegionUp(RegionInfo otherRegion)
{
+ m_log.InfoFormat("[SCENE]: Region {0} up in coords {1}-{2}", otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY);
+
if (RegionInfo.RegionHandle != otherRegion.RegionHandle)
{
for (int i = 0; i < m_neighbours.Count; i++)
@@ -517,6 +519,13 @@ namespace OpenSim.Region.Framework.Scenes
return found;
}
+
+ // Alias IncomingHelloNeighbour OtherRegionUp, for now
+ public bool IncomingHelloNeighbour(RegionInfo neighbour)
+ {
+ return OtherRegionUp(neighbour);
+ }
+
///
/// Given float seconds, this will restart the region.
///
@@ -2569,7 +2578,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public void InformClientOfNeighbor(ScenePresence presence, RegionInfo region)
{
- m_sceneGridService.InformNeighborChildAgent(presence, region, m_neighbours);
+ m_sceneGridService.InformNeighborChildAgent(presence, region);
}
///
--
cgit v1.1