diff options
author | UbitUmarov | 2015-09-25 21:43:51 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-25 21:43:51 +0100 |
commit | 07a8618c56df6d7d3d105f1ee52900470c864c65 (patch) | |
tree | 44335cf64084be62be10f627aaa17861bc66e07b /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | patch objects crossings for var regions, until region location is fully fixed (diff) | |
download | opensim-SC_OLD-07a8618c56df6d7d3d105f1ee52900470c864c65.zip opensim-SC_OLD-07a8618c56df6d7d3d105f1ee52900470c864c65.tar.gz opensim-SC_OLD-07a8618c56df6d7d3d105f1ee52900470c864c65.tar.bz2 opensim-SC_OLD-07a8618c56df6d7d3d105f1ee52900470c864c65.tar.xz |
revert previus wrong commit
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 4c241db..902ae22 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -2547,14 +2547,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
2547 | else | 2547 | else |
2548 | y--; | 2548 | y--; |
2549 | 2549 | ||
2550 | // ugly | 2550 | GridRegion neighbourRegion = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID,x,y); |
2551 | // Call the grid service to lookup the region containing the new position. | ||
2552 | GridRegion neighbourRegion = GetRegionContainingWorldLocation( | ||
2553 | scene.GridService, scene.RegionInfo.ScopeID, | ||
2554 | targetPosition.X, targetPosition.Y, | ||
2555 | Math.Max(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY)); | ||
2556 | |||
2557 | // GridRegion neighbourRegion = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID,x,y); | ||
2558 | if (neighbourRegion == null) | 2551 | if (neighbourRegion == null) |
2559 | { | 2552 | { |
2560 | return null; | 2553 | return null; |