diff options
author | Jonathan Freedman | 2010-10-17 18:45:25 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-17 18:45:25 -0400 |
commit | 4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65 (patch) | |
tree | 79142f2364b658f52b63e3ae688a5521290e2a4f /OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | |
parent | * more url / hg cleanup (diff) | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.zip opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.gz opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.bz2 opensim-SC_OLD-4e4fb93fae6c13ca6c6ac521991c4e4969b0fe65.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs index 89e59d0..d8229de 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.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 | 31 | ||
31 | namespace OpenSim.Region.Framework.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
@@ -46,7 +47,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
46 | /// the EventManager.OnOarFileSaved event. | 47 | /// the EventManager.OnOarFileSaved event. |
47 | /// | 48 | /// |
48 | /// <param name="savePath"></param> | 49 | /// <param name="savePath"></param> |
49 | void ArchiveRegion(string savePath); | 50 | void ArchiveRegion(string savePath, Dictionary<string, object> options); |
50 | 51 | ||
51 | /// <summary> | 52 | /// <summary> |
52 | /// Archive the region to the given path | 53 | /// Archive the region to the given path |
@@ -57,7 +58,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
57 | /// | 58 | /// |
58 | /// <param name="savePath"></param> | 59 | /// <param name="savePath"></param> |
59 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> | 60 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> |
60 | void ArchiveRegion(string savePath, Guid requestId); | 61 | void ArchiveRegion(string savePath, Guid requestId, Dictionary<string, object> options); |
61 | 62 | ||
62 | /// <summary> | 63 | /// <summary> |
63 | /// Archive the region to a stream. | 64 | /// Archive the region to a stream. |