diff options
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs index 97afe8d..601b83e 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
55 | void ArchiveRegion(Stream saveStream); | 55 | void ArchiveRegion(Stream saveStream); |
56 | 56 | ||
57 | /// <summary> | 57 | /// <summary> |
58 | /// Dearchive the given region archive into the scene | 58 | /// Dearchive the given region archive. This replaces the existing scene. |
59 | /// </summary> | 59 | /// </summary> |
60 | /// | 60 | /// |
61 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. | 61 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. |
@@ -64,12 +64,38 @@ namespace OpenSim.Region.Framework.Interfaces | |||
64 | void DearchiveRegion(string loadPath); | 64 | void DearchiveRegion(string loadPath); |
65 | 65 | ||
66 | /// <summary> | 66 | /// <summary> |
67 | /// Dearchive a region from a stream. | 67 | /// Dearchive the given region archive. This replaces the existing scene. |
68 | /// </summary> | ||
69 | /// | ||
70 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. | ||
71 | /// | ||
72 | /// <param name="loadPath"></param> | ||
73 | /// <param name="merge"> | ||
74 | /// If true, the loaded region merges with the existing one rather than replacing it. Any terrain or region | ||
75 | /// settings in the archive will be ignored. | ||
76 | /// </param> | ||
77 | void DearchiveRegion(string loadPath, bool merge); | ||
78 | |||
79 | /// <summary> | ||
80 | /// Dearchive a region from a stream. This replaces the existing scene. | ||
68 | /// </summary> | 81 | /// </summary> |
69 | /// | 82 | /// |
70 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. | 83 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. |
71 | /// | 84 | /// |
72 | /// <param name="loadStream"></param> | 85 | /// <param name="loadStream"></param> |
73 | void DearchiveRegion(Stream loadStream); | 86 | void DearchiveRegion(Stream loadStream); |
87 | |||
88 | /// <summary> | ||
89 | /// Dearchive a region from a stream. This replaces the existing scene. | ||
90 | /// </summary> | ||
91 | /// | ||
92 | /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event. | ||
93 | /// | ||
94 | /// <param name="loadStream"></param> | ||
95 | /// <param name="merge"> | ||
96 | /// If true, the loaded region merges with the existing one rather than replacing it. Any terrain or region | ||
97 | /// settings in the archive will be ignored. | ||
98 | /// </param> | ||
99 | void DearchiveRegion(Stream loadStream, bool merge); | ||
74 | } | 100 | } |
75 | } | 101 | } |