aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-09-04 21:10:56 +0100
committerJustin Clark-Casey (justincc)2009-09-04 21:10:56 +0100
commit7ca61e01742b53033009f10c45e3ea0d0ef91315 (patch)
tree7b215e2e6d1b240262560665699e1fce83a83e5d /OpenSim/Region/Framework/Interfaces
parentIf running tests manually, fail immediately on error (diff)
downloadopensim-SC_OLD-7ca61e01742b53033009f10c45e3ea0d0ef91315.zip
opensim-SC_OLD-7ca61e01742b53033009f10c45e3ea0d0ef91315.tar.gz
opensim-SC_OLD-7ca61e01742b53033009f10c45e3ea0d0ef91315.tar.bz2
opensim-SC_OLD-7ca61e01742b53033009f10c45e3ea0d0ef91315.tar.xz
Add ids to iar requests
Stop save iar test wrongly relying on thread pulsing (still disabled though)
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
index df6650f..457b5b8 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
@@ -34,13 +34,14 @@ namespace OpenSim.Region.Framework.Interfaces
34 /// <summary> 34 /// <summary>
35 /// Used for the OnInventoryArchiveSaved event. 35 /// Used for the OnInventoryArchiveSaved event.
36 /// </summary> 36 /// </summary>
37 /// <param name="id">Request id</param>
37 /// <param name="succeeded">true if the save succeeded, false otherwise</param> 38 /// <param name="succeeded">true if the save succeeded, false otherwise</param>
38 /// <param name="userInfo">The user for whom the save was conducted</param> 39 /// <param name="userInfo">The user for whom the save was conducted</param>
39 /// <param name="invPath">The inventory path saved</param> 40 /// <param name="invPath">The inventory path saved</param>
40 /// <param name="savePath">The stream to which the archive was saved</param> 41 /// <param name="savePath">The stream to which the archive was saved</param>
41 /// <param name="reportedException">Contains the exception generated if the save did not succeed</param> 42 /// <param name="reportedException">Contains the exception generated if the save did not succeed</param>
42 public delegate void InventoryArchiveSaved( 43 public delegate void InventoryArchiveSaved(
43 bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, Exception reportedException); 44 Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, Exception reportedException);
44 45
45 public interface IInventoryArchiverModule 46 public interface IInventoryArchiverModule
46 { 47 {
@@ -61,10 +62,11 @@ namespace OpenSim.Region.Framework.Interfaces
61 /// <summary> 62 /// <summary>
62 /// Archive a user's inventory folder to the given stream 63 /// Archive a user's inventory folder to the given stream
63 /// </summary> 64 /// </summary>
65 /// <param name="id">ID representing this request. This will later be returned in the save event</param>
64 /// <param name="firstName"></param> 66 /// <param name="firstName"></param>
65 /// <param name="lastName"></param> 67 /// <param name="lastName"></param>
66 /// <param name="invPath">The inventory path from which the inventory should be saved.</param> 68 /// <param name="invPath">The inventory path from which the inventory should be saved.</param>
67 /// <param name="saveStream">The stream to which the inventory archive will be saved</param> 69 /// <param name="saveStream">The stream to which the inventory archive will be saved</param>
68 void ArchiveInventory(string firstName, string lastName, string invPath, Stream saveStream); 70 void ArchiveInventory(Guid id, string firstName, string lastName, string invPath, Stream saveStream);
69 } 71 }
70} 72}