diff options
author | Diva Canto | 2011-02-03 04:07:36 -0800 |
---|---|---|
committer | Diva Canto | 2011-02-03 04:07:36 -0800 |
commit | 8fdc810a2329063d136458dff5a4c7d307db3feb (patch) | |
tree | df1d6334ba880e83e97aca3f6adbc7c175abff9a /OpenSim/Region | |
parent | Comment out texture CAPS 'texture not found' message for now (diff) | |
download | opensim-SC_OLD-8fdc810a2329063d136458dff5a4c7d307db3feb.zip opensim-SC_OLD-8fdc810a2329063d136458dff5a4c7d307db3feb.tar.gz opensim-SC_OLD-8fdc810a2329063d136458dff5a4c7d307db3feb.tar.bz2 opensim-SC_OLD-8fdc810a2329063d136458dff5a4c7d307db3feb.tar.xz |
Addresses mantis #5360: CreatorData was being written as long as it wasn't null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 1a96098..26edba4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -128,6 +128,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
128 | + "<last> is the user's last name." + Environment.NewLine | 128 | + "<last> is the user's last name." + Environment.NewLine |
129 | + "<inventory path> is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine | 129 | + "<inventory path> is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine |
130 | + "-p|--profile=<url> adds the url of the profile service to the saved user information." + Environment.NewLine | 130 | + "-p|--profile=<url> adds the url of the profile service to the saved user information." + Environment.NewLine |
131 | + "-c|--creators preserves information about foreign creators." + Environment.NewLine | ||
131 | + "-v|--verbose extra debug messages." + Environment.NewLine | 132 | + "-v|--verbose extra debug messages." + Environment.NewLine |
132 | + "<IAR path> is the filesystem path at which to save the IAR." | 133 | + "<IAR path> is the filesystem path at which to save the IAR." |
133 | + string.Format(" If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME), | 134 | + string.Format(" If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME), |
@@ -396,6 +397,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
396 | //ops.Add("v|version=", delegate(string v) { options["version"] = v; }); | 397 | //ops.Add("v|version=", delegate(string v) { options["version"] = v; }); |
397 | ops.Add("p|profile=", delegate(string v) { options["profile"] = v; }); | 398 | ops.Add("p|profile=", delegate(string v) { options["profile"] = v; }); |
398 | ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; }); | 399 | ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; }); |
400 | ops.Add("c|creators", delegate(string v) { options["creators"] = v; }); | ||
399 | 401 | ||
400 | List<string> mainParams = ops.Parse(cmdparams); | 402 | List<string> mainParams = ops.Parse(cmdparams); |
401 | 403 | ||