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

SOP to xml: don't waste space with some unset optional parameters.

master
UbitUmarov 2020-05-26 12:48:08 +01:00
parent d460a3fc86
commit 0a48da85a3
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,20 +87,20 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
if(data[len -1 ] == 0) if(data[len -1 ] == 0)
--len; --len;
MemoryStream ms = new MemoryStream(data,0, len, false); XmlReaderSettings xset = new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, CloseInput = true };
using(StreamReader sr = new StreamReader(ms, Encoding.UTF8)) XmlParserContext xpc = new XmlParserContext(null, null, null, XmlSpace.None);
xpc.Encoding = Util.UTF8NoBomEncoding;
MemoryStream ms = new MemoryStream(data, 0, len, false);
using (XmlReader reader = XmlReader.Create(ms, xset, xpc))
{ {
using (XmlReader reader = XmlReader.Create(ms, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment })) try
{ {
try return FromOriginalXmlFormat(reader);
{ }
return FromOriginalXmlFormat(reader); catch (Exception e)
} {
catch (Exception e) m_log.Error("[SERIALIZER]: Deserialization of xml data failed ", e);
{ return null;
m_log.Error("[SERIALIZER]: Deserialization of xml data failed ", e);
return null;
}
} }
} }
} }
@ -1572,7 +1572,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
WriteVector(writer, "SitTargetPosition", sop.SitTargetPosition); WriteVector(writer, "SitTargetPosition", sop.SitTargetPosition);
WriteVector(writer, "SitTargetPositionLL", sop.SitTargetPositionLL); WriteVector(writer, "SitTargetPositionLL", sop.SitTargetPositionLL);
WriteQuaternion(writer, "SitTargetOrientationLL", sop.SitTargetOrientationLL); WriteQuaternion(writer, "SitTargetOrientationLL", sop.SitTargetOrientationLL);
WriteVector(writer, "StandTarget", sop.StandOffset); if(sop.StandOffset != Vector3.Zero);
WriteVector(writer, "StandTarget", sop.StandOffset);
writer.WriteElementString("ParentID", sop.ParentID.ToString()); writer.WriteElementString("ParentID", sop.ParentID.ToString());
writer.WriteElementString("CreationDate", sop.CreationDate.ToString()); writer.WriteElementString("CreationDate", sop.CreationDate.ToString());
writer.WriteElementString("Category", sop.Category.ToString()); writer.WriteElementString("Category", sop.Category.ToString());
@ -1661,8 +1662,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
if(data != null && data.Length > 0) if(data != null && data.Length > 0)
writer.WriteElementString("SOPAnims", Convert.ToBase64String(data)); writer.WriteElementString("SOPAnims", Convert.ToBase64String(data));
} }
if(Math.Abs(sop.SitActiveRange) > 1e-5)
writer.WriteElementString("SitActRange", sop.SitActiveRange.ToString(Culture.FormatProvider)); writer.WriteElementString("SitActRange", sop.SitActiveRange.ToString(Culture.FormatProvider));
writer.WriteEndElement(); writer.WriteEndElement();
} }