aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2013-04-02 23:47:19 +0100
committerMelanie2013-04-02 23:47:19 +0100
commit41a652f6bdf7c802859850c943b7a33fdd47fc23 (patch)
treec5571f68e6c7113b2ec4a4397aedf91d9a6ef457 /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' into careminster (diff)
parentminor: Make SOP.UpdateOffset() more consistent by checking against the same o... (diff)
downloadopensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.zip
opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.gz
opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.bz2
opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs14
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)