diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 7ec3697..0321515 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -191,7 +191,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
191 | 191 | ||
192 | public UUID FromFolderID; | 192 | public UUID FromFolderID; |
193 | 193 | ||
194 | <<<<<<< HEAD:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||
195 | // The following two are to hold the attachment data | 194 | // The following two are to hold the attachment data |
196 | // while an object is inworld | 195 | // while an object is inworld |
197 | [XmlIgnore] | 196 | [XmlIgnore] |
@@ -201,9 +200,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
201 | public Vector3 AttachOffset = Vector3.Zero; | 200 | public Vector3 AttachOffset = Vector3.Zero; |
202 | 201 | ||
203 | [XmlIgnore] | 202 | [XmlIgnore] |
204 | ======= | ||
205 | |||
206 | >>>>>>> master:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||
207 | public int STATUS_ROTATE_X; | 203 | public int STATUS_ROTATE_X; |
208 | 204 | ||
209 | 205 | ||
@@ -633,20 +629,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
633 | set { m_LoopSoundSlavePrims = value; } | 629 | set { m_LoopSoundSlavePrims = value; } |
634 | } | 630 | } |
635 | 631 | ||
636 | <<<<<<< HEAD:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||
637 | ======= | ||
638 | |||
639 | >>>>>>> master:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||
640 | public Byte[] TextureAnimation | 632 | public Byte[] TextureAnimation |
641 | { | 633 | { |
642 | get { return m_TextureAnimation; } | 634 | get { return m_TextureAnimation; } |
643 | set { m_TextureAnimation = value; } | 635 | set { m_TextureAnimation = value; } |
644 | } | 636 | } |
645 | 637 | ||
646 | <<<<<<< HEAD:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||
647 | ======= | ||
648 | |||
649 | >>>>>>> master:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||
650 | public Byte[] ParticleSystem | 638 | public Byte[] ParticleSystem |
651 | { | 639 | { |
652 | get { return m_particleSystem; } | 640 | get { return m_particleSystem; } |