diff options
author | Justin Clarke Casey | 2009-02-10 18:43:36 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-10 18:43:36 +0000 |
commit | 25bc7a44cdb4809b184c81231d2d99ec3dcbaf72 (patch) | |
tree | 914cd06b9fe7a9d980ba60f961332d01c6c181eb /OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |
parent | * extend load oar test to check that an object was actually loaded (diff) | |
download | opensim-SC_OLD-25bc7a44cdb4809b184c81231d2d99ec3dcbaf72.zip opensim-SC_OLD-25bc7a44cdb4809b184c81231d2d99ec3dcbaf72.tar.gz opensim-SC_OLD-25bc7a44cdb4809b184c81231d2d99ec3dcbaf72.tar.bz2 opensim-SC_OLD-25bc7a44cdb4809b184c81231d2d99ec3dcbaf72.tar.xz |
* Implement merging of oars in code
* Not fully tested yet and not yet available as an option from the user console
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index c1f5b18..6259662 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -81,15 +81,25 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
81 | 81 | ||
82 | public void DearchiveRegion(string loadPath) | 82 | public void DearchiveRegion(string loadPath) |
83 | { | 83 | { |
84 | DearchiveRegion(loadPath, false); | ||
85 | } | ||
86 | |||
87 | public void DearchiveRegion(string loadPath, bool merge) | ||
88 | { | ||
84 | m_log.InfoFormat( | 89 | m_log.InfoFormat( |
85 | "[ARCHIVER]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath); | 90 | "[ARCHIVER]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath); |
86 | 91 | ||
87 | new ArchiveReadRequest(m_scene, loadPath).DearchiveRegion(); | 92 | new ArchiveReadRequest(m_scene, loadPath, merge).DearchiveRegion(); |
88 | } | 93 | } |
89 | 94 | ||
90 | public void DearchiveRegion(Stream loadStream) | 95 | public void DearchiveRegion(Stream loadStream) |
91 | { | 96 | { |
92 | new ArchiveReadRequest(m_scene, loadStream).DearchiveRegion(); | 97 | DearchiveRegion(loadStream, false); |
93 | } | 98 | } |
99 | |||
100 | public void DearchiveRegion(Stream loadStream, bool merge) | ||
101 | { | ||
102 | new ArchiveReadRequest(m_scene, loadStream, merge).DearchiveRegion(); | ||
103 | } | ||
94 | } | 104 | } |
95 | } | 105 | } |