diff options
| author | Diva Canto | 2012-09-15 19:35:33 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-15 19:35:33 -0700 |
| commit | daa4745fb785d30de256f04c763bfd6478ea2238 (patch) | |
| tree | a68b49adb21eb5902f0e3a9687878e6c6db5e014 /OpenSim/Region/Application | |
| parent | More on HG2.0: added the possibility of controlling the appearance that avies... (diff) | |
| parent | BulletSim: update DLLs and SOs and remove some debugging code. (diff) | |
| download | opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.zip opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.tar.gz opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.tar.bz2 opensim-SC-daa4745fb785d30de256f04c763bfd6478ea2238.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index ed339fd..c3c612f 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -292,7 +292,7 @@ namespace OpenSim | |||
| 292 | 292 | ||
| 293 | m_console.Commands.AddCommand("Archiving", false, "save oar", | 293 | m_console.Commands.AddCommand("Archiving", false, "save oar", |
| 294 | //"save oar [-v|--version=<N>] [-p|--profile=<url>] [<OAR path>]", | 294 | //"save oar [-v|--version=<N>] [-p|--profile=<url>] [<OAR path>]", |
| 295 | "save oar [-h|--home=<url>] [--noassets] [--publish] [--perm=<permissions>] [<OAR path>]", | 295 | "save oar [-h|--home=<url>] [--noassets] [--publish] [--perm=<permissions>] [--all] [<OAR path>]", |
| 296 | "Save a region's data to an OAR archive.", | 296 | "Save a region's data to an OAR archive.", |
| 297 | // "-v|--version=<N> generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine | 297 | // "-v|--version=<N> generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine |
| 298 | "-h|--home=<url> adds the url of the profile service to the saved user information.\n" | 298 | "-h|--home=<url> adds the url of the profile service to the saved user information.\n" |
| @@ -302,6 +302,7 @@ namespace OpenSim | |||
| 302 | + " this is useful if you're making oars generally available that might be reloaded to the same grid from which you published\n" | 302 | + " this is useful if you're making oars generally available that might be reloaded to the same grid from which you published\n" |
| 303 | + "--perm=<permissions> stops objects with insufficient permissions from being saved to the OAR.\n" | 303 | + "--perm=<permissions> stops objects with insufficient permissions from being saved to the OAR.\n" |
| 304 | + " <permissions> can contain one or more of these characters: \"C\" = Copy, \"T\" = Transfer\n" | 304 | + " <permissions> can contain one or more of these characters: \"C\" = Copy, \"T\" = Transfer\n" |
| 305 | + "--all saves all the regions in the simulator, instead of just the current region.\n" | ||
| 305 | + "The OAR path must be a filesystem path." | 306 | + "The OAR path must be a filesystem path." |
| 306 | + " If this is not given then the oar is saved to region.oar in the current directory.", | 307 | + " If this is not given then the oar is saved to region.oar in the current directory.", |
| 307 | SaveOar); | 308 | SaveOar); |