aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2010-12-31 15:53:31 +0100
committerMelanie2011-01-03 19:41:02 +0000
commitc48ddbfef162c758bd4759d4100f8d3e081b37a7 (patch)
treec02e10bc206d669fb15ad8ac30e2f3289c55fc07
parentImplement Scope ID lookup on GetLandData. Stacked regions were not handled (diff)
downloadopensim-SC_OLD-c48ddbfef162c758bd4759d4100f8d3e081b37a7.zip
opensim-SC_OLD-c48ddbfef162c758bd4759d4100f8d3e081b37a7.tar.gz
opensim-SC_OLD-c48ddbfef162c758bd4759d4100f8d3e081b37a7.tar.bz2
opensim-SC_OLD-c48ddbfef162c758bd4759d4100f8d3e081b37a7.tar.xz
Fix scoping for prim region crossings
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs2
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 a3251aa..e5cefe4 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1515,7 +1515,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1515 // If we fail to cross the border, then reset the position of the scene object on that border. 1515 // If we fail to cross the border, then reset the position of the scene object on that border.
1516 uint x = 0, y = 0; 1516 uint x = 0, y = 0;
1517 Utils.LongToUInts(newRegionHandle, out x, out y); 1517 Utils.LongToUInts(newRegionHandle, out x, out y);
1518 GridRegion destination = scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); 1518 GridRegion destination = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
1519 if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent)) 1519 if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent))
1520 { 1520 {
1521 grp.OffsetForNewRegion(oldGroupPosition); 1521 grp.OffsetForNewRegion(oldGroupPosition);
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 8a309f1..4f8e205 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1557,7 +1557,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1557 // most likely still cached from building the extLandData entry 1557 // most likely still cached from building the extLandData entry
1558 uint x = 0, y = 0; 1558 uint x = 0, y = 0;
1559 Utils.LongToUInts(data.RegionHandle, out x, out y); 1559 Utils.LongToUInts(data.RegionHandle, out x, out y);
1560 info = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); 1560 info = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y);
1561 } 1561 }
1562 // we need to transfer the fake parcelID, not the one in landData, so the viewer can match it to the landmark. 1562 // we need to transfer the fake parcelID, not the one in landData, so the viewer can match it to the landmark.
1563 m_log.DebugFormat("[LAND] got parcelinfo for parcel {0} in region {1}; sending...", 1563 m_log.DebugFormat("[LAND] got parcelinfo for parcel {0} in region {1}; sending...",