When saving an OAR in "Publish" mode, also discard Group information

2 files changed, 12 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index e08a42d..b31257d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -585,7 +585,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             ld.GlobalID = landID;
 
             string ldPath = ArchiveConstants.CreateOarLandDataPath(ld);
-            tar.WriteFile(ldPath, LandDataSerializer.Serialize(ld, null));
+            Dictionary<string, object> options = new Dictionary<string, object>();
+            tar.WriteFile(ldPath, LandDataSerializer.Serialize(ld, options));
             tar.Close();
 
             oarStream = new MemoryStream(oarStream.ToArray());
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 85650d6..e68f954 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1343,7 +1343,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             writer.WriteElementString("SalePrice", sop.SalePrice.ToString());
             writer.WriteElementString("ObjectSaleType", sop.ObjectSaleType.ToString());
             writer.WriteElementString("OwnershipCost", sop.OwnershipCost.ToString());
-            WriteUUID(writer, "GroupID", sop.GroupID, options);
+
+            UUID groupID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.GroupID;
+            WriteUUID(writer, "GroupID", groupID, options);
 
             UUID ownerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.OwnerID;
             WriteUUID(writer, "OwnerID", ownerID, options);
@@ -1469,7 +1471,10 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     writer.WriteElementString("Description", item.Description);
                     writer.WriteElementString("EveryonePermissions", item.EveryonePermissions.ToString());
                     writer.WriteElementString("Flags", item.Flags.ToString());
-                    WriteUUID(writer, "GroupID", item.GroupID, options);
+
+                    UUID groupID = options.ContainsKey("wipe-owners") ? UUID.Zero : item.GroupID;
+                    WriteUUID(writer, "GroupID", groupID, options);
+
                     writer.WriteElementString("GroupPermissions", item.GroupPermissions.ToString());
                     writer.WriteElementString("InvType", item.InvType.ToString());
                     WriteUUID(writer, "ItemID", item.ItemID, options);
@@ -1490,7 +1495,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     WriteUUID(writer, "PermsGranter", item.PermsGranter, options);
                     writer.WriteElementString("PermsMask", item.PermsMask.ToString());
                     writer.WriteElementString("Type", item.Type.ToString());
-                    writer.WriteElementString("OwnerChanged", item.OwnerChanged.ToString().ToLower());
+
+                    bool ownerChanged = options.ContainsKey("wipe-owners") ? false : item.OwnerChanged;
+                    writer.WriteElementString("OwnerChanged", ownerChanged.ToString().ToLower());
 
                     writer.WriteEndElement(); // TaskInventoryItem
                 }