aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-28 23:43:31 +0100
committerJustin Clark-Casey (justincc)2011-10-28 23:43:31 +0100
commitc2da1c4580302a3f1a30b7ad2e70f590aff76167 (patch)
tree449cd3ab509bebfdbf02f42567686b223474ee3e /OpenSim/Region/CoreModules
parentAdd missing doc to rotation/position methods in SOG (diff)
downloadopensim-SC_OLD-c2da1c4580302a3f1a30b7ad2e70f590aff76167.zip
opensim-SC_OLD-c2da1c4580302a3f1a30b7ad2e70f590aff76167.tar.gz
opensim-SC_OLD-c2da1c4580302a3f1a30b7ad2e70f590aff76167.tar.bz2
opensim-SC_OLD-c2da1c4580302a3f1a30b7ad2e70f590aff76167.tar.xz
set grp.RootPart.GroupPosition for code consistency (and readability) rather than calling SOP.OffsetForNewRegion
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs4
1 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 f4d2fda..7324b26 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1686,7 +1686,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1686 1686
1687 // Offset the positions for the new region across the border 1687 // Offset the positions for the new region across the border
1688 Vector3 oldGroupPosition = grp.RootPart.GroupPosition; 1688 Vector3 oldGroupPosition = grp.RootPart.GroupPosition;
1689 grp.OffsetForNewRegion(pos); 1689 grp.RootPart.GroupPosition = pos;
1690 1690
1691 // If we fail to cross the border, then reset the position of the scene object on that border. 1691 // If we fail to cross the border, then reset the position of the scene object on that border.
1692 uint x = 0, y = 0; 1692 uint x = 0, y = 0;
@@ -1694,7 +1694,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1694 GridRegion destination = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y); 1694 GridRegion destination = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
1695 if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent)) 1695 if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent))
1696 { 1696 {
1697 grp.OffsetForNewRegion(oldGroupPosition); 1697 grp.RootPart.GroupPosition = oldGroupPosition;
1698 grp.ScheduleGroupForFullUpdate(); 1698 grp.ScheduleGroupForFullUpdate();
1699 } 1699 }
1700 } 1700 }