diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 0699407..f2d487e 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
58 | /// <summary> | 58 | /// <summary> |
59 | /// The maximum major version of OAR that we can write. | 59 | /// The maximum major version of OAR that we can write. |
60 | /// </summary> | 60 | /// </summary> |
61 | public static int MAX_MAJOR_VERSION = 1; | 61 | public static int MAX_MAJOR_VERSION = 0; |
62 | 62 | ||
63 | protected Scene m_scene; | 63 | protected Scene m_scene; |
64 | protected Stream m_saveStream; | 64 | protected Stream m_saveStream; |
@@ -206,37 +206,37 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
206 | /// <returns></returns> | 206 | /// <returns></returns> |
207 | public static string CreateControlFile(Dictionary<string, object> options) | 207 | public static string CreateControlFile(Dictionary<string, object> options) |
208 | { | 208 | { |
209 | int majorVersion = MAX_MAJOR_VERSION, minorVersion = 0; | 209 | int majorVersion = MAX_MAJOR_VERSION, minorVersion = 5; |
210 | 210 | // | |
211 | if (options.ContainsKey("version")) | 211 | // if (options.ContainsKey("version")) |
212 | { | 212 | // { |
213 | string[] parts = options["version"].ToString().Split('.'); | 213 | // string[] parts = options["version"].ToString().Split('.'); |
214 | if (parts.Length >= 1) | 214 | // if (parts.Length >= 1) |
215 | { | 215 | // { |
216 | majorVersion = Int32.Parse(parts[0]); | 216 | // majorVersion = Int32.Parse(parts[0]); |
217 | 217 | // | |
218 | if (parts.Length >= 2) | 218 | // if (parts.Length >= 2) |
219 | minorVersion = Int32.Parse(parts[1]); | 219 | // minorVersion = Int32.Parse(parts[1]); |
220 | } | 220 | // } |
221 | } | 221 | // } |
222 | 222 | // | |
223 | if (majorVersion < MIN_MAJOR_VERSION || majorVersion > MAX_MAJOR_VERSION) | 223 | // if (majorVersion < MIN_MAJOR_VERSION || majorVersion > MAX_MAJOR_VERSION) |
224 | { | 224 | // { |
225 | throw new Exception( | 225 | // throw new Exception( |
226 | string.Format( | 226 | // string.Format( |
227 | "OAR version number for save must be between {0} and {1}", | 227 | // "OAR version number for save must be between {0} and {1}", |
228 | MIN_MAJOR_VERSION, MAX_MAJOR_VERSION)); | 228 | // MIN_MAJOR_VERSION, MAX_MAJOR_VERSION)); |
229 | } | 229 | // } |
230 | else if (majorVersion == MAX_MAJOR_VERSION) | 230 | // else if (majorVersion == MAX_MAJOR_VERSION) |
231 | { | 231 | // { |
232 | // Force 1.0 | 232 | // // Force 1.0 |
233 | minorVersion = 0; | 233 | // minorVersion = 0; |
234 | } | 234 | // } |
235 | else if (majorVersion == MIN_MAJOR_VERSION) | 235 | // else if (majorVersion == MIN_MAJOR_VERSION) |
236 | { | 236 | // { |
237 | // Force 0.4 | 237 | // // Force 0.4 |
238 | minorVersion = 4; | 238 | // minorVersion = 4; |
239 | } | 239 | // } |
240 | 240 | ||
241 | m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion); | 241 | m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion); |
242 | //if (majorVersion == 1) | 242 | //if (majorVersion == 1) |