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

serialize the new variables

master
UbitUmarov 2020-01-22 22:01:05 +00:00
parent 33eabf1069
commit 2a38210fe9
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -445,6 +445,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
m_SOPXmlProcessors.Add("SitTargetPosition", ProcessSitTargetPosition); m_SOPXmlProcessors.Add("SitTargetPosition", ProcessSitTargetPosition);
m_SOPXmlProcessors.Add("SitTargetPositionLL", ProcessSitTargetPositionLL); m_SOPXmlProcessors.Add("SitTargetPositionLL", ProcessSitTargetPositionLL);
m_SOPXmlProcessors.Add("SitTargetOrientationLL", ProcessSitTargetOrientationLL); m_SOPXmlProcessors.Add("SitTargetOrientationLL", ProcessSitTargetOrientationLL);
m_SOPXmlProcessors.Add("StandTarget", ProcessStandTarget);
m_SOPXmlProcessors.Add("ParentID", ProcessParentID); m_SOPXmlProcessors.Add("ParentID", ProcessParentID);
m_SOPXmlProcessors.Add("CreationDate", ProcessCreationDate); m_SOPXmlProcessors.Add("CreationDate", ProcessCreationDate);
m_SOPXmlProcessors.Add("Category", ProcessCategory); m_SOPXmlProcessors.Add("Category", ProcessCategory);
@ -500,6 +501,8 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
m_SOPXmlProcessors.Add("SOPAnims", ProcessSOPAnims); m_SOPXmlProcessors.Add("SOPAnims", ProcessSOPAnims);
m_SOPXmlProcessors.Add("SitActRange", ProcessSitActRange);
#endregion #endregion
#region TaskInventoryXmlProcessors initialization #region TaskInventoryXmlProcessors initialization
@ -793,6 +796,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
obj.SoundQueueing = Util.ReadBoolean(reader); obj.SoundQueueing = Util.ReadBoolean(reader);
} }
private static void ProcessSitActRange(SceneObjectPart obj, XmlReader reader)
{
obj.SitActiveRange = reader.ReadElementContentAsFloat("SitActRange", String.Empty);
}
private static void ProcessVehicle(SceneObjectPart obj, XmlReader reader) private static void ProcessVehicle(SceneObjectPart obj, XmlReader reader)
{ {
SOPVehicle vehicle = SOPVehicle.FromXml2(reader); SOPVehicle vehicle = SOPVehicle.FromXml2(reader);
@ -886,6 +894,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
obj.SitTargetOrientationLL = Util.ReadQuaternion(reader, "SitTargetOrientationLL"); obj.SitTargetOrientationLL = Util.ReadQuaternion(reader, "SitTargetOrientationLL");
} }
private static void ProcessStandTarget(SceneObjectPart obj, XmlReader reader)
{
obj.StandOffset = Util.ReadVector(reader, "StandTarget");
}
private static void ProcessParentID(SceneObjectPart obj, XmlReader reader) private static void ProcessParentID(SceneObjectPart obj, XmlReader reader)
{ {
string str = reader.ReadElementContentAsString("ParentID", String.Empty); string str = reader.ReadElementContentAsString("ParentID", String.Empty);
@ -1533,6 +1546,7 @@ 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);
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());
@ -1622,6 +1636,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
writer.WriteElementString("SOPAnims", Convert.ToBase64String(data)); writer.WriteElementString("SOPAnims", Convert.ToBase64String(data));
} }
writer.WriteElementString("SitActRange", sop.SitActiveRange.ToString(Culture.FormatProvider));
writer.WriteEndElement(); writer.WriteEndElement();
} }