aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 2f0bbb2..4c10e2c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -459,7 +459,7 @@ namespace OpenSim.Region.Framework.Scenes
459 /// This informs a single neighboring region about agent "avatar". 459 /// This informs a single neighboring region about agent "avatar".
460 /// Calls an asynchronous method to do so.. so it doesn't lag the sim. 460 /// Calls an asynchronous method to do so.. so it doesn't lag the sim.
461 /// </summary> 461 /// </summary>
462 public void InformNeighborChildAgent(ScenePresence avatar, SimpleRegionInfo region, List<RegionInfo> neighbours) 462 public void InformNeighborChildAgent(ScenePresence avatar, SimpleRegionInfo region)
463 { 463 {
464 AgentCircuitData agent = avatar.ControllingClient.RequestClientInfo(); 464 AgentCircuitData agent = avatar.ControllingClient.RequestClientInfo();
465 agent.BaseFolder = UUID.Zero; 465 agent.BaseFolder = UUID.Zero;
@@ -493,8 +493,10 @@ namespace OpenSim.Region.Framework.Scenes
493 m_log.Info("[INTERGRID]: Starting to inform neighbors that I'm here"); 493 m_log.Info("[INTERGRID]: Starting to inform neighbors that I'm here");
494 //RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port); 494 //RegionUpData regiondata = new RegionUpData(region.RegionLocX, region.RegionLocY, region.ExternalHostName, region.InternalEndPoint.Port);
495 495
496 bool regionAccepted = 496 //bool regionAccepted =
497 m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region), regionhandle); 497 // m_commsProvider.InterRegion.RegionUp(new SerializableRegionInfo(region), regionhandle);
498
499 bool regionAccepted = m_interregionCommsOut.SendHelloNeighbour(regionhandle, region);
498 500
499 if (regionAccepted) 501 if (regionAccepted)
500 { 502 {
@@ -519,7 +521,7 @@ namespace OpenSim.Region.Framework.Scenes
519 { 521 {
520 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); 522 //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName);
521 523
522 524
523 List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>(); 525 List<SimpleRegionInfo> neighbours = new List<SimpleRegionInfo>();
524 // This stays uncached because we don't already know about our neighbors at this point. 526 // This stays uncached because we don't already know about our neighbors at this point.
525 neighbours = m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY); 527 neighbours = m_commsProvider.GridService.RequestNeighbours(m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);