aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2009-09-15 07:55:29 +0100
committerMelanie2009-09-15 07:55:29 +0100
commit7c925744f6094a01aae40972e56fb0ec4d6f3ba5 (patch)
treeddcb4432bc4bacc36880fa28b39d878ea616decb /OpenSim/Region/Framework
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-7c925744f6094a01aae40972e56fb0ec4d6f3ba5.zip
opensim-SC_OLD-7c925744f6094a01aae40972e56fb0ec4d6f3ba5.tar.gz
opensim-SC_OLD-7c925744f6094a01aae40972e56fb0ec4d6f3ba5.tar.bz2
opensim-SC_OLD-7c925744f6094a01aae40972e56fb0ec4d6f3ba5.tar.xz
Some OSGrid specific changes, please use this or later for OSGrid use
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
index ca7abf8..1622564 100644
--- a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Interfaces
58 /// <param name="invPath">The inventory path in which to place the loaded folders and items</param> 58 /// <param name="invPath">The inventory path in which to place the loaded folders and items</param>
59 /// <param name="loadStream">The stream from which the inventory archive will be loaded</param> 59 /// <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> 60 /// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
61 bool DearchiveInventory(string firstName, string lastName, string invPath, Stream loadStream); 61 bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, Stream loadStream);
62 62
63 /// <summary> 63 /// <summary>
64 /// Archive a user's inventory folder to the given stream 64 /// Archive a user's inventory folder to the given stream
@@ -69,6 +69,6 @@ namespace OpenSim.Region.Framework.Interfaces
69 /// <param name="invPath">The inventory path from which the inventory should be saved.</param> 69 /// <param name="invPath">The inventory path from which the inventory should be saved.</param>
70 /// <param name="saveStream">The stream to which the inventory archive will be saved</param> 70 /// <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> 71 /// <returns>true if the first stage of the operation succeeded, false otherwise</returns>
72 bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, Stream saveStream); 72 bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream);
73 } 73 }
74} \ No newline at end of file 74}