diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 60cc788..680a6fa 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -345,6 +345,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
345 | m_SOPXmlProcessors.Add("PayPrice2", ProcessPayPrice2); | 345 | m_SOPXmlProcessors.Add("PayPrice2", ProcessPayPrice2); |
346 | m_SOPXmlProcessors.Add("PayPrice3", ProcessPayPrice3); | 346 | m_SOPXmlProcessors.Add("PayPrice3", ProcessPayPrice3); |
347 | m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4); | 347 | m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4); |
348 | |||
349 | m_SOPXmlProcessors.Add("Buoyancy", ProcessBuoyancy); | ||
348 | #endregion | 350 | #endregion |
349 | 351 | ||
350 | #region TaskInventoryXmlProcessors initialization | 352 | #region TaskInventoryXmlProcessors initialization |
@@ -729,6 +731,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
729 | obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty); | 731 | obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty); |
730 | } | 732 | } |
731 | 733 | ||
734 | private static void ProcessBuoyancy(SceneObjectPart obj, XmlTextReader reader) | ||
735 | { | ||
736 | obj.Buoyancy = (int)reader.ReadElementContentAsFloat("Buoyancy", String.Empty); | ||
737 | } | ||
738 | |||
732 | #endregion | 739 | #endregion |
733 | 740 | ||
734 | #region TaskInventoryXmlProcessors | 741 | #region TaskInventoryXmlProcessors |
@@ -1212,6 +1219,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1212 | writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString()); | 1219 | writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString()); |
1213 | writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString()); | 1220 | writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString()); |
1214 | 1221 | ||
1222 | writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString()); | ||
1223 | |||
1215 | writer.WriteEndElement(); | 1224 | writer.WriteEndElement(); |
1216 | } | 1225 | } |
1217 | 1226 | ||
@@ -1496,12 +1505,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1496 | { | 1505 | { |
1497 | TaskInventoryDictionary tinv = new TaskInventoryDictionary(); | 1506 | TaskInventoryDictionary tinv = new TaskInventoryDictionary(); |
1498 | 1507 | ||
1499 | if (reader.IsEmptyElement) | ||
1500 | { | ||
1501 | reader.Read(); | ||
1502 | return tinv; | ||
1503 | } | ||
1504 | |||
1505 | reader.ReadStartElement(name, String.Empty); | 1508 | reader.ReadStartElement(name, String.Empty); |
1506 | 1509 | ||
1507 | while (reader.Name == "TaskInventoryItem") | 1510 | while (reader.Name == "TaskInventoryItem") |
@@ -1544,12 +1547,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1544 | 1547 | ||
1545 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); | 1548 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); |
1546 | 1549 | ||
1547 | if (reader.IsEmptyElement) | ||
1548 | { | ||
1549 | reader.Read(); | ||
1550 | return shape; | ||
1551 | } | ||
1552 | |||
1553 | reader.ReadStartElement(name, String.Empty); // Shape | 1550 | reader.ReadStartElement(name, String.Empty); // Shape |
1554 | 1551 | ||
1555 | string nodeName = string.Empty; | 1552 | string nodeName = string.Empty; |
@@ -1589,4 +1586,4 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1589 | 1586 | ||
1590 | #endregion | 1587 | #endregion |
1591 | } | 1588 | } |
1592 | } | 1589 | } \ No newline at end of file |