diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-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 e06a222..11dad6c 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -346,6 +346,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
346 | m_SOPXmlProcessors.Add("PayPrice2", ProcessPayPrice2); | 346 | m_SOPXmlProcessors.Add("PayPrice2", ProcessPayPrice2); |
347 | m_SOPXmlProcessors.Add("PayPrice3", ProcessPayPrice3); | 347 | m_SOPXmlProcessors.Add("PayPrice3", ProcessPayPrice3); |
348 | m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4); | 348 | m_SOPXmlProcessors.Add("PayPrice4", ProcessPayPrice4); |
349 | |||
350 | m_SOPXmlProcessors.Add("Buoyancy", ProcessBuoyancy); | ||
349 | #endregion | 351 | #endregion |
350 | 352 | ||
351 | #region TaskInventoryXmlProcessors initialization | 353 | #region TaskInventoryXmlProcessors initialization |
@@ -735,6 +737,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
735 | obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty); | 737 | obj.PayPrice[4] = (int)reader.ReadElementContentAsInt("PayPrice4", String.Empty); |
736 | } | 738 | } |
737 | 739 | ||
740 | private static void ProcessBuoyancy(SceneObjectPart obj, XmlTextReader reader) | ||
741 | { | ||
742 | obj.Buoyancy = (int)reader.ReadElementContentAsFloat("Buoyancy", String.Empty); | ||
743 | } | ||
744 | |||
738 | #endregion | 745 | #endregion |
739 | 746 | ||
740 | #region TaskInventoryXmlProcessors | 747 | #region TaskInventoryXmlProcessors |
@@ -1219,6 +1226,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1219 | writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString()); | 1226 | writer.WriteElementString("PayPrice3", sop.PayPrice[3].ToString()); |
1220 | writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString()); | 1227 | writer.WriteElementString("PayPrice4", sop.PayPrice[4].ToString()); |
1221 | 1228 | ||
1229 | writer.WriteElementString("Buoyancy", sop.Buoyancy.ToString()); | ||
1230 | |||
1222 | writer.WriteEndElement(); | 1231 | writer.WriteEndElement(); |
1223 | } | 1232 | } |
1224 | 1233 | ||
@@ -1503,12 +1512,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1503 | { | 1512 | { |
1504 | TaskInventoryDictionary tinv = new TaskInventoryDictionary(); | 1513 | TaskInventoryDictionary tinv = new TaskInventoryDictionary(); |
1505 | 1514 | ||
1506 | if (reader.IsEmptyElement) | ||
1507 | { | ||
1508 | reader.Read(); | ||
1509 | return tinv; | ||
1510 | } | ||
1511 | |||
1512 | reader.ReadStartElement(name, String.Empty); | 1515 | reader.ReadStartElement(name, String.Empty); |
1513 | 1516 | ||
1514 | while (reader.Name == "TaskInventoryItem") | 1517 | while (reader.Name == "TaskInventoryItem") |
@@ -1551,12 +1554,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1551 | 1554 | ||
1552 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); | 1555 | PrimitiveBaseShape shape = new PrimitiveBaseShape(); |
1553 | 1556 | ||
1554 | if (reader.IsEmptyElement) | ||
1555 | { | ||
1556 | reader.Read(); | ||
1557 | return shape; | ||
1558 | } | ||
1559 | |||
1560 | reader.ReadStartElement(name, String.Empty); // Shape | 1557 | reader.ReadStartElement(name, String.Empty); // Shape |
1561 | 1558 | ||
1562 | string nodeName = string.Empty; | 1559 | string nodeName = string.Empty; |
@@ -1596,4 +1593,4 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1596 | 1593 | ||
1597 | #endregion | 1594 | #endregion |
1598 | } | 1595 | } |
1599 | } | 1596 | } \ No newline at end of file |