OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge issues

avinationmerge
Melanie 2010-10-18 20:50:16 +02:00
parent bb7a755cba
commit 78a6e5489b
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -191,7 +191,6 @@ namespace OpenSim.Region.Framework.Scenes
public UUID FromFolderID; public UUID FromFolderID;
<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
// The following two are to hold the attachment data // The following two are to hold the attachment data
// while an object is inworld // while an object is inworld
[XmlIgnore] [XmlIgnore]
@ -201,9 +200,6 @@ namespace OpenSim.Region.Framework.Scenes
public Vector3 AttachOffset = Vector3.Zero; public Vector3 AttachOffset = Vector3.Zero;
[XmlIgnore] [XmlIgnore]
=======
>>>>>>> master:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
public int STATUS_ROTATE_X; public int STATUS_ROTATE_X;
@ -633,20 +629,12 @@ namespace OpenSim.Region.Framework.Scenes
set { m_LoopSoundSlavePrims = value; } set { m_LoopSoundSlavePrims = value; }
} }
<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
=======
>>>>>>> master:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
public Byte[] TextureAnimation public Byte[] TextureAnimation
{ {
get { return m_TextureAnimation; } get { return m_TextureAnimation; }
set { m_TextureAnimation = value; } set { m_TextureAnimation = value; }
} }
<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
=======
>>>>>>> master:OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
public Byte[] ParticleSystem public Byte[] ParticleSystem
{ {
get { return m_particleSystem; } get { return m_particleSystem; }