From 1fe504fee54bc5ff44702f38aee60dc226c78b75 Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Fri, 28 Mar 2014 12:52:06 +0300 Subject: [PATCH] Better skipping of "SculptData" when parsing XML --- .../Scenes/Serialization/SceneObjectSerializer.cs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index c42336211c..85650d6595 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs @@ -507,7 +507,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization m_ShapeXmlProcessors.Add("HollowShape", ProcessShpHollowShape); m_ShapeXmlProcessors.Add("SculptTexture", ProcessShpSculptTexture); m_ShapeXmlProcessors.Add("SculptType", ProcessShpSculptType); - m_ShapeXmlProcessors.Add("SculptData", ProcessShpSculptData); + // Ignore "SculptData"; this element is deprecated m_ShapeXmlProcessors.Add("FlexiSoftness", ProcessShpFlexiSoftness); m_ShapeXmlProcessors.Add("FlexiTension", ProcessShpFlexiTension); m_ShapeXmlProcessors.Add("FlexiDrag", ProcessShpFlexiDrag); @@ -1142,12 +1142,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization shp.SculptType = (byte)reader.ReadElementContentAsInt("SculptType", String.Empty); } - private static void ProcessShpSculptData(PrimitiveBaseShape shp, XmlTextReader reader) - { - // Ignore this field. It shouldn't have been serialized. If we read it - // we'll just be wasting memory. - } - private static void ProcessShpFlexiSoftness(PrimitiveBaseShape shp, XmlTextReader reader) { shp.FlexiSoftness = reader.ReadElementContentAsInt("FlexiSoftness", String.Empty);