diff options
| author | Melanie | 2012-05-02 00:32:28 +0200 |
|---|---|---|
| committer | Melanie | 2012-05-02 00:32:28 +0200 |
| commit | e6e12c2d426355b40e40663b0868081ea8db16c8 (patch) | |
| tree | 17bbf20252dabe02bc5d325ca4f0cf30d9aaa04f /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Preserve attachment rotation on objects rezzed via a script. Makes toasters (diff) | |
| download | opensim-SC-e6e12c2d426355b40e40663b0868081ea8db16c8.zip opensim-SC-e6e12c2d426355b40e40663b0868081ea8db16c8.tar.gz opensim-SC-e6e12c2d426355b40e40663b0868081ea8db16c8.tar.bz2 opensim-SC-e6e12c2d426355b40e40663b0868081ea8db16c8.tar.xz | |
Merge branch 'avination'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 |
1 files changed, 3 insertions, 0 deletions
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; |