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/Application/OpenSim.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/Application') diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 1e36853..a609b77 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs @@ -267,18 +267,18 @@ namespace OpenSim m_console.Commands.AddCommand("Archiving", false, "load oar", "load oar [--merge] [--skip-assets]" - + " [--forceterrain] [--forceparcels]" - + " [--rotation degrees] [--rotationCenter \"\"]" + + " [--force-terrain] [--force-parcels]" + + " [--rotation degrees] [--rotation-center \"\"]" + " [--displacement \"\"]" + " []", "Load a region's data from an OAR archive.", "--merge will merge the OAR with the existing scene (suppresses terrain and parcel info loading)." + Environment.NewLine - + "--skip-assets will load the OAR but ignore the assets it contains." + Environment.NewLine - + "--displacement will add this value to the position of every object loaded" + Environment.NewLine - + "--forceterrain forces the loading of terrain from the oar (undoes suppression done by --merge)" + Environment.NewLine - + "--forceparcels forces the loading of parcels from the oar (undoes suppression done by --merge)" + Environment.NewLine - + "--rotation specified rotation to be applied to the oar. Specified in degrees." + Environment.NewLine - + "--rotationcenter Location (relative to original OAR) to apply rotation. Default is <128,128,0>" + Environment.NewLine + + "--skip-assets will load the OAR but ignore the assets it contains." + Environment.NewLine + + "--displacement will add this value to the position of every object loaded" + Environment.NewLine + + "--force-terrain forces the loading of terrain from the oar (undoes suppression done by --merge)" + Environment.NewLine + + "--force-parcels forces the loading of parcels from the oar (undoes suppression done by --merge)" + Environment.NewLine + + "--rotation specified rotation to be applied to the oar. Specified in degrees." + Environment.NewLine + + "--rotation-center Location (relative to original OAR) to apply rotation. Default is <128,128,0>" + Environment.NewLine + "The path can be either a filesystem location or a URI." + " If this is not given then the command looks for an OAR named region.oar in the current directory.", LoadOar); -- cgit v1.1