diff options
| author | Melanie | 2010-12-31 15:53:31 +0100 |
|---|---|---|
| committer | Melanie | 2010-12-31 15:53:31 +0100 |
| commit | 5545b03168fd2444d15e930890761713b4462d0a (patch) | |
| tree | 5d79c93657d1705143e68fba80a1caebc3951127 /OpenSim/Region | |
| parent | Implement Scope ID lookup on GetLandData. Stacked regions were not handled (diff) | |
| download | opensim-SC_OLD-5545b03168fd2444d15e930890761713b4462d0a.zip opensim-SC_OLD-5545b03168fd2444d15e930890761713b4462d0a.tar.gz opensim-SC_OLD-5545b03168fd2444d15e930890761713b4462d0a.tar.bz2 opensim-SC_OLD-5545b03168fd2444d15e930890761713b4462d0a.tar.xz | |
Fix scoping for prim region crossings
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 0c59ba1..eb150d9 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1542,7 +1542,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1542 | // If we fail to cross the border, then reset the position of the scene object on that border. | 1542 | // If we fail to cross the border, then reset the position of the scene object on that border. |
| 1543 | uint x = 0, y = 0; | 1543 | uint x = 0, y = 0; |
| 1544 | Utils.LongToUInts(newRegionHandle, out x, out y); | 1544 | Utils.LongToUInts(newRegionHandle, out x, out y); |
| 1545 | GridRegion destination = scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); | 1545 | GridRegion destination = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y); |
| 1546 | if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent)) | 1546 | if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent)) |
| 1547 | { | 1547 | { |
| 1548 | grp.OffsetForNewRegion(oldGroupPosition); | 1548 | grp.OffsetForNewRegion(oldGroupPosition); |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 001ad87..d9812df 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
| @@ -1582,7 +1582,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
| 1582 | // most likely still cached from building the extLandData entry | 1582 | // most likely still cached from building the extLandData entry |
| 1583 | uint x = 0, y = 0; | 1583 | uint x = 0, y = 0; |
| 1584 | Utils.LongToUInts(data.RegionHandle, out x, out y); | 1584 | Utils.LongToUInts(data.RegionHandle, out x, out y); |
| 1585 | info = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); | 1585 | info = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y); |
| 1586 | } | 1586 | } |
| 1587 | // we need to transfer the fake parcelID, not the one in landData, so the viewer can match it to the landmark. | 1587 | // we need to transfer the fake parcelID, not the one in landData, so the viewer can match it to the landmark. |
| 1588 | m_log.DebugFormat("[LAND] got parcelinfo for parcel {0} in region {1}; sending...", | 1588 | m_log.DebugFormat("[LAND] got parcelinfo for parcel {0} in region {1}; sending...", |