diff options
| author | Melanie | 2010-07-14 23:03:59 +0100 |
|---|---|---|
| committer | Melanie | 2010-07-14 23:03:59 +0100 |
| commit | 0dd2496a56096cec97bcc4e0ed5b58e4bad512d7 (patch) | |
| tree | 6a0b10c9f4341b5be07fb3e99676acf747a2bcd5 /OpenSim/Region/Framework/Scenes | |
| parent | Detach attachments displaced by other attachments (diff) | |
| parent | Preserve attachment data while a prim is in world. Allows attachment (diff) | |
| download | opensim-SC-0dd2496a56096cec97bcc4e0ed5b58e4bad512d7.zip opensim-SC-0dd2496a56096cec97bcc4e0ed5b58e4bad512d7.tar.gz opensim-SC-0dd2496a56096cec97bcc4e0ed5b58e4bad512d7.tar.bz2 opensim-SC-0dd2496a56096cec97bcc4e0ed5b58e4bad512d7.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index f8ae321..87b2d74 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -182,6 +182,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 182 | [XmlIgnore] | 182 | [XmlIgnore] |
| 183 | public UUID FromFolderID; | 183 | public UUID FromFolderID; |
| 184 | 184 | ||
| 185 | // The following two are to hold the attachment data | ||
| 186 | // while an object is inworld | ||
| 187 | [XmlIgnore] | ||
| 188 | public byte AttachPoint = 0; | ||
| 189 | |||
| 190 | [XmlIgnore] | ||
| 191 | public Vector3 AttachOffset = Vector3.Zero; | ||
| 192 | |||
| 185 | [XmlIgnore] | 193 | [XmlIgnore] |
| 186 | public int STATUS_ROTATE_X; | 194 | public int STATUS_ROTATE_X; |
| 187 | 195 | ||