OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better skipping of "SculptData" when parsing XML

0.8.0.3
Oren Hurvitz 2014-03-28 12:52:06 +03:00
parent f360b687d6
commit 1fe504fee5
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -507,7 +507,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
m_ShapeXmlProcessors.Add("HollowShape", ProcessShpHollowShape); m_ShapeXmlProcessors.Add("HollowShape", ProcessShpHollowShape);
m_ShapeXmlProcessors.Add("SculptTexture", ProcessShpSculptTexture); m_ShapeXmlProcessors.Add("SculptTexture", ProcessShpSculptTexture);
m_ShapeXmlProcessors.Add("SculptType", ProcessShpSculptType); m_ShapeXmlProcessors.Add("SculptType", ProcessShpSculptType);
m_ShapeXmlProcessors.Add("SculptData", ProcessShpSculptData); // Ignore "SculptData"; this element is deprecated
m_ShapeXmlProcessors.Add("FlexiSoftness", ProcessShpFlexiSoftness); m_ShapeXmlProcessors.Add("FlexiSoftness", ProcessShpFlexiSoftness);
m_ShapeXmlProcessors.Add("FlexiTension", ProcessShpFlexiTension); m_ShapeXmlProcessors.Add("FlexiTension", ProcessShpFlexiTension);
m_ShapeXmlProcessors.Add("FlexiDrag", ProcessShpFlexiDrag); m_ShapeXmlProcessors.Add("FlexiDrag", ProcessShpFlexiDrag);
@ -1142,12 +1142,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
shp.SculptType = (byte)reader.ReadElementContentAsInt("SculptType", String.Empty); 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) private static void ProcessShpFlexiSoftness(PrimitiveBaseShape shp, XmlTextReader reader)
{ {
shp.FlexiSoftness = reader.ReadElementContentAsInt("FlexiSoftness", String.Empty); shp.FlexiSoftness = reader.ReadElementContentAsInt("FlexiSoftness", String.Empty);