diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-08 04:43:17 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-08 04:43:17 -0400 |
| commit | f0e2fd426b074ceb992124cf5eb2ebe8db5c04dd (patch) | |
| tree | bea9234644b05887b4c7cc063d457b91610ed9dc /OpenSim/Region/Framework | |
| parent | * Fixes a 'take object from mega region' and rez it in a regular region.. ... (diff) | |
| parent | llRot2Euler() now returns angles -PI < angle < PI (diff) | |
| download | opensim-SC-f0e2fd426b074ceb992124cf5eb2ebe8db5c04dd.zip opensim-SC-f0e2fd426b074ceb992124cf5eb2ebe8db5c04dd.tar.gz opensim-SC-f0e2fd426b074ceb992124cf5eb2ebe8db5c04dd.tar.bz2 opensim-SC-f0e2fd426b074ceb992124cf5eb2ebe8db5c04dd.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs index 457b5b8..ca7abf8 100644 --- a/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IInventoryArchiverModule.cs | |||
| @@ -56,8 +56,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 56 | /// <param name="firstName"></param> | 56 | /// <param name="firstName"></param> |
| 57 | /// <param name="lastName"></param> | 57 | /// <param name="lastName"></param> |
| 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 | void DearchiveInventory(string firstName, string lastName, string invPath, Stream loadStream); | 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 | 62 | ||
| 62 | /// <summary> | 63 | /// <summary> |
| 63 | /// Archive a user's inventory folder to the given stream | 64 | /// Archive a user's inventory folder to the given stream |
| @@ -67,6 +68,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 67 | /// <param name="lastName"></param> | 68 | /// <param name="lastName"></param> |
| 68 | /// <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> |
| 69 | /// <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> |
| 70 | void ArchiveInventory(Guid id, string firstName, string lastName, string invPath, Stream saveStream); | 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); | ||
| 71 | } | 73 | } |
| 72 | } | 74 | } \ No newline at end of file |