aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-12-05 19:33:25 +0100
committerMelanie2011-12-05 19:33:25 +0100
commit6362df1202aa1b44dc576128bcd6afd597046792 (patch)
tree28c1eb7179e4fddc67ef3dfdacdc50d0887f8db1 /OpenSim
parentMerge branch 'master' into bigmerge (diff)
downloadopensim-SC-6362df1202aa1b44dc576128bcd6afd597046792.zip
opensim-SC-6362df1202aa1b44dc576128bcd6afd597046792.tar.gz
opensim-SC-6362df1202aa1b44dc576128bcd6afd597046792.tar.bz2
opensim-SC-6362df1202aa1b44dc576128bcd6afd597046792.tar.xz
Serialize the Volume Detect field
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs9
2 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index dbf29d0..3bce3c0 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -220,8 +220,7 @@ namespace OpenSim.Region.Framework.Scenes
220 220
221 public Vector3 RotationAxis = Vector3.One; 221 public Vector3 RotationAxis = Vector3.One;
222 222
223 public bool VolumeDetectActive; // XmlIgnore set to avoid problems with persistance until I come to care for this 223 public bool VolumeDetectActive;
224 // Certainly this must be a persistant setting finally
225 224
226 public bool IsWaitingForFirstSpinUpdatePacket; 225 public bool IsWaitingForFirstSpinUpdatePacket;
227 226
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 680a6fa..5f2f7d8 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
347 m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4); 347 m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4);
348 348
349 m_SOPXmlProcessors.Add("Buoyancy", ProcessBuoyancy); 349 m_SOPXmlProcessors.Add("Buoyancy", ProcessBuoyancy);
350 m_SOPXmlProcessors.Add("VolumeDetectActive", ProcessVolumeDetectActive);
350 #endregion 351 #endregion
351 352
352 #region TaskInventoryXmlProcessors initialization 353 #region TaskInventoryXmlProcessors initialization
@@ -736,6 +737,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
736 obj.Buoyancy = (int)reader.ReadElementContentAsFloat("Buoyancy", String.Empty); 737 obj.Buoyancy = (int)reader.ReadElementContentAsFloat("Buoyancy", String.Empty);
737 } 738 }
738 739
740 private static void ProcessVolumeDetectActive(SceneObjectPart obj, XmlTextReader reader)
741 {
742 obj.VolumeDetectActive = Util.ReadBoolean(reader);
743 }
744
739 #endregion 745 #endregion
740 746
741 #region TaskInventoryXmlProcessors 747 #region TaskInventoryXmlProcessors
@@ -1220,6 +1226,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1220 writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString()); 1226 writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString());
1221 1227
1222 writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString()); 1228 writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString());
1229 writer.WriteElementString("VolumeDetectActive", sop.VolumeDetectActive.ToString().ToLower());
1223 1230
1224 writer.WriteEndElement(); 1231 writer.WriteEndElement();
1225 } 1232 }
@@ -1586,4 +1593,4 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1586 1593
1587 #endregion 1594 #endregion
1588 } 1595 }
1589} \ No newline at end of file 1596}