diff options
author | Justin Clark-Casey (justincc) | 2012-09-07 23:30:54 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-14 20:25:44 +0100 |
commit | d7e6fe488d5258ec92230b6c652969f2d0420376 (patch) | |
tree | 2541ddb0752c20f372baffa2a9c6b72fee954a81 /OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |
parent | Support multi-region OAR files (diff) | |
download | opensim-SC_OLD-d7e6fe488d5258ec92230b6c652969f2d0420376.zip opensim-SC_OLD-d7e6fe488d5258ec92230b6c652969f2d0420376.tar.gz opensim-SC_OLD-d7e6fe488d5258ec92230b6c652969f2d0420376.tar.bz2 opensim-SC_OLD-d7e6fe488d5258ec92230b6c652969f2d0420376.tar.xz |
Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the multi-OAR patch there is now only one class that handles this operation.
Adapation of 0004-Renamed-ArchiveWriteRequestPreparation-to-ArchiveWri.patch in http://opensimulator.org/mantis/view.php?id=6105
since that did not directly apply
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 26535a9..2a87dc2 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs | |||
@@ -170,7 +170,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
170 | m_log.InfoFormat( | 170 | m_log.InfoFormat( |
171 | "[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); |
172 | 172 | ||
173 | new ArchiveWriteRequestPreparation(Scene, savePath, requestId).ArchiveRegion(options); | 173 | new ArchiveWriteRequest(Scene, savePath, requestId).ArchiveRegion(options); |
174 | } | 174 | } |
175 | 175 | ||
176 | public void ArchiveRegion(Stream saveStream) | 176 | public void ArchiveRegion(Stream saveStream) |
@@ -185,7 +185,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
185 | 185 | ||
186 | public void ArchiveRegion(Stream saveStream, Guid requestId, Dictionary<string, object> options) | 186 | public void ArchiveRegion(Stream saveStream, Guid requestId, Dictionary<string, object> options) |
187 | { | 187 | { |
188 | new ArchiveWriteRequestPreparation(Scene, saveStream, requestId).ArchiveRegion(options); | 188 | new ArchiveWriteRequest(Scene, saveStream, requestId).ArchiveRegion(options); |
189 | } | 189 | } |
190 | 190 | ||
191 | public void DearchiveRegion(string loadPath) | 191 | public void DearchiveRegion(string loadPath) |