ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Implement merging of oars in code

Browse Source 
* Not fully tested yet and not yet available as an option from the user console
This commit is contained in:
Justin Clarke Casey
2009-02-10 18:43:36 +00:00
parent 879338499f
commit 25bc7a44cd
4 changed files with 145 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
View File

@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Interfaces
void ArchiveRegion(Stream saveStream);
/// <summary>
/// Dearchive the given region archive into the scene
/// Dearchive the given region archive. This replaces the existing scene.
/// </summary>
///
/// 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);
/// <summary>
/// Dearchive a region from a stream.
/// Dearchive the given region archive. This replaces the existing scene.
/// </summary>
///
/// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event.
///
/// <param name="loadPath"></param>
/// <param name="merge">
/// 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.
/// </param>
void DearchiveRegion(string loadPath, bool merge);
/// <summary>
/// Dearchive a region from a stream. This replaces the existing scene.
/// </summary>
///
/// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event.
///
/// <param name="loadStream"></param>
void DearchiveRegion(Stream loadStream);
/// <summary>
/// Dearchive a region from a stream. This replaces the existing scene.
/// </summary>
///
/// If you want notification of when it has completed then subscribe to the EventManager.OnOarFileLoaded event.
///
/// <param name="loadStream"></param>
/// <param name="merge">
/// 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.
/// </param>
void DearchiveRegion(Stream loadStream, bool merge);
}
}