Deleted all [XmlIgnore] from SOP, since those are meaningless now.
Diva Canto
parent
22eff055d4
commit
7038f2b406
|
|
@ -119,7 +119,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
/// <value>
|
||||
/// Is this sop a root part?
|
||||
/// </value>
|
||||
[XmlIgnore]
|
||||
|
||||
public bool IsRoot
|
||||
{
|
||||
get { return ParentGroup.RootPart == this; }
|
||||
|
|
@ -129,26 +129,26 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
public bool AllowedDrop;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public bool DIE_AT_EDGE;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public bool RETURN_AT_EDGE;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public bool BlockGrab;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public bool StatusSandbox;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public Vector3 StatusSandboxPos;
|
||||
|
||||
// TODO: This needs to be persisted in next XML version update!
|
||||
[XmlIgnore]
|
||||
|
||||
public readonly int[] PayPrice = {-2,-2,-2,-2,-2};
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public PhysicsActor PhysActor
|
||||
{
|
||||
get { return m_physActor; }
|
||||
|
|
@ -163,43 +163,43 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
// Note: This isn't persisted in the database right now, as the fields for that aren't just there yet.
|
||||
// Not a big problem as long as the script that sets it remains in the prim on startup.
|
||||
// for SL compatibility it should be persisted though (set sound / displaytext / particlesystem, kill script)
|
||||
[XmlIgnore]
|
||||
|
||||
public UUID Sound;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public byte SoundFlags;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public double SoundGain;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public double SoundRadius;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public uint TimeStampFull;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public uint TimeStampLastActivity; // Will be used for AutoReturn
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public uint TimeStampTerse;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public UUID FromItemID;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public UUID FromFolderID;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public int STATUS_ROTATE_X;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public int STATUS_ROTATE_Y;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public int STATUS_ROTATE_Z;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
private Dictionary<int, string> m_CollisionFilter = new Dictionary<int, string>();
|
||||
|
||||
/// <value>
|
||||
|
|
@ -208,68 +208,68 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
/// </value>
|
||||
private UUID m_fromUserInventoryItemID;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public UUID FromUserInventoryItemID
|
||||
{
|
||||
get { return m_fromUserInventoryItemID; }
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public bool IsAttachment;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public scriptEvents AggregateScriptEvents;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public UUID AttachedAvatar;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public Vector3 AttachedPos;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public uint AttachmentPoint;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public Vector3 RotationAxis = Vector3.One;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public bool VolumeDetectActive; // XmlIgnore set to avoid problems with persistance until I come to care for this
|
||||
// Certainly this must be a persistant setting finally
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public bool IsWaitingForFirstSpinUpdatePacket;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public Quaternion SpinOldOrientation = Quaternion.Identity;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public Quaternion m_APIDTarget = Quaternion.Identity;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public float m_APIDDamp = 0;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public float m_APIDStrength = 0;
|
||||
|
||||
/// <summary>
|
||||
/// This part's inventory
|
||||
/// </summary>
|
||||
[XmlIgnore]
|
||||
|
||||
public IEntityInventory Inventory
|
||||
{
|
||||
get { return m_inventory; }
|
||||
}
|
||||
protected SceneObjectPartInventory m_inventory;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public bool Undoing;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public bool IgnoreUndoUpdate = false;
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
private PrimFlags LocalFlags;
|
||||
[XmlIgnore]
|
||||
|
||||
private float m_damage = -1.0f;
|
||||
private byte[] m_TextureAnimation;
|
||||
private byte m_clickAction;
|
||||
|
|
@ -277,9 +277,9 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
private string m_description = String.Empty;
|
||||
private readonly List<uint> m_lastColliders = new List<uint>();
|
||||
private int m_linkNum;
|
||||
[XmlIgnore]
|
||||
|
||||
private int m_scriptAccessPin;
|
||||
[XmlIgnore]
|
||||
|
||||
private readonly Dictionary<UUID, scriptEvents> m_scriptEvents = new Dictionary<UUID, scriptEvents>();
|
||||
private string m_sitName = String.Empty;
|
||||
private Quaternion m_sitTargetOrientation = Quaternion.Identity;
|
||||
|
|
@ -545,7 +545,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public Dictionary<int, string> CollisionFilter
|
||||
{
|
||||
get { return m_CollisionFilter; }
|
||||
|
|
@ -555,21 +555,21 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public Quaternion APIDTarget
|
||||
{
|
||||
get { return m_APIDTarget; }
|
||||
set { m_APIDTarget = value; }
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public float APIDDamp
|
||||
{
|
||||
get { return m_APIDDamp; }
|
||||
set { m_APIDDamp = value; }
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public float APIDStrength
|
||||
{
|
||||
get { return m_APIDStrength; }
|
||||
|
|
@ -615,35 +615,35 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
set { m_LoopSoundSlavePrims = value; }
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public Byte[] TextureAnimation
|
||||
{
|
||||
get { return m_TextureAnimation; }
|
||||
set { m_TextureAnimation = value; }
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public Byte[] ParticleSystem
|
||||
{
|
||||
get { return m_particleSystem; }
|
||||
set { m_particleSystem = value; }
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public DateTime Expires
|
||||
{
|
||||
get { return m_expires; }
|
||||
set { m_expires = value; }
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public DateTime Rezzed
|
||||
{
|
||||
get { return m_rezzed; }
|
||||
set { m_rezzed = value; }
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public float Damage
|
||||
{
|
||||
get { return m_damage; }
|
||||
|
|
@ -1016,7 +1016,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public bool CreateSelected
|
||||
{
|
||||
get { return m_createSelected; }
|
||||
|
|
@ -1198,14 +1198,14 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public UUID SitTargetAvatar
|
||||
{
|
||||
get { return m_sitTargetAvatar; }
|
||||
set { m_sitTargetAvatar = value; }
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public virtual UUID RegionID
|
||||
{
|
||||
get
|
||||
|
|
@ -1219,7 +1219,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
|
||||
private UUID _parentUUID = UUID.Zero;
|
||||
[XmlIgnore]
|
||||
|
||||
public UUID ParentUUID
|
||||
{
|
||||
get
|
||||
|
|
@ -1233,7 +1233,7 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
set { _parentUUID = value; }
|
||||
}
|
||||
|
||||
[XmlIgnore]
|
||||
|
||||
public string SitAnimation
|
||||
{
|
||||
get { return m_sitAnimation; }
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
|
|||
|
||||
writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty);
|
||||
writer.WriteStartElement(String.Empty, "RootPart", String.Empty);
|
||||
ToOriginalXmlFormat(sceneObject.RootPart, writer);
|
||||
ToXmlFormat(sceneObject.RootPart, writer);
|
||||
writer.WriteEndElement();
|
||||
writer.WriteStartElement(String.Empty, "OtherParts", String.Empty);
|
||||
|
||||
|
|
@ -160,7 +160,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
|
|||
if (part.UUID != sceneObject.RootPart.UUID)
|
||||
{
|
||||
writer.WriteStartElement(String.Empty, "Part", String.Empty);
|
||||
ToOriginalXmlFormat(part, writer);
|
||||
ToXmlFormat(part, writer);
|
||||
writer.WriteEndElement();
|
||||
}
|
||||
}
|
||||
|
|
@ -172,7 +172,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
|
|||
//m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0}, {1}ms", Name, System.Environment.TickCount - time);
|
||||
}
|
||||
|
||||
protected static void ToOriginalXmlFormat(SceneObjectPart part, XmlTextWriter writer)
|
||||
protected static void ToXmlFormat(SceneObjectPart part, XmlTextWriter writer)
|
||||
{
|
||||
SOPToXml2(writer, part, new Dictionary<string, object>());
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue