diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 42644dc..48ee6ea 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -4362,17 +4362,17 @@ namespace OpenSim.Region.Framework.Scenes | |||
4362 | } | 4362 | } |
4363 | 4363 | ||
4364 | /// <summary> | 4364 | /// <summary> |
4365 | /// | 4365 | /// Update this part's offset position. |
4366 | /// </summary> | 4366 | /// </summary> |
4367 | /// <param name="pos"></param> | 4367 | /// <param name="pos"></param> |
4368 | public void UpdateOffSet(Vector3 pos) | 4368 | public void UpdateOffSet(Vector3 newPos) |
4369 | { | 4369 | { |
4370 | if ((pos.X != OffsetPosition.X) || | 4370 | Vector3 oldPos = OffsetPosition; |
4371 | (pos.Y != OffsetPosition.Y) || | ||
4372 | (pos.Z != OffsetPosition.Z)) | ||
4373 | { | ||
4374 | Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z); | ||
4375 | 4371 | ||
4372 | if ((newPos.X != oldPos.X) || | ||
4373 | (newPos.Y != oldPos.Y) || | ||
4374 | (newPos.Z != oldPos.Z)) | ||
4375 | { | ||
4376 | if (ParentGroup.RootPart.GetStatusSandbox()) | 4376 | if (ParentGroup.RootPart.GetStatusSandbox()) |
4377 | { | 4377 | { |
4378 | if (Util.GetDistanceTo(ParentGroup.RootPart.StatusSandboxPos, newPos) > 10) | 4378 | if (Util.GetDistanceTo(ParentGroup.RootPart.StatusSandboxPos, newPos) > 10) |