diff options
author | Justin Clark-Casey (justincc) | 2010-05-28 20:07:15 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-05-28 20:07:15 +0100 |
commit | fff5459f4d3a6fcb7acae9e092fd8aae3c74dd7b (patch) | |
tree | 98082d9eaedf0745b912be891eee52d2e684ef22 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver | |
parent | minor: remove mono compiler warning (diff) | |
download | opensim-SC_OLD-fff5459f4d3a6fcb7acae9e092fd8aae3c74dd7b.zip opensim-SC_OLD-fff5459f4d3a6fcb7acae9e092fd8aae3c74dd7b.tar.gz opensim-SC_OLD-fff5459f4d3a6fcb7acae9e092fd8aae3c74dd7b.tar.bz2 opensim-SC_OLD-fff5459f4d3a6fcb7acae9e092fd8aae3c74dd7b.tar.xz |
Add ability to load IARs directly from URIs
So, something like
load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar
Will load my IAR directly from the web.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 21 |
2 files changed, 18 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index dc7439c..806aa4f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -37,7 +37,6 @@ using log4net; | |||
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Communications; | 39 | using OpenSim.Framework.Communications; |
40 | |||
41 | using OpenSim.Framework.Communications.Osp; | 40 | using OpenSim.Framework.Communications.Osp; |
42 | using OpenSim.Framework.Serialization; | 41 | using OpenSim.Framework.Serialization; |
43 | using OpenSim.Framework.Serialization.External; | 42 | using OpenSim.Framework.Serialization.External; |
@@ -72,7 +71,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
72 | scene, | 71 | scene, |
73 | userInfo, | 72 | userInfo, |
74 | invPath, | 73 | invPath, |
75 | new GZipStream(new FileStream(loadPath, FileMode.Open), CompressionMode.Decompress)) | 74 | new GZipStream(ArchiveHelpers.GetStream(loadPath), CompressionMode.Decompress)) |
76 | { | 75 | { |
77 | } | 76 | } |
78 | 77 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index f570999..307db97 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -91,13 +91,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
91 | 91 | ||
92 | scene.AddCommand( | 92 | scene.AddCommand( |
93 | this, "load iar", | 93 | this, "load iar", |
94 | "load iar <first> <last> <inventory path> <password> [<archive path>]", | 94 | "load iar <first> <last> <inventory path> <password> [<IAR path>]", |
95 | "Load user inventory archive.", HandleLoadInvConsoleCommand); | 95 | "Load user inventory archive (IAR).", |
96 | "<first> is user's first name." + Environment.NewLine | ||
97 | + "<last> is user's last name." + Environment.NewLine | ||
98 | + "<inventory path> is the path inside the user's inventory where the IAR should be loaded." + Environment.NewLine | ||
99 | + "<password> is the user's password." + Environment.NewLine | ||
100 | + "<IAR path> is the filesystem path or URI from which to load the IAR." | ||
101 | + string.Format(" If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME), | ||
102 | HandleLoadInvConsoleCommand); | ||
96 | 103 | ||
97 | scene.AddCommand( | 104 | scene.AddCommand( |
98 | this, "save iar", | 105 | this, "save iar", |
99 | "save iar <first> <last> <inventory path> <password> [<archive path>]", | 106 | "save iar <first> <last> <inventory path> <password> [<IAR path>]", |
100 | "Save user inventory archive.", HandleSaveInvConsoleCommand); | 107 | "Save user inventory archive (IAR).", |
108 | "<first> is the user's first name." + Environment.NewLine | ||
109 | + "<last> is the user's last name." + Environment.NewLine | ||
110 | + "<inventory path> is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine | ||
111 | + "<IAR path> is the filesystem path at which to save the IAR." | ||
112 | + string.Format(" If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME), | ||
113 | HandleSaveInvConsoleCommand); | ||
101 | 114 | ||
102 | m_aScene = scene; | 115 | m_aScene = scene; |
103 | } | 116 | } |