diff options
Diffstat (limited to 'OpenSim')
3 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs index 6c89ac8..9172536 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
66 | return; | 66 | return; |
67 | 67 | ||
68 | m_log.DebugFormat("[REGION CACHE]: (on region {0}) Region {1} is up @ {2}-{3}", | 68 | m_log.DebugFormat("[REGION CACHE]: (on region {0}) Region {1} is up @ {2}-{3}", |
69 | m_scene.RegionInfo.RegionName, otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY); | 69 | m_scene.RegionInfo.RegionName, otherRegion.RegionName, otherRegion.RegionLocX / Constants.RegionSize, otherRegion.RegionLocY / Constants.RegionSize); |
70 | 70 | ||
71 | m_neighbours[otherRegion.RegionHandle] = otherRegion; | 71 | m_neighbours[otherRegion.RegionHandle] = otherRegion; |
72 | } | 72 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c4bd028..e27b2ba 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -810,8 +810,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
810 | { | 810 | { |
811 | uint xcell = (uint)((int)otherRegion.RegionLocX / (int)Constants.RegionSize); | 811 | uint xcell = (uint)((int)otherRegion.RegionLocX / (int)Constants.RegionSize); |
812 | uint ycell = (uint)((int)otherRegion.RegionLocY / (int)Constants.RegionSize); | 812 | uint ycell = (uint)((int)otherRegion.RegionLocY / (int)Constants.RegionSize); |
813 | m_log.InfoFormat("[SCENE]: (on region {0}): Region {1} up in coords {2}-{3}", | 813 | //m_log.InfoFormat("[SCENE]: (on region {0}): Region {1} up in coords {2}-{3}", |
814 | RegionInfo.RegionName, otherRegion.RegionName, xcell, ycell); | 814 | // RegionInfo.RegionName, otherRegion.RegionName, xcell, ycell); |
815 | 815 | ||
816 | if (RegionInfo.RegionHandle != otherRegion.RegionHandle) | 816 | if (RegionInfo.RegionHandle != otherRegion.RegionHandle) |
817 | { | 817 | { |
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs index 9c57a40..93da10e 100644 --- a/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs +++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServiceConnector.cs | |||
@@ -87,7 +87,7 @@ namespace OpenSim.Services.Connectors | |||
87 | 87 | ||
88 | public bool DoHelloNeighbourCall(GridRegion region, RegionInfo thisRegion) | 88 | public bool DoHelloNeighbourCall(GridRegion region, RegionInfo thisRegion) |
89 | { | 89 | { |
90 | string uri = region.ServerURI + "/region/" + thisRegion.RegionID + "/"; | 90 | string uri = region.ServerURI + "region/" + thisRegion.RegionID + "/"; |
91 | //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri); | 91 | //m_log.Debug(" >>> DoHelloNeighbourCall <<< " + uri); |
92 | 92 | ||
93 | WebRequest HelloNeighbourRequest = WebRequest.Create(uri); | 93 | WebRequest HelloNeighbourRequest = WebRequest.Create(uri); |