From c2da1c4580302a3f1a30b7ad2e70f590aff76167 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 28 Oct 2011 23:43:31 +0100 Subject: [PATCH] set grp.RootPart.GroupPosition for code consistency (and readability) rather than calling SOP.OffsetForNewRegion --- .../Framework/EntityTransfer/EntityTransferModule.cs | 4 ++-- OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index f4d2fda3d0..7324b26afc 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 // Offset the positions for the new region across the border Vector3 oldGroupPosition = grp.RootPart.GroupPosition; - grp.OffsetForNewRegion(pos); + grp.RootPart.GroupPosition = pos; // If we fail to cross the border, then reset the position of the scene object on that border. uint x = 0, y = 0; @@ -1694,7 +1694,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer GridRegion destination = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y); if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent)) { - grp.OffsetForNewRegion(oldGroupPosition); + grp.RootPart.GroupPosition = oldGroupPosition; grp.ScheduleGroupForFullUpdate(); } } diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index f6d3293778..64810d2c64 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -2798,11 +2798,6 @@ namespace OpenSim.Region.Framework.Scenes ScheduleGroupForTerseUpdate(); } - public void OffsetForNewRegion(Vector3 offset) - { - m_rootPart.GroupPosition = offset; - } - #endregion #region Rotation