diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs index a0a40af74c..9484330709 100644 --- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs +++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs @@ -281,7 +281,7 @@ namespace OpenSim.Framework.Serialization.External writer.WriteStartElement("GroupOwned"); writer.WriteString(inventoryItem.GroupOwned.ToString()); writer.WriteEndElement(); - if (options.ContainsKey("creators") && !string.IsNullOrEmpty(inventoryItem.CreatorData)) + if (!options.ContainsKey("nocreators") && !string.IsNullOrEmpty(inventoryItem.CreatorData)) writer.WriteElementString("CreatorData", inventoryItem.CreatorData); else if (options.ContainsKey("home")) { diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 237a2e8ea3..bcdb2645b0 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs @@ -128,7 +128,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver scene.AddCommand( "Archiving", this, "save iar", - "save iar [-h|--home=] [--noassets | --skipbadassets] [] [-c|--creators] [-e|--exclude=] [-f|--excludefolder=] [-v|--verbose]", + "save iar [-h|--home=] [--noassets | --skipbadassets] [] [--nocreators] [-e|--exclude=] [-f|--excludefolder=] [-v|--verbose]", "Save user inventory archive (IAR).", " is the user's first name.\n" + " is the user's last name.\n" @@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver + " is the filesystem path at which to save the IAR." + string.Format(" If this is not given then the filename {0} in the current directory is used.\n", DEFAULT_INV_BACKUP_FILENAME) + "-h|--home= adds the url of the profile service to the saved user information.\n" - + "-c|--creators preserves information about foreign creators.\n" + + " --nocreators stops saving information about foreign creators.\n" + "-e|--exclude= don't save the inventory item in archive" + Environment.NewLine + "-f|--excludefolder= don't save contents of the folder in archive" + Environment.NewLine + "-v|--verbose extra debug messages.\n" @@ -445,7 +445,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver //ops.Add("v|version=", delegate(string v) { options["version"] = v; }); ops.Add("h|home=", delegate(string v) { options["home"] = v; }); ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; }); - ops.Add("c|creators", delegate(string v) { options["creators"] = v; }); + ops.Add("c|creators", delegate(string v) { }); + ops.Add("nocreators", delegate(string v) { options["nocreators"] = v; }); ops.Add("noassets", delegate(string v) { options["noassets"] = v != null; }); ops.Add("skipbadassets", delegate(string v) { options["skipbadassets"] = v != null; }); ops.Add("e|exclude=", delegate(string v) @@ -469,7 +470,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver if (mainParams.Count < 6) { m_log.Error( - "[INVENTORY ARCHIVER]: save iar [-h|--home=] [--noassets | --skipbadassets] [] [-c|--creators] [-e|--exclude=] [-f|--excludefolder=] [-v|--verbose]"); + "[INVENTORY ARCHIVER]: save iar [-h|--home=] [--noassets | --skipbadassets] [] [--nocreators] [-e|--exclude=] [-f|--excludefolder=] [-v|--verbose]"); return; }