aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-07 22:11:18 +0200
committerMelanie Thielker2010-08-07 22:11:18 +0200
commit71f2cec1bdff73543f03f5d66dec106c2cc7a3aa (patch)
tree55d5ce0e977805061696c37206914444920af1d5 /OpenSim/Region
parentMantis #229. Fix Global sim ccordinates (diff)
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-71f2cec1bdff73543f03f5d66dec106c2cc7a3aa.zip
opensim-SC_OLD-71f2cec1bdff73543f03f5d66dec106c2cc7a3aa.tar.gz
opensim-SC_OLD-71f2cec1bdff73543f03f5d66dec106c2cc7a3aa.tar.bz2
opensim-SC_OLD-71f2cec1bdff73543f03f5d66dec106c2cc7a3aa.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index a9ecde8..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,7 +267,7 @@ 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);