Preserve attachment rotation on objects rezzed via a script. Makes toasters

work right, finally.

2 files changed, 4 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index b198ca7..b0bc188 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -197,6 +197,9 @@ namespace OpenSim.Region.Framework.Scenes
         public Vector3 AttachOffset = Vector3.Zero;
 
         [XmlIgnore]
+        public Quaternion AttachRotation = Quaternion.Identity;
+
+        [XmlIgnore]
         public int STATUS_ROTATE_X;
 
         public int STATUS_ROTATE_Y;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index a2649ee..959046a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -812,6 +812,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             group.RootPart.AttachPoint = group.RootPart.Shape.State;
             group.RootPart.AttachOffset = group.AbsolutePosition;
+            group.RootPart.AttachRotation = group.GroupRotation;
 
             group.ResetIDs();