diff options
| author | Diva Canto | 2010-12-29 07:36:39 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-12-29 07:36:39 -0800 |
| commit | d42e0c39fcaa03e101b8270e083690f2004c6776 (patch) | |
| tree | 40bec1a8728148329a123492067996834ebb67f1 /OpenSim/Region | |
| parent | fixes a problem with ending slashes in GatekeeperService to verify session-ad... (diff) | |
| download | opensim-SC_OLD-d42e0c39fcaa03e101b8270e083690f2004c6776.zip opensim-SC_OLD-d42e0c39fcaa03e101b8270e083690f2004c6776.tar.gz opensim-SC_OLD-d42e0c39fcaa03e101b8270e083690f2004c6776.tar.bz2 opensim-SC_OLD-d42e0c39fcaa03e101b8270e083690f2004c6776.tar.xz | |
Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 |
2 files changed, 3 insertions, 3 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 | { |