OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

set grp.RootPart.GroupPosition for code consistency (and readability) rather than calling SOP.OffsetForNewRegion

remove-scene-viewer
Justin Clark-Casey (justincc) 2011-10-28 23:43:31 +01:00
parent 9bf8c3e7b7
commit c2da1c4580
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1686,7 +1686,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
// Offset the positions for the new region across the border // Offset the positions for the new region across the border
Vector3 oldGroupPosition = grp.RootPart.GroupPosition; 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. // If we fail to cross the border, then reset the position of the scene object on that border.
uint x = 0, y = 0; 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); GridRegion destination = scene.GridService.GetRegionByPosition(scene.RegionInfo.ScopeID, (int)x, (int)y);
if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent)) if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent))
{ {
grp.OffsetForNewRegion(oldGroupPosition); grp.RootPart.GroupPosition = oldGroupPosition;
grp.ScheduleGroupForFullUpdate(); grp.ScheduleGroupForFullUpdate();
} }
} }

5
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -2798,11 +2798,6 @@ namespace OpenSim.Region.Framework.Scenes
ScheduleGroupForTerseUpdate(); ScheduleGroupForTerseUpdate();
} }
public void OffsetForNewRegion(Vector3 offset)
{
m_rootPart.GroupPosition = offset;
}
#endregion #endregion
#region Rotation #region Rotation