diff options
author | Oren Hurvitz | 2014-03-28 12:52:06 +0300 |
---|---|---|
committer | Oren Hurvitz | 2014-03-28 12:52:06 +0300 |
commit | 1fe504fee54bc5ff44702f38aee60dc226c78b75 (patch) | |
tree | 1d736217555306d9bd002ca099bdf625ab359143 /OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |
parent | Removed "SculptData" from the serialized XML format of prims (diff) | |
download | opensim-SC_OLD-1fe504fee54bc5ff44702f38aee60dc226c78b75.zip opensim-SC_OLD-1fe504fee54bc5ff44702f38aee60dc226c78b75.tar.gz opensim-SC_OLD-1fe504fee54bc5ff44702f38aee60dc226c78b75.tar.bz2 opensim-SC_OLD-1fe504fee54bc5ff44702f38aee60dc226c78b75.tar.xz |
Better skipping of "SculptData" when parsing XML
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index c423362..85650d6 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 | |||
507 | m_ShapeXmlProcessors.Add("HollowShape", ProcessShpHollowShape); | 507 | m_ShapeXmlProcessors.Add("HollowShape", ProcessShpHollowShape); |
508 | m_ShapeXmlProcessors.Add("SculptTexture", ProcessShpSculptTexture); | 508 | m_ShapeXmlProcessors.Add("SculptTexture", ProcessShpSculptTexture); |
509 | m_ShapeXmlProcessors.Add("SculptType", ProcessShpSculptType); | 509 | m_ShapeXmlProcessors.Add("SculptType", ProcessShpSculptType); |
510 | m_ShapeXmlProcessors.Add("SculptData", ProcessShpSculptData); | 510 | // Ignore "SculptData"; this element is deprecated |
511 | m_ShapeXmlProcessors.Add("FlexiSoftness", ProcessShpFlexiSoftness); | 511 | m_ShapeXmlProcessors.Add("FlexiSoftness", ProcessShpFlexiSoftness); |
512 | m_ShapeXmlProcessors.Add("FlexiTension", ProcessShpFlexiTension); | 512 | m_ShapeXmlProcessors.Add("FlexiTension", ProcessShpFlexiTension); |
513 | m_ShapeXmlProcessors.Add("FlexiDrag", ProcessShpFlexiDrag); | 513 | m_ShapeXmlProcessors.Add("FlexiDrag", ProcessShpFlexiDrag); |
@@ -1142,12 +1142,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1142 | shp.SculptType = (byte)reader.ReadElementContentAsInt("SculptType", String.Empty); | 1142 | shp.SculptType = (byte)reader.ReadElementContentAsInt("SculptType", String.Empty); |
1143 | } | 1143 | } |
1144 | 1144 | ||
1145 | private static void ProcessShpSculptData(PrimitiveBaseShape shp, XmlTextReader reader) | ||
1146 | { | ||
1147 | // Ignore this field. It shouldn't have been serialized. If we read it | ||
1148 | // we'll just be wasting memory. | ||
1149 | } | ||
1150 | |||
1151 | private static void ProcessShpFlexiSoftness(PrimitiveBaseShape shp, XmlTextReader reader) | 1145 | private static void ProcessShpFlexiSoftness(PrimitiveBaseShape shp, XmlTextReader reader) |
1152 | { | 1146 | { |
1153 | shp.FlexiSoftness = reader.ReadElementContentAsInt("FlexiSoftness", String.Empty); | 1147 | shp.FlexiSoftness = reader.ReadElementContentAsInt("FlexiSoftness", String.Empty); |