diff options
author | Oren Hurvitz | 2012-07-24 19:48:08 +0300 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-14 20:25:03 +0100 |
commit | ce468215d576cc301a261d85bee9baa68a246ce6 (patch) | |
tree | ad2c6d7e3156bf8dab596f2772cc712d4f96c698 /OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |
parent | Don't store the unnecessary VERSIONMIN. VERSIONMAX, METHOD or UserID (present... (diff) | |
download | opensim-SC_OLD-ce468215d576cc301a261d85bee9baa68a246ce6.zip opensim-SC_OLD-ce468215d576cc301a261d85bee9baa68a246ce6.tar.gz opensim-SC_OLD-ce468215d576cc301a261d85bee9baa68a246ce6.tar.bz2 opensim-SC_OLD-ce468215d576cc301a261d85bee9baa68a246ce6.tar.xz |
Support multi-region OAR files
Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index bf3b124..26535a9 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -146,6 +146,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
146 | ops.Add("noassets", delegate(string v) { options["noassets"] = v != null; }); | 146 | ops.Add("noassets", delegate(string v) { options["noassets"] = v != null; }); |
147 | ops.Add("publish", v => options["wipe-owners"] = v != null); | 147 | ops.Add("publish", v => options["wipe-owners"] = v != null); |
148 | ops.Add("perm=", delegate(string v) { options["checkPermissions"] = v; }); | 148 | ops.Add("perm=", delegate(string v) { options["checkPermissions"] = v; }); |
149 | ops.Add("all", delegate(string v) { options["all"] = v != null; }); | ||
149 | 150 | ||
150 | List<string> mainParams = ops.Parse(cmdparams); | 151 | List<string> mainParams = ops.Parse(cmdparams); |
151 | 152 | ||
@@ -169,7 +170,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
169 | m_log.InfoFormat( | 170 | m_log.InfoFormat( |
170 | "[ARCHIVER]: Writing archive for region {0} to {1}", Scene.RegionInfo.RegionName, savePath); | 171 | "[ARCHIVER]: Writing archive for region {0} to {1}", Scene.RegionInfo.RegionName, savePath); |
171 | 172 | ||
172 | new ArchiveWriteRequestPreparation(this, savePath, requestId).ArchiveRegion(options); | 173 | new ArchiveWriteRequestPreparation(Scene, savePath, requestId).ArchiveRegion(options); |
173 | } | 174 | } |
174 | 175 | ||
175 | public void ArchiveRegion(Stream saveStream) | 176 | public void ArchiveRegion(Stream saveStream) |
@@ -184,7 +185,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
184 | 185 | ||
185 | public void ArchiveRegion(Stream saveStream, Guid requestId, Dictionary<string, object> options) | 186 | public void ArchiveRegion(Stream saveStream, Guid requestId, Dictionary<string, object> options) |
186 | { | 187 | { |
187 | new ArchiveWriteRequestPreparation(this, saveStream, requestId).ArchiveRegion(options); | 188 | new ArchiveWriteRequestPreparation(Scene, saveStream, requestId).ArchiveRegion(options); |
188 | } | 189 | } |
189 | 190 | ||
190 | public void DearchiveRegion(string loadPath) | 191 | public void DearchiveRegion(string loadPath) |