aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorOren Hurvitz2014-05-26 15:19:20 +0300
committerOren Hurvitz2014-05-26 15:33:13 +0100
commit33cc847c4ac78b890f8ac175c479ab1b1c56cbbf (patch)
tree81030a1fbc63fd8413943ccaa7c0c06331f6532a /OpenSim/Region/Framework
parentPrevent login to a region if the Telehub or Landing Point are in a banned parcel (diff)
downloadopensim-SC_OLD-33cc847c4ac78b890f8ac175c479ab1b1c56cbbf.zip
opensim-SC_OLD-33cc847c4ac78b890f8ac175c479ab1b1c56cbbf.tar.gz
opensim-SC_OLD-33cc847c4ac78b890f8ac175c479ab1b1c56cbbf.tar.bz2
opensim-SC_OLD-33cc847c4ac78b890f8ac175c479ab1b1c56cbbf.tar.xz
When saving an OAR in "Publish" mode, also discard Group information
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs13
1 files changed, 10 insertions, 3 deletions
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
1343 writer.WriteElementString("SalePrice", sop.SalePrice.ToString()); 1343 writer.WriteElementString("SalePrice", sop.SalePrice.ToString());
1344 writer.WriteElementString("ObjectSaleType", sop.ObjectSaleType.ToString()); 1344 writer.WriteElementString("ObjectSaleType", sop.ObjectSaleType.ToString());
1345 writer.WriteElementString("OwnershipCost", sop.OwnershipCost.ToString()); 1345 writer.WriteElementString("OwnershipCost", sop.OwnershipCost.ToString());
1346 WriteUUID(writer, "GroupID", sop.GroupID, options); 1346
1347 UUID groupID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.GroupID;
1348 WriteUUID(writer, "GroupID", groupID, options);
1347 1349
1348 UUID ownerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.OwnerID; 1350 UUID ownerID = options.ContainsKey("wipe-owners") ? UUID.Zero : sop.OwnerID;
1349 WriteUUID(writer, "OwnerID", ownerID, options); 1351 WriteUUID(writer, "OwnerID", ownerID, options);
@@ -1469,7 +1471,10 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1469 writer.WriteElementString("Description", item.Description); 1471 writer.WriteElementString("Description", item.Description);
1470 writer.WriteElementString("EveryonePermissions", item.EveryonePermissions.ToString()); 1472 writer.WriteElementString("EveryonePermissions", item.EveryonePermissions.ToString());
1471 writer.WriteElementString("Flags", item.Flags.ToString()); 1473 writer.WriteElementString("Flags", item.Flags.ToString());
1472 WriteUUID(writer, "GroupID", item.GroupID, options); 1474
1475 UUID groupID = options.ContainsKey("wipe-owners") ? UUID.Zero : item.GroupID;
1476 WriteUUID(writer, "GroupID", groupID, options);
1477
1473 writer.WriteElementString("GroupPermissions", item.GroupPermissions.ToString()); 1478 writer.WriteElementString("GroupPermissions", item.GroupPermissions.ToString());
1474 writer.WriteElementString("InvType", item.InvType.ToString()); 1479 writer.WriteElementString("InvType", item.InvType.ToString());
1475 WriteUUID(writer, "ItemID", item.ItemID, options); 1480 WriteUUID(writer, "ItemID", item.ItemID, options);
@@ -1490,7 +1495,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1490 WriteUUID(writer, "PermsGranter", item.PermsGranter, options); 1495 WriteUUID(writer, "PermsGranter", item.PermsGranter, options);
1491 writer.WriteElementString("PermsMask", item.PermsMask.ToString()); 1496 writer.WriteElementString("PermsMask", item.PermsMask.ToString());
1492 writer.WriteElementString("Type", item.Type.ToString()); 1497 writer.WriteElementString("Type", item.Type.ToString());
1493 writer.WriteElementString("OwnerChanged", item.OwnerChanged.ToString().ToLower()); 1498
1499 bool ownerChanged = options.ContainsKey("wipe-owners") ? false : item.OwnerChanged;
1500 writer.WriteElementString("OwnerChanged", ownerChanged.ToString().ToLower());
1494 1501
1495 writer.WriteEndElement(); // TaskInventoryItem 1502 writer.WriteEndElement(); // TaskInventoryItem
1496 } 1503 }