diff options
author | Justin Clark-Casey (justincc) | 2010-06-04 22:17:23 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-06-04 22:17:23 +0100 |
commit | 72bd68a21f916db918aeb3dd60a1f391e41ed7c2 (patch) | |
tree | d6159745733603efbd457e1e616aefb72b85cba2 /OpenSim/Region/Framework | |
parent | bring TestLoadIarV0_1AbsentUsers() back online (diff) | |
download | opensim-SC_OLD-72bd68a21f916db918aeb3dd60a1f391e41ed7c2.zip opensim-SC_OLD-72bd68a21f916db918aeb3dd60a1f391e41ed7c2.tar.gz opensim-SC_OLD-72bd68a21f916db918aeb3dd60a1f391e41ed7c2.tar.bz2 opensim-SC_OLD-72bd68a21f916db918aeb3dd60a1f391e41ed7c2.tar.xz |
add ability for load iar/save iar to take in arbitrary options
not used for anything yet
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs index fbadd91..01066e6 100644 --- a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using System.IO; | 30 | using System.IO; |
30 | using OpenSim.Services.Interfaces; | 31 | using OpenSim.Services.Interfaces; |
31 | 32 | ||
@@ -59,6 +60,20 @@ namespace OpenSim.Region.Framework.Interfaces | |||
59 | /// <param name="loadStream">The stream from which the inventory archive will be loaded</param> | 60 | /// <param name="loadStream">The stream from which the inventory archive will be loaded</param> |
60 | /// <returns>true if the first stage of the operation succeeded, false otherwise</returns> | 61 | /// <returns>true if the first stage of the operation succeeded, false otherwise</returns> |
61 | bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, Stream loadStream); | 62 | bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, Stream loadStream); |
63 | |||
64 | /// <summary> | ||
65 | /// Dearchive a user's inventory folder from the given stream | ||
66 | /// </summary> | ||
67 | /// <param name="firstName"></param> | ||
68 | /// <param name="lastName"></param> | ||
69 | /// <param name="invPath">The inventory path in which to place the loaded folders and items</param> | ||
70 | /// <param name="loadStream">The stream from which the inventory archive will be loaded</param> | ||
71 | /// <param name="options">Dearchiving options. At the moment, the only option is ("merge", true). This merges | ||
72 | /// the loaded IAR with existing folders where possible.</param> | ||
73 | /// <returns>true if the first stage of the operation succeeded, false otherwise</returns> | ||
74 | bool DearchiveInventory( | ||
75 | string firstName, string lastName, string invPath, string pass, Stream loadStream, | ||
76 | Dictionary<string, object> options); | ||
62 | 77 | ||
63 | /// <summary> | 78 | /// <summary> |
64 | /// Archive a user's inventory folder to the given stream | 79 | /// Archive a user's inventory folder to the given stream |
@@ -70,5 +85,19 @@ namespace OpenSim.Region.Framework.Interfaces | |||
70 | /// <param name="saveStream">The stream to which the inventory archive will be saved</param> | 85 | /// <param name="saveStream">The stream to which the inventory archive will be saved</param> |
71 | /// <returns>true if the first stage of the operation succeeded, false otherwise</returns> | 86 | /// <returns>true if the first stage of the operation succeeded, false otherwise</returns> |
72 | bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream); | 87 | bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream); |
88 | |||
89 | /// <summary> | ||
90 | /// Archive a user's inventory folder to the given stream | ||
91 | /// </summary> | ||
92 | /// <param name="id">ID representing this request. This will later be returned in the save event</param> | ||
93 | /// <param name="firstName"></param> | ||
94 | /// <param name="lastName"></param> | ||
95 | /// <param name="invPath">The inventory path from which the inventory should be saved.</param> | ||
96 | /// <param name="saveStream">The stream to which the inventory archive will be saved</param> | ||
97 | /// <param name="options">Archiving options. Currently, there are none.</param> | ||
98 | /// <returns>true if the first stage of the operation succeeded, false otherwise</returns> | ||
99 | bool ArchiveInventory( | ||
100 | Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream, | ||
101 | Dictionary<string, object> options); | ||
73 | } | 102 | } |
74 | } | 103 | } |