From 2a4dd34616bdb0641f841766dfd15c4c784d3549 Mon Sep 17 00:00:00 2001 From: Robert Adams Date: Sun, 2 Feb 2014 12:21:18 -0800 Subject: Change new 'load oar' parameters to be hyphenated to be consistant with existing parameters. ('--forceterrain' becomes '--force-terrain'). The old forms have been kept for downward compatiblity. --- OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs') diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 6f68966..23008a0 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs @@ -177,13 +177,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_errorMessage = String.Empty; m_merge = options.ContainsKey("merge"); - m_forceTerrain = options.ContainsKey("forceTerrain"); - m_forceParcels = options.ContainsKey("forceParcels"); + m_forceTerrain = options.ContainsKey("force-terrain"); + m_forceParcels = options.ContainsKey("force-parcels"); m_skipAssets = options.ContainsKey("skipAssets"); m_requestId = requestId; m_displacement = options.ContainsKey("displacement") ? (Vector3)options["displacement"] : Vector3.Zero; m_rotation = options.ContainsKey("rotation") ? (float)options["rotation"] : 0f; - m_rotationCenter = options.ContainsKey("rotationCenter") ? (Vector3)options["rotationCenter"] + m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"] : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f); // Zero can never be a valid user id -- cgit v1.1