ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
This commit is contained in:
Melanie
2013-04-02 23:47:19 +01:00
parent 4bfc469584 3332af4060
commit 41a652f6bd
22 changed files with 545 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -4362,17 +4362,17 @@ namespace OpenSim.Region.Framework.Scenes
}
/// <summary>
///
/// Update this part's offset position.
/// </summary>
/// <param name="pos"></param>
public void UpdateOffSet(Vector3 pos)
public void UpdateOffSet(Vector3 newPos)
{
if ((pos.X != OffsetPosition.X) ||
(pos.Y != OffsetPosition.Y) ||
(pos.Z != OffsetPosition.Z))
{
Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z);
Vector3 oldPos = OffsetPosition;
if ((newPos.X != oldPos.X) ||
(newPos.Y != oldPos.Y) ||
(newPos.Z != oldPos.Z))
{
if (ParentGroup.RootPart.GetStatusSandbox())
{
if (Util.GetDistanceTo(ParentGroup.RootPart.StatusSandboxPos, newPos) > 10)