diff options
author | Melanie | 2010-12-12 01:20:46 +0000 |
---|---|---|
committer | Melanie | 2010-12-12 01:20:46 +0000 |
commit | 8aa63093b118f257eff87c003e668249c34f5162 (patch) | |
tree | a5ea5448482d899729c29079ed0dab8394bb9be4 /OpenSim/Region/Application | |
parent | Fix border fence for physicals. Fix llRotLookAt() for Vehicles. (diff) | |
parent | Revert "Another stab at mantis #5256" (diff) | |
download | opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.zip opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.gz opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.bz2 opensim-SC_OLD-8aa63093b118f257eff87c003e668249c34f5162.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index feaea16..300d8a6 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -265,10 +265,11 @@ namespace OpenSim | |||
265 | LoadOar); | 265 | LoadOar); |
266 | 266 | ||
267 | m_console.Commands.AddCommand("region", false, "save oar", | 267 | m_console.Commands.AddCommand("region", false, "save oar", |
268 | "save oar [-v|--version=<N>] [-p|--profile=<url>] [<OAR path>]", | 268 | //"save oar [-v|--version=<N>] [-p|--profile=<url>] [<OAR path>]", |
269 | "save oar [-p|--profile=<url>] [<OAR path>]", | ||
269 | "Save a region's data to an OAR archive.", | 270 | "Save a region's data to an OAR archive.", |
270 | "-v|--version=<N> generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine | 271 | // "-v|--version=<N> generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine |
271 | + "-p|--profile=<url> adds the url of the profile service to the saved user information" + Environment.NewLine | 272 | "-p|--profile=<url> adds the url of the profile service to the saved user information" + Environment.NewLine |
272 | + "The OAR path must be a filesystem path." | 273 | + "The OAR path must be a filesystem path." |
273 | + " If this is not given then the oar is saved to region.oar in the current directory.", | 274 | + " If this is not given then the oar is saved to region.oar in the current directory.", |
274 | SaveOar); | 275 | SaveOar); |