diff options
author | UbitUmarov | 2016-12-04 23:39:15 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-04 23:39:15 +0000 |
commit | 1680425f4d3ddd1c59d99daee23180d985f24d86 (patch) | |
tree | 56c22c5773ec4663840b1dee0002c9f8dc9d5133 /OpenSim/Region/Framework/Scenes/Serialization | |
parent | update httpserver (diff) | |
parent | HG: fix the never ending avatar confirmation when 2 users from same grid made... (diff) | |
download | opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.zip opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.gz opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.bz2 opensim-SC-1680425f4d3ddd1c59d99daee23180d985f24d86.tar.xz |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 9 |
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()); |