diff options
author | Justin Clark-Casey (justincc) | 2010-11-20 02:32:12 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-11-20 02:32:12 +0000 |
commit | 2c7be7130ea3ebca59b4d6d071267adcae55cb96 (patch) | |
tree | 3aabb33726643d026e1cfa023f702f5bb7ad2971 /OpenSim/Region/Application/OpenSim.cs | |
parent | small refactor: reuse existing commandLine string rather than calling cmdline... (diff) | |
download | opensim-SC_OLD-2c7be7130ea3ebca59b4d6d071267adcae55cb96.zip opensim-SC_OLD-2c7be7130ea3ebca59b4d6d071267adcae55cb96.tar.gz opensim-SC_OLD-2c7be7130ea3ebca59b4d6d071267adcae55cb96.tar.bz2 opensim-SC_OLD-2c7be7130ea3ebca59b4d6d071267adcae55cb96.tar.xz |
Bump oar version to 1.0 from 0.5
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 2c920f6..dd2e859 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -265,9 +265,9 @@ 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] [<OAR path>]", | 268 | "save oar [-v|--version=N] [<OAR path>]", |
269 | "Save a region's data to an OAR archive.", | 269 | "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 | 270 | "-v|--version=N generates scene objects as per older versions of the serialization (e.g. -v=0)" + Environment.NewLine |
271 | + "The OAR path must be a filesystem path." | 271 | + "The OAR path must be a filesystem path." |
272 | + " If this is not given then the oar is saved to region.oar in the current directory.", | 272 | + " If this is not given then the oar is saved to region.oar in the current directory.", |
273 | SaveOar); | 273 | SaveOar); |