diff options
| author | Melanie | 2012-01-26 00:21:21 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-26 00:21:21 +0000 |
| commit | 4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf (patch) | |
| tree | 6173c8da92084547e89db40e5762a74249b4a8db /OpenSim/Region/CoreModules/Avatar | |
| parent | Typo fix (diff) | |
| parent | refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInvento... (diff) | |
| download | opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.zip opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.gz opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.bz2 opensim-SC-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index e0b02aa..150d913 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
| @@ -122,12 +122,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
| 122 | 122 | ||
| 123 | scene.AddCommand( | 123 | scene.AddCommand( |
| 124 | this, "save iar", | 124 | this, "save iar", |
| 125 | "save iar [--p|-profile=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [--v|-verbose]", | 125 | "save iar [-h|--home=<url>] [--noassets] <first> <last> <inventory path> <password> [<IAR path>] [--v|-verbose]", |
| 126 | "Save user inventory archive (IAR).", | 126 | "Save user inventory archive (IAR).", |
| 127 | "<first> is the user's first name." + Environment.NewLine | 127 | "<first> is the user's first name." + Environment.NewLine |
| 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 | + "-h|--home=<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 | + "-c|--creators preserves information about foreign creators." + Environment.NewLine |
| 132 | + "-v|--verbose extra debug messages." + Environment.NewLine | 132 | + "-v|--verbose extra debug messages." + Environment.NewLine |
| 133 | + "--noassets stops assets being saved to the IAR." | 133 | + "--noassets stops assets being saved to the IAR." |