diff options
author | Melanie | 2011-12-09 20:55:48 +0100 |
---|---|---|
committer | Melanie | 2011-12-09 20:55:48 +0100 |
commit | 00b36eb0fedc8de0d3a3ce9461828970fbd50fd8 (patch) | |
tree | 4c352163bbb115fc5b8f7073014104f5aac92c31 /OpenSim | |
parent | Set adaptive throttles false by default because it doesn't play nice with AVN (diff) | |
download | opensim-SC-00b36eb0fedc8de0d3a3ce9461828970fbd50fd8.zip opensim-SC-00b36eb0fedc8de0d3a3ce9461828970fbd50fd8.tar.gz opensim-SC-00b36eb0fedc8de0d3a3ce9461828970fbd50fd8.tar.bz2 opensim-SC-00b36eb0fedc8de0d3a3ce9461828970fbd50fd8.tar.xz |
Restore the Avination way of position and angle calculation so resizers
work again.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 0e48515..428fe1c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -682,7 +682,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
682 | { | 682 | { |
683 | // If this is a linkset, we don't want the physics engine mucking up our group position here. | 683 | // If this is a linkset, we don't want the physics engine mucking up our group position here. |
684 | PhysicsActor actor = PhysActor; | 684 | PhysicsActor actor = PhysActor; |
685 | if (actor != null && ParentID == 0) | 685 | if (ParentID == 0) |
686 | { | 686 | { |
687 | if (actor != null) | 687 | if (actor != null) |
688 | m_groupPosition = actor.Position; | 688 | m_groupPosition = actor.Position; |
@@ -1080,10 +1080,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1080 | { | 1080 | { |
1081 | get | 1081 | get |
1082 | { | 1082 | { |
1083 | if (ParentGroup.IsAttachment) | 1083 | return GroupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset); |
1084 | return GroupPosition; | ||
1085 | |||
1086 | return m_offsetPosition + m_groupPosition; | ||
1087 | } | 1084 | } |
1088 | } | 1085 | } |
1089 | 1086 | ||