diff options
| author | Justin Clark-Casey (justincc) | 2014-10-11 00:02:18 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-10-11 00:03:05 +0100 |
| commit | 5db3f08871b030ad0e14133eafb5f3a4c0e534df (patch) | |
| tree | e9e1626b7546796d9855a936ee17f1c5cd942786 /OpenSim | |
| parent | Give ability to define constants that may be used throught the configuration (diff) | |
| download | opensim-SC_OLD-5db3f08871b030ad0e14133eafb5f3a4c0e534df.zip opensim-SC_OLD-5db3f08871b030ad0e14133eafb5f3a4c0e534df.tar.gz opensim-SC_OLD-5db3f08871b030ad0e14133eafb5f3a4c0e534df.tar.bz2 opensim-SC_OLD-5db3f08871b030ad0e14133eafb5f3a4c0e534df.tar.xz | |
minor: add --default-user option to "load oar" help long description. Do other small tidies of "load oar" console command help.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index d5ea3ef..3db1615 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -268,23 +268,24 @@ namespace OpenSim | |||
| 268 | 268 | ||
| 269 | m_console.Commands.AddCommand("Archiving", false, "load oar", | 269 | m_console.Commands.AddCommand("Archiving", false, "load oar", |
| 270 | "load oar [--merge] [--skip-assets]" | 270 | "load oar [--merge] [--skip-assets]" |
| 271 | + " [--default-user \"User Name\"]" | ||
| 271 | + " [--force-terrain] [--force-parcels]" | 272 | + " [--force-terrain] [--force-parcels]" |
| 272 | + " [--no-objects]" | 273 | + " [--no-objects]" |
| 273 | + " [--rotation degrees] [--rotation-center \"<x,y,z>\"]" | 274 | + " [--rotation degrees] [--rotation-center \"<x,y,z>\"]" |
| 274 | + " [--displacement \"<x,y,z>\"]" | 275 | + " [--displacement \"<x,y,z>\"]" |
| 275 | + " [--default-user \"User Name\"]" | ||
| 276 | + " [<OAR path>]", | 276 | + " [<OAR path>]", |
| 277 | "Load a region's data from an OAR archive.", | 277 | "Load a region's data from an OAR archive.", |
| 278 | "--merge will merge the OAR with the existing scene (suppresses terrain and parcel info loading)." + Environment.NewLine | 278 | "--merge will merge the OAR with the existing scene (suppresses terrain and parcel info loading).\n" |
| 279 | + "--skip-assets will load the OAR but ignore the assets it contains." + Environment.NewLine | 279 | + "--default-user will use this user for any objects with an owner whose UUID is not found in the grid.\n" |
| 280 | + "--displacement will add this value to the position of every object loaded" + Environment.NewLine | 280 | + "--displacement will add this value to the position of every object loaded.\n" |
| 281 | + "--force-terrain forces the loading of terrain from the oar (undoes suppression done by --merge)" + Environment.NewLine | 281 | + "--force-terrain forces the loading of terrain from the oar (undoes suppression done by --merge).\n" |
| 282 | + "--force-parcels forces the loading of parcels from the oar (undoes suppression done by --merge)" + Environment.NewLine | 282 | + "--force-parcels forces the loading of parcels from the oar (undoes suppression done by --merge).\n" |
| 283 | + "--rotation specified rotation to be applied to the oar. Specified in degrees." + Environment.NewLine | 283 | + "--no-objects suppresses the addition of any objects (good for loading only the terrain).\n" |
| 284 | + "--rotation-center Location (relative to original OAR) to apply rotation. Default is <128,128,0>" + Environment.NewLine | 284 | + "--rotation specified rotation to be applied to the oar. Specified in degrees.\n" |
| 285 | + "--no-objects suppresses the addition of any objects (good for loading only the terrain)" + Environment.NewLine | 285 | + "--rotation-center Location (relative to original OAR) to apply rotation. Default is <128,128,0>.\n" |
| 286 | + "The path can be either a filesystem location or a URI." | 286 | + "--skip-assets will load the OAR but ignore the assets it contains.\n\n" |
| 287 | + " If this is not given then the command looks for an OAR named region.oar in the current directory.", | 287 | + "The path can be either a filesystem location or a URI.\n" |
| 288 | + " If this is not given then the command looks for an OAR named region.oar in the current directory.", | ||
| 288 | LoadOar); | 289 | LoadOar); |
| 289 | 290 | ||
| 290 | m_console.Commands.AddCommand("Archiving", false, "save oar", | 291 | m_console.Commands.AddCommand("Archiving", false, "save oar", |