diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index b5e1a52..f1657d9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -3722,7 +3722,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3722 | } | 3722 | } |
3723 | if ((change & ObjectChangeType.Position) != 0) | 3723 | if ((change & ObjectChangeType.Position) != 0) |
3724 | { | 3724 | { |
3725 | group.AbsolutePosition = data.position; | 3725 | UpdateGroupPosition(data.position); |
3726 | updateType = updatetype.groupterse; | 3726 | updateType = updatetype.groupterse; |
3727 | } | 3727 | } |
3728 | else | 3728 | else |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index ffb86f3..843c426 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -197,6 +197,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
197 | public Vector3 AttachOffset = Vector3.Zero; | 197 | public Vector3 AttachOffset = Vector3.Zero; |
198 | 198 | ||
199 | [XmlIgnore] | 199 | [XmlIgnore] |
200 | public Quaternion AttachRotation = Quaternion.Identity; | ||
201 | |||
202 | [XmlIgnore] | ||
200 | public int STATUS_ROTATE_X; | 203 | public int STATUS_ROTATE_X; |
201 | 204 | ||
202 | public int STATUS_ROTATE_Y; | 205 | public int STATUS_ROTATE_Y; |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 36cb09a..a190efe 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -801,6 +801,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
801 | 801 | ||
802 | group.RootPart.AttachPoint = group.RootPart.Shape.State; | 802 | group.RootPart.AttachPoint = group.RootPart.Shape.State; |
803 | group.RootPart.AttachOffset = group.AbsolutePosition; | 803 | group.RootPart.AttachOffset = group.AbsolutePosition; |
804 | group.RootPart.AttachRotation = group.GroupRotation; | ||
804 | 805 | ||
805 | group.ResetIDs(); | 806 | group.ResetIDs(); |
806 | 807 | ||