aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 63dd4b2..994fe01 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -217,8 +217,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
217 m_requestId = requestId; 217 m_requestId = requestId;
218 m_displacement = options.ContainsKey("displacement") ? (Vector3)options["displacement"] : Vector3.Zero; 218 m_displacement = options.ContainsKey("displacement") ? (Vector3)options["displacement"] : Vector3.Zero;
219 m_rotation = options.ContainsKey("rotation") ? (float)options["rotation"] : 0f; 219 m_rotation = options.ContainsKey("rotation") ? (float)options["rotation"] : 0f;
220 m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"]
221 : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f);
222 220
223 m_boundingOrigin = Vector3.Zero; 221 m_boundingOrigin = Vector3.Zero;
224 m_boundingSize = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, float.MaxValue); 222 m_boundingSize = new Vector3(scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY, float.MaxValue);
@@ -239,7 +237,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
239 else m_log.InfoFormat("[ARCHIVER]: The bounding cube origin must be within the destination region! Setting to {0}.", m_boundingOrigin.ToString()); 237 else m_log.InfoFormat("[ARCHIVER]: The bounding cube origin must be within the destination region! Setting to {0}.", m_boundingOrigin.ToString());
240 } 238 }
241 239
242
243 if (options.ContainsKey("bounding-size")) 240 if (options.ContainsKey("bounding-size"))
244 { 241 {
245 Vector3 bsOption = (Vector3)options["bounding-size"]; 242 Vector3 bsOption = (Vector3)options["bounding-size"];
@@ -1194,7 +1191,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
1194 } 1191 }
1195 1192
1196 dearchivedScenes.MultiRegionFormat = multiRegion; 1193 dearchivedScenes.MultiRegionFormat = multiRegion;
1197 if (!multiRegion) 1194 if (!multiRegion && dearchivedScenes.GetScenesCount() == 0)
1198 { 1195 {
1199 // Add the single scene 1196 // Add the single scene
1200 dearchivedScenes.StartRow(); 1197 dearchivedScenes.StartRow();