From 6362df1202aa1b44dc576128bcd6afd597046792 Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 5 Dec 2011 19:33:25 +0100 Subject: [PATCH] Serialize the Volume Detect field --- OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 +-- .../Scenes/Serialization/SceneObjectSerializer.cs | 9 ++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index dbf29d07e6..3bce3c0504 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -220,8 +220,7 @@ namespace OpenSim.Region.Framework.Scenes public Vector3 RotationAxis = Vector3.One; - 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 + public bool VolumeDetectActive; public bool IsWaitingForFirstSpinUpdatePacket; diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 680a6fabfb..5f2f7d8119 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs @@ -347,6 +347,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4); m_SOPXmlProcessors.Add("Buoyancy", ProcessBuoyancy); + m_SOPXmlProcessors.Add("VolumeDetectActive", ProcessVolumeDetectActive); #endregion #region TaskInventoryXmlProcessors initialization @@ -736,6 +737,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization obj.Buoyancy = (int)reader.ReadElementContentAsFloat("Buoyancy", String.Empty); } + private static void ProcessVolumeDetectActive(SceneObjectPart obj, XmlTextReader reader) + { + obj.VolumeDetectActive = Util.ReadBoolean(reader); + } + #endregion #region TaskInventoryXmlProcessors @@ -1220,6 +1226,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString()); writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString()); + writer.WriteElementString("VolumeDetectActive", sop.VolumeDetectActive.ToString().ToLower()); writer.WriteEndElement(); } @@ -1586,4 +1593,4 @@ namespace OpenSim.Region.Framework.Scenes.Serialization #endregion } -} \ No newline at end of file +}