diff options
author | Justin Clark-Casey (justincc) | 2011-05-26 01:37:15 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-05-26 01:37:15 +0100 |
commit | c7e46e8a51de7d137182956f1ec033250edc0da5 (patch) | |
tree | c2e5900437c4e89525873bdc7a0675bdb15dd602 /OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |
parent | fix bug where outfit folder links could not be deleted (diff) | |
download | opensim-SC_OLD-c7e46e8a51de7d137182956f1ec033250edc0da5.zip opensim-SC_OLD-c7e46e8a51de7d137182956f1ec033250edc0da5.tar.gz opensim-SC_OLD-c7e46e8a51de7d137182956f1ec033250edc0da5.tar.bz2 opensim-SC_OLD-c7e46e8a51de7d137182956f1ec033250edc0da5.tar.xz |
Bump OAR file format version up to 0.7 for this development cycle.
This adds a <assets_included>true|false</assets_included> element to the oar control file, though this is not used on reloading at this time.
This addition is backward compatible with previous opensim releases
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 6a86dfe..3d073bf 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
49 | public class ArchiveWriteRequestPreparation | 49 | public class ArchiveWriteRequestPreparation |
50 | { | 50 | { |
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
53 | /// <summary> | 53 | /// <summary> |
54 | /// The minimum major version of OAR that we can write. | 54 | /// The minimum major version of OAR that we can write. |
55 | /// </summary> | 55 | /// </summary> |
@@ -216,7 +216,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
216 | /// <returns></returns> | 216 | /// <returns></returns> |
217 | public string CreateControlFile(Dictionary<string, object> options) | 217 | public string CreateControlFile(Dictionary<string, object> options) |
218 | { | 218 | { |
219 | int majorVersion = MAX_MAJOR_VERSION, minorVersion = 6; | 219 | int majorVersion = MAX_MAJOR_VERSION, minorVersion = 7; |
220 | // | 220 | // |
221 | // if (options.ContainsKey("version")) | 221 | // if (options.ContainsKey("version")) |
222 | // { | 222 | // { |