diff options
author | Robert Adams | 2013-11-28 08:20:16 -0800 |
---|---|---|
committer | Robert Adams | 2013-11-28 08:20:16 -0800 |
commit | 7aa00632b90f9c24ff6b0fa0da385744a6573c32 (patch) | |
tree | bc63b12b893d3842932e4d0a3def8ed038288004 /OpenSim/Services/Connectors/Neighbour | |
parent | Merge branch 'master' into varregion (diff) | |
download | opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.zip opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.tar.gz opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.tar.bz2 opensim-SC_OLD-7aa00632b90f9c24ff6b0fa0da385744a6573c32.tar.xz |
varregion: many replacements of in-place arithmetic with calls to
the Util functions for converting world addresses to region addresses
and converting region handles to locations.
Diffstat (limited to 'OpenSim/Services/Connectors/Neighbour')
-rw-r--r-- | OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs index 774fe2a..beead97 100644 --- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs +++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors | |||
69 | public virtual GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) | 69 | public virtual GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) |
70 | { | 70 | { |
71 | uint x = 0, y = 0; | 71 | uint x = 0, y = 0; |
72 | Utils.LongToUInts(regionHandle, out x, out y); | 72 | Util.RegionHandleToWorldLoc(regionHandle, out x, out y); |
73 | GridRegion regInfo = m_GridService.GetRegionByPosition(thisRegion.ScopeID, (int)x, (int)y); | 73 | GridRegion regInfo = m_GridService.GetRegionByPosition(thisRegion.ScopeID, (int)x, (int)y); |
74 | if ((regInfo != null) && | 74 | if ((regInfo != null) && |
75 | // Don't remote-call this instance; that's a startup hickup | 75 | // Don't remote-call this instance; that's a startup hickup |