diff options
author | Diva Canto | 2010-06-13 19:06:22 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-13 19:06:22 -0700 |
commit | 19558f380a1e9cbaff849eb15262266ea79b60d2 (patch) | |
tree | 1209b45e0beb2100d65b539db5a6ba3448ff7abb /OpenSim/Services | |
parent | Fox my changes to radmin (diff) | |
download | opensim-SC-19558f380a1e9cbaff849eb15262266ea79b60d2.zip opensim-SC-19558f380a1e9cbaff849eb15262266ea79b60d2.tar.gz opensim-SC-19558f380a1e9cbaff849eb15262266ea79b60d2.tar.bz2 opensim-SC-19558f380a1e9cbaff849eb15262266ea79b60d2.tar.xz |
Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours.
Diffstat (limited to 'OpenSim/Services')
3 files changed, 7 insertions, 9 deletions
diff --git a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs index 0ec8912..1831533 100644 --- a/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs +++ b/OpenSim/Services/Connectors/Grid/GridServiceConnector.cs | |||
@@ -210,9 +210,6 @@ namespace OpenSim.Services.Connectors | |||
210 | GridRegion rinfo = new GridRegion((Dictionary<string, object>)r); | 210 | GridRegion rinfo = new GridRegion((Dictionary<string, object>)r); |
211 | rinfos.Add(rinfo); | 211 | rinfos.Add(rinfo); |
212 | } | 212 | } |
213 | else | ||
214 | m_log.DebugFormat("[GRID CONNECTOR]: GetNeighbours {0}, {1} received invalid response type {2}", | ||
215 | scopeID, regionID, r.GetType()); | ||
216 | } | 213 | } |
217 | } | 214 | } |
218 | else | 215 | else |
@@ -299,9 +296,9 @@ namespace OpenSim.Services.Connectors | |||
299 | { | 296 | { |
300 | if (replyData["result"] is Dictionary<string, object>) | 297 | if (replyData["result"] is Dictionary<string, object>) |
301 | rinfo = new GridRegion((Dictionary<string, object>)replyData["result"]); | 298 | rinfo = new GridRegion((Dictionary<string, object>)replyData["result"]); |
302 | else | 299 | //else |
303 | m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received no region", | 300 | // m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received no region", |
304 | scopeID, x, y); | 301 | // scopeID, x, y); |
305 | } | 302 | } |
306 | else | 303 | else |
307 | m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received null response", | 304 | m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition {0}, {1}-{2} received null response", |
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs index ff0dd7e..32f02fb 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||
@@ -479,7 +479,7 @@ namespace OpenSim.Services.Connectors.Simulation | |||
479 | } | 479 | } |
480 | catch (WebException ex) | 480 | catch (WebException ex) |
481 | { | 481 | { |
482 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete {0}", ex.Message); | 482 | m_log.InfoFormat("[REMOTE SIMULATION CONNECTOR]: exception on reply of agent delete from {0}: {1}", destination.RegionName, ex.Message); |
483 | return false; | 483 | return false; |
484 | } | 484 | } |
485 | finally | 485 | finally |
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 7c98642..225530f 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs | |||
@@ -273,14 +273,15 @@ namespace OpenSim.Services.GridService | |||
273 | if (region != null) | 273 | if (region != null) |
274 | { | 274 | { |
275 | // Not really? Maybe? | 275 | // Not really? Maybe? |
276 | List<RegionData> rdatas = m_Database.Get(region.posX - (int)Constants.RegionSize, region.posY - (int)Constants.RegionSize, | 276 | List<RegionData> rdatas = m_Database.Get(region.posX - (int)Constants.RegionSize - 1, region.posY - (int)Constants.RegionSize - 1, |
277 | region.posX + (int)Constants.RegionSize, region.posY + (int)Constants.RegionSize, scopeID); | 277 | region.posX + (int)Constants.RegionSize + 1, region.posY + (int)Constants.RegionSize + 1, scopeID); |
278 | 278 | ||
279 | foreach (RegionData rdata in rdatas) | 279 | foreach (RegionData rdata in rdatas) |
280 | if (rdata.RegionID != regionID) | 280 | if (rdata.RegionID != regionID) |
281 | rinfos.Add(RegionData2RegionInfo(rdata)); | 281 | rinfos.Add(RegionData2RegionInfo(rdata)); |
282 | 282 | ||
283 | } | 283 | } |
284 | m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighours", region.RegionName, rinfos.Count); | ||
284 | return rinfos; | 285 | return rinfos; |
285 | } | 286 | } |
286 | 287 | ||