diff options
author | Melanie | 2012-05-02 00:29:56 +0200 |
---|---|---|
committer | Melanie | 2012-05-02 00:29:56 +0200 |
commit | 98e9f225446ade7f1650db96fb4b8d763af1730e (patch) | |
tree | a063c28f59d0bb3c4c72e9f8a3a9f2aa97004b98 /OpenSim/Region/Framework | |
parent | Fix saving of attachment positions (diff) | |
download | opensim-SC_OLD-98e9f225446ade7f1650db96fb4b8d763af1730e.zip opensim-SC_OLD-98e9f225446ade7f1650db96fb4b8d763af1730e.tar.gz opensim-SC_OLD-98e9f225446ade7f1650db96fb4b8d763af1730e.tar.bz2 opensim-SC_OLD-98e9f225446ade7f1650db96fb4b8d763af1730e.tar.xz |
Preserve attachment rotation on objects rezzed via a script. Makes toasters
work right, finally.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 1 |
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 | |||
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 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 | |||
812 | 812 | ||
813 | group.RootPart.AttachPoint = group.RootPart.Shape.State; | 813 | group.RootPart.AttachPoint = group.RootPart.Shape.State; |
814 | group.RootPart.AttachOffset = group.AbsolutePosition; | 814 | group.RootPart.AttachOffset = group.AbsolutePosition; |
815 | group.RootPart.AttachRotation = group.GroupRotation; | ||
815 | 816 | ||
816 | group.ResetIDs(); | 817 | group.ResetIDs(); |
817 | 818 | ||