aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Serialization
diff options
context:
space:
mode:
authorMandarinka Tasty2016-12-04 07:10:13 +0100
committerUbitUmarov2016-12-04 17:18:56 +0000
commit7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9 (patch)
treeb065a6dc4641b3d0ff1b805fdcb76bd4a2248518 /OpenSim/Region/Framework/Scenes/Serialization
parenta few changes to new GetDisplaynames and friends (diff)
downloadopensim-SC-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.zip
opensim-SC-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.gz
opensim-SC-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.bz2
opensim-SC-7c566dca5a41cd3a9cb0336b00bdf7d63e24d2e9.tar.xz
The new Constant: integer OBJECT_REZZER_KEY = 32;
Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 7d3a168..0b7379b 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -428,6 +428,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
428 m_SOPXmlProcessors.Add("GroupID", ProcessGroupID); 428 m_SOPXmlProcessors.Add("GroupID", ProcessGroupID);
429 m_SOPXmlProcessors.Add("OwnerID", ProcessOwnerID); 429 m_SOPXmlProcessors.Add("OwnerID", ProcessOwnerID);
430 m_SOPXmlProcessors.Add("LastOwnerID", ProcessLastOwnerID); 430 m_SOPXmlProcessors.Add("LastOwnerID", ProcessLastOwnerID);
431 m_SOPXmlProcessors.Add("RezzerID", ProcessRezzerID);
431 m_SOPXmlProcessors.Add("BaseMask", ProcessBaseMask); 432 m_SOPXmlProcessors.Add("BaseMask", ProcessBaseMask);
432 m_SOPXmlProcessors.Add("OwnerMask", ProcessOwnerMask); 433 m_SOPXmlProcessors.Add("OwnerMask", ProcessOwnerMask);
433 m_SOPXmlProcessors.Add("GroupMask", ProcessGroupMask); 434 m_SOPXmlProcessors.Add("GroupMask", ProcessGroupMask);
@@ -864,6 +865,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
864 obj.LastOwnerID = Util.ReadUUID(reader, "LastOwnerID"); 865 obj.LastOwnerID = Util.ReadUUID(reader, "LastOwnerID");
865 } 866 }
866 867
868 private static void ProcessRezzerID(SceneObjectPart obj, XmlReader reader)
869 {
870 obj.RezzerID = Util.ReadUUID(reader, "RezzerID");
871 }
872
867 private static void ProcessBaseMask(SceneObjectPart obj, XmlReader reader) 873 private static void ProcessBaseMask(SceneObjectPart obj, XmlReader reader)
868 { 874 {
869 obj.BaseMask = (uint)reader.ReadElementContentAsInt("BaseMask", String.Empty); 875 obj.BaseMask = (uint)reader.ReadElementContentAsInt("BaseMask", String.Empty);
@@ -1452,6 +1458,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1452 UUID lastOwnerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.LastOwnerID; 1458 UUID lastOwnerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.LastOwnerID;
1453 WriteUUID(writer, "LastOwnerID", lastOwnerID, options); 1459 WriteUUID(writer, "LastOwnerID", lastOwnerID, options);
1454 1460
1461 UUID rezzerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.RezzerID;
1462 WriteUUID(writer, "RezzerID", rezzerID, options);
1463
1455 writer.WriteElementString("BaseMask", sop.BaseMask.ToString()); 1464 writer.WriteElementString("BaseMask", sop.BaseMask.ToString());
1456 writer.WriteElementString("OwnerMask", sop.OwnerMask.ToString()); 1465 writer.WriteElementString("OwnerMask", sop.OwnerMask.ToString());
1457 writer.WriteElementString("GroupMask", sop.GroupMask.ToString()); 1466 writer.WriteElementString("GroupMask", sop.GroupMask.ToString());