diff options
author | Robert Adams | 2014-02-02 12:21:18 -0800 |
---|---|---|
committer | Robert Adams | 2014-02-02 12:21:18 -0800 |
commit | 2a4dd34616bdb0641f841766dfd15c4c784d3549 (patch) | |
tree | 4c01fa16ca4b96218ff4ba5d7026f659a6056334 /OpenSim/Region/Application/OpenSim.cs | |
parent | Implement terrain merging in TerrainChannel. (diff) | |
download | opensim-SC-2a4dd34616bdb0641f841766dfd15c4c784d3549.zip opensim-SC-2a4dd34616bdb0641f841766dfd15c4c784d3549.tar.gz opensim-SC-2a4dd34616bdb0641f841766dfd15c4c784d3549.tar.bz2 opensim-SC-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 '')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 16 |
1 files changed, 8 insertions, 8 deletions
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 | |||
267 | 267 | ||
268 | m_console.Commands.AddCommand("Archiving", false, "load oar", | 268 | m_console.Commands.AddCommand("Archiving", false, "load oar", |
269 | "load oar [--merge] [--skip-assets]" | 269 | "load oar [--merge] [--skip-assets]" |
270 | + " [--forceterrain] [--forceparcels]" | 270 | + " [--force-terrain] [--force-parcels]" |
271 | + " [--rotation degrees] [--rotationCenter \"<x,y,z>\"]" | 271 | + " [--rotation degrees] [--rotation-center \"<x,y,z>\"]" |
272 | + " [--displacement \"<x,y,z>\"]" | 272 | + " [--displacement \"<x,y,z>\"]" |
273 | + " [<OAR path>]", | 273 | + " [<OAR path>]", |
274 | "Load a region's data from an OAR archive.", | 274 | "Load a region's data from an OAR archive.", |
275 | "--merge will merge the OAR with the existing scene (suppresses terrain and parcel info loading)." + Environment.NewLine | 275 | "--merge will merge the OAR with the existing scene (suppresses terrain and parcel info loading)." + Environment.NewLine |
276 | + "--skip-assets will load the OAR but ignore the assets it contains." + Environment.NewLine | 276 | + "--skip-assets will load the OAR but ignore the assets it contains." + Environment.NewLine |
277 | + "--displacement will add this value to the position of every object loaded" + Environment.NewLine | 277 | + "--displacement will add this value to the position of every object loaded" + Environment.NewLine |
278 | + "--forceterrain forces the loading of terrain from the oar (undoes suppression done by --merge)" + Environment.NewLine | 278 | + "--force-terrain forces the loading of terrain from the oar (undoes suppression done by --merge)" + Environment.NewLine |
279 | + "--forceparcels forces the loading of parcels from the oar (undoes suppression done by --merge)" + Environment.NewLine | 279 | + "--force-parcels forces the loading of parcels from the oar (undoes suppression done by --merge)" + Environment.NewLine |
280 | + "--rotation specified rotation to be applied to the oar. Specified in degrees." + Environment.NewLine | 280 | + "--rotation specified rotation to be applied to the oar. Specified in degrees." + Environment.NewLine |
281 | + "--rotationcenter Location (relative to original OAR) to apply rotation. Default is <128,128,0>" + Environment.NewLine | 281 | + "--rotation-center Location (relative to original OAR) to apply rotation. Default is <128,128,0>" + Environment.NewLine |
282 | + "The path can be either a filesystem location or a URI." | 282 | + "The path can be either a filesystem location or a URI." |
283 | + " If this is not given then the command looks for an OAR named region.oar in the current directory.", | 283 | + " If this is not given then the command looks for an OAR named region.oar in the current directory.", |
284 | LoadOar); | 284 | LoadOar); |