diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
2 files changed, 5 insertions, 5 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); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a711ebf..68b645e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -9145,8 +9145,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9145 | return UUID.Zero.ToString(); | 9145 | return UUID.Zero.ToString(); |
9146 | } | 9146 | } |
9147 | reply = new LSL_Vector( | 9147 | reply = new LSL_Vector( |
9148 | info.RegionLocX / Constants.RegionSize, | 9148 | info.RegionLocX, |
9149 | info.RegionLocY / Constants.RegionSize, | 9149 | info.RegionLocY, |
9150 | 0).ToString(); | 9150 | 0).ToString(); |
9151 | break; | 9151 | break; |
9152 | case 6: // DATA_SIM_STATUS | 9152 | case 6: // DATA_SIM_STATUS |