From 25bc7a44cdb4809b184c81231d2d99ec3dcbaf72 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 10 Feb 2009 18:43:36 +0000
Subject: * Implement merging of oars in code * Not fully tested yet and not
yet available as an option from the user console
---
.../Framework/Interfaces/IRegionArchiverModule.cs | 30 ++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Framework/Interfaces')
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
void ArchiveRegion(Stream saveStream);
///
- /// Dearchive the given region archive into the scene
+ /// Dearchive the given region archive. This replaces the existing scene.
///
///
/// 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
void DearchiveRegion(string loadPath);
///
- /// Dearchive a region from a stream.
+ /// Dearchive the given region archive. This replaces the existing scene.
+ ///
+ ///
+ /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event.
+ ///
+ ///
+ ///
+ /// If true, the loaded region merges with the existing one rather than replacing it. Any terrain or region
+ /// settings in the archive will be ignored.
+ ///
+ void DearchiveRegion(string loadPath, bool merge);
+
+ ///
+ /// Dearchive a region from a stream. This replaces the existing scene.
///
///
/// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event.
///
///
void DearchiveRegion(Stream loadStream);
+
+ ///
+ /// Dearchive a region from a stream. This replaces the existing scene.
+ ///
+ ///
+ /// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event.
+ ///
+ ///
+ ///
+ /// If true, the loaded region merges with the existing one rather than replacing it. Any terrain or region
+ /// settings in the archive will be ignored.
+ ///
+ void DearchiveRegion(Stream loadStream, bool merge);
}
}
--
cgit v1.1