aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Grid
diff options
context:
space:
mode:
authorDiva Canto2010-06-13 19:06:22 -0700
committerDiva Canto2010-06-13 19:06:22 -0700
commit19558f380a1e9cbaff849eb15262266ea79b60d2 (patch)
tree1209b45e0beb2100d65b539db5a6ba3448ff7abb /OpenSim/Services/Connectors/Grid
parentFox my changes to radmin (diff)
downloadopensim-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/Connectors/Grid')
-rw-r--r--OpenSim/Services/Connectors/Grid/GridServiceConnector.cs9
1 files changed, 3 insertions, 6 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",