diff options
author | Melanie | 2013-04-02 23:53:23 +0100 |
---|---|---|
committer | Melanie | 2013-04-02 23:53:23 +0100 |
commit | 4bc5a7aa1913389fd0bc26a85169f33a2d308d56 (patch) | |
tree | a339b58fa03cad3a82c742431766c256e9f15552 /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather than... (diff) | |
download | opensim-SC_OLD-4bc5a7aa1913389fd0bc26a85169f33a2d308d56.zip opensim-SC_OLD-4bc5a7aa1913389fd0bc26a85169f33a2d308d56.tar.gz opensim-SC_OLD-4bc5a7aa1913389fd0bc26a85169f33a2d308d56.tar.bz2 opensim-SC_OLD-4bc5a7aa1913389fd0bc26a85169f33a2d308d56.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 397febe..25fd62f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -4349,13 +4349,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
4349 | } | 4349 | } |
4350 | } | 4350 | } |
4351 | 4351 | ||
4352 | public void UpdateGroupPosition(Vector3 pos) | 4352 | public void UpdateGroupPosition(Vector3 newPos) |
4353 | { | 4353 | { |
4354 | if ((pos.X != GroupPosition.X) || | 4354 | Vector3 oldPos = GroupPosition; |
4355 | (pos.Y != GroupPosition.Y) || | 4355 | |
4356 | (pos.Z != GroupPosition.Z)) | 4356 | if ((newPos.X != oldPos.X) || |
4357 | (newPos.Y != oldPos.Y) || | ||
4358 | (newPos.Z != oldPos.Z)) | ||
4357 | { | 4359 | { |
4358 | Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z); | ||
4359 | GroupPosition = newPos; | 4360 | GroupPosition = newPos; |
4360 | ScheduleTerseUpdate(); | 4361 | ScheduleTerseUpdate(); |
4361 | } | 4362 | } |