diff options
| author | Melanie Thielker | 2014-07-20 02:27:08 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-07-20 02:27:08 +0200 |
| commit | b3068355bc5e9859cc636f7f7864d58ce9f9fe7c (patch) | |
| tree | 5b55cb98ade86a844d9a8b87d41abad88393116b /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Fix duplicate attach message being sent to objects picked up from the ground (diff) | |
| parent | replace old Attachoffset by AttachedPos. Comented out possible merge (diff) | |
| download | opensim-SC_OLD-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.zip opensim-SC_OLD-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.tar.gz opensim-SC_OLD-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.tar.bz2 opensim-SC_OLD-b3068355bc5e9859cc636f7f7864d58ce9f9fe7c.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index ce9baaa..ab1d2bd 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -251,9 +251,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 251 | public byte AttachPoint = 0; | 251 | public byte AttachPoint = 0; |
| 252 | 252 | ||
| 253 | [XmlIgnore] | 253 | [XmlIgnore] |
| 254 | public Vector3 AttachOffset = Vector3.Zero; | ||
| 255 | |||
| 256 | [XmlIgnore] | ||
| 257 | public Quaternion AttachRotation = Quaternion.Identity; | 254 | public Quaternion AttachRotation = Quaternion.Identity; |
| 258 | 255 | ||
| 259 | [XmlIgnore] | 256 | [XmlIgnore] |