diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index c675322..59e4037 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -168,7 +168,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
168 | 168 | ||
169 | if (neighbour != null) | 169 | if (neighbour != null) |
170 | { | 170 | { |
171 | m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize); | 171 | // m_log.DebugFormat("[INTERGRID]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize); |
172 | m_scene.EventManager.TriggerOnRegionUp(neighbour); | 172 | m_scene.EventManager.TriggerOnRegionUp(neighbour); |
173 | } | 173 | } |
174 | else | 174 | else |
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
183 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); | 183 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); |
184 | 184 | ||
185 | List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID); | 185 | List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID); |
186 | m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count); | 186 | //m_log.DebugFormat("[INTERGRID]: Informing {0} neighbours that this region is up", neighbours.Count); |
187 | foreach (GridRegion n in neighbours) | 187 | foreach (GridRegion n in neighbours) |
188 | { | 188 | { |
189 | InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync; | 189 | InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync; |
@@ -267,14 +267,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
267 | protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle) | 267 | protected void SendCloseChildAgentAsync(UUID agentID, ulong regionHandle) |
268 | { | 268 | { |
269 | 269 | ||
270 | m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle); | 270 | //m_log.Debug("[INTERGRID]: Sending close agent to " + regionHandle); |
271 | // let's do our best, but there's not much we can do if the neighbour doesn't accept. | 271 | // let's do our best, but there's not much we can do if the neighbour doesn't accept. |
272 | 272 | ||
273 | //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); | 273 | //m_commsProvider.InterRegion.TellRegionToCloseChildConnection(regionHandle, agentID); |
274 | uint x = 0, y = 0; | 274 | uint x = 0, y = 0; |
275 | Utils.LongToUInts(regionHandle, out x, out y); | 275 | Utils.LongToUInts(regionHandle, out x, out y); |
276 | GridRegion destination = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); | 276 | GridRegion destination = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); |
277 | m_scene.SimulationService.CloseAgent(destination, agentID); | 277 | m_scene.SimulationService.CloseChildAgent(destination, agentID); |
278 | } | 278 | } |
279 | 279 | ||
280 | private void SendCloseChildAgentCompleted(IAsyncResult iar) | 280 | private void SendCloseChildAgentCompleted(IAsyncResult iar) |
@@ -293,7 +293,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
293 | d); | 293 | d); |
294 | } | 294 | } |
295 | } | 295 | } |
296 | 296 | ||
297 | public List<GridRegion> RequestNamedRegions(string name, int maxNumber) | 297 | public List<GridRegion> RequestNamedRegions(string name, int maxNumber) |
298 | { | 298 | { |
299 | return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); | 299 | return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); |