aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
diff options
context:
space:
mode:
authorRobert Adams2014-02-02 12:21:18 -0800
committerRobert Adams2014-02-02 12:21:18 -0800
commit2a4dd34616bdb0641f841766dfd15c4c784d3549 (patch)
tree4c01fa16ca4b96218ff4ba5d7026f659a6056334 /OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
parentImplement terrain merging in TerrainChannel. (diff)
downloadopensim-SC_OLD-2a4dd34616bdb0641f841766dfd15c4c784d3549.zip
opensim-SC_OLD-2a4dd34616bdb0641f841766dfd15c4c784d3549.tar.gz
opensim-SC_OLD-2a4dd34616bdb0641f841766dfd15c4c784d3549.tar.bz2
opensim-SC_OLD-2a4dd34616bdb0641f841766dfd15c4c784d3549.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs6
1 files changed, 3 insertions, 3 deletions
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
177 177
178 m_errorMessage = String.Empty; 178 m_errorMessage = String.Empty;
179 m_merge = options.ContainsKey("merge"); 179 m_merge = options.ContainsKey("merge");
180 m_forceTerrain = options.ContainsKey("forceTerrain"); 180 m_forceTerrain = options.ContainsKey("force-terrain");
181 m_forceParcels = options.ContainsKey("forceParcels"); 181 m_forceParcels = options.ContainsKey("force-parcels");
182 m_skipAssets = options.ContainsKey("skipAssets"); 182 m_skipAssets = options.ContainsKey("skipAssets");
183 m_requestId = requestId; 183 m_requestId = requestId;
184 m_displacement = options.ContainsKey("displacement") ? (Vector3)options["displacement"] : Vector3.Zero; 184 m_displacement = options.ContainsKey("displacement") ? (Vector3)options["displacement"] : Vector3.Zero;
185 m_rotation = options.ContainsKey("rotation") ? (float)options["rotation"] : 0f; 185 m_rotation = options.ContainsKey("rotation") ? (float)options["rotation"] : 0f;
186 m_rotationCenter = options.ContainsKey("rotationCenter") ? (Vector3)options["rotationCenter"] 186 m_rotationCenter = options.ContainsKey("rotation-center") ? (Vector3)options["rotation-center"]
187 : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f); 187 : new Vector3(scene.RegionInfo.RegionSizeX / 2f, scene.RegionInfo.RegionSizeY / 2f, 0f);
188 188
189 // Zero can never be a valid user id 189 // Zero can never be a valid user id