diff options
Merge branch 'master' into diva-textures
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs index 78b5322..9ad2036 100644 --- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | |||
@@ -52,9 +52,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
52 | /// This method occurs asynchronously. If you want notification of when it has completed then subscribe to | 52 | /// This method occurs asynchronously. If you want notification of when it has completed then subscribe to |
53 | /// the EventManager.OnOarFileSaved event. | 53 | /// the EventManager.OnOarFileSaved event. |
54 | /// | 54 | /// |
55 | /// <param name="savePath"></param> | 55 | /// <param name="savePath"></param> |
56 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> | 56 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> |
57 | void ArchiveRegion(string savePath, Guid requestId); | 57 | void ArchiveRegion(string savePath, Guid requestId); |
58 | 58 | ||
59 | /// <summary> | 59 | /// <summary> |
60 | /// Archive the region to a stream. | 60 | /// Archive the region to a stream. |
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
88 | /// settings in the archive will be ignored. | 88 | /// settings in the archive will be ignored. |
89 | /// </param> | 89 | /// </param> |
90 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> | 90 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> |
91 | void DearchiveRegion(string loadPath, bool merge, Guid requestId); | 91 | void DearchiveRegion(string loadPath, bool merge, Guid requestId); |
92 | 92 | ||
93 | /// <summary> | 93 | /// <summary> |
94 | /// Dearchive a region from a stream. This replaces the existing scene. | 94 | /// Dearchive a region from a stream. This replaces the existing scene. |
@@ -109,8 +109,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
109 | /// <param name="merge"> | 109 | /// <param name="merge"> |
110 | /// If true, the loaded region merges with the existing one rather than replacing it. Any terrain or region | 110 | /// If true, the loaded region merges with the existing one rather than replacing it. Any terrain or region |
111 | /// settings in the archive will be ignored. | 111 | /// settings in the archive will be ignored. |
112 | /// </param> | 112 | /// </param> |
113 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> | 113 | /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param> |
114 | void DearchiveRegion(Stream loadStream, bool merge, Guid requestId); | 114 | void DearchiveRegion(Stream loadStream, bool merge, Guid requestId); |
115 | } | 115 | } |
116 | } | 116 | } |