diff options
author | Melanie | 2011-02-07 22:28:59 +0000 |
---|---|---|
committer | Melanie | 2011-02-07 22:28:59 +0000 |
commit | 6becaf65e15e3fde2d910925b4f7ff09971121f3 (patch) | |
tree | 86ce8b674c9e1559e2b8763e847d2b99e920ef03 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-6becaf65e15e3fde2d910925b4f7ff09971121f3.zip opensim-SC_OLD-6becaf65e15e3fde2d910925b4f7ff09971121f3.tar.gz opensim-SC_OLD-6becaf65e15e3fde2d910925b4f7ff09971121f3.tar.bz2 opensim-SC_OLD-6becaf65e15e3fde2d910925b4f7ff09971121f3.tar.xz |
Fix merge issues
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 68538c9..a71def7 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -128,11 +128,8 @@ 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 | <<<<<<< HEAD:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | ||
132 | ======= | ||
133 | + "-c|--creators preserves information about foreign creators." + Environment.NewLine | 131 | + "-c|--creators preserves information about foreign creators." + Environment.NewLine |
134 | + "-v|--verbose extra debug messages." + Environment.NewLine | 132 | + "-v|--verbose extra debug messages." + Environment.NewLine |
135 | >>>>>>> master:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | ||
136 | + "<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." |
137 | + 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), |
138 | HandleSaveInvConsoleCommand); | 135 | HandleSaveInvConsoleCommand); |
@@ -399,11 +396,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
399 | OptionSet ops = new OptionSet(); | 396 | OptionSet ops = new OptionSet(); |
400 | //ops.Add("v|version=", delegate(string v) { options["version"] = v; }); | 397 | //ops.Add("v|version=", delegate(string v) { options["version"] = v; }); |
401 | ops.Add("p|profile=", delegate(string v) { options["profile"] = v; }); | 398 | ops.Add("p|profile=", delegate(string v) { options["profile"] = v; }); |
402 | <<<<<<< HEAD:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | ||
403 | ======= | ||
404 | ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; }); | 399 | ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; }); |
405 | ops.Add("c|creators", delegate(string v) { options["creators"] = v; }); | 400 | ops.Add("c|creators", delegate(string v) { options["creators"] = v; }); |
406 | >>>>>>> master:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | ||
407 | 401 | ||
408 | List<string> mainParams = ops.Parse(cmdparams); | 402 | List<string> mainParams = ops.Parse(cmdparams); |
409 | 403 | ||