aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs14
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index d21efed..43789af 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -186,7 +186,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver
186 /// <returns></returns> 186 /// <returns></returns>
187 public static string Create0p2ControlFile(Dictionary<string, object> options) 187 public static string Create0p2ControlFile(Dictionary<string, object> options)
188 { 188 {
189 int majorVersion, minorVersion; 189 int majorVersion = 0, minorVersion = 4;
190
191 /*
190 if (options.ContainsKey("version") && (string)options["version"] == "0") 192 if (options.ContainsKey("version") && (string)options["version"] == "0")
191 { 193 {
192 majorVersion = 0; 194 majorVersion = 0;
@@ -197,12 +199,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
197 majorVersion = 1; 199 majorVersion = 1;
198 minorVersion = 0; 200 minorVersion = 0;
199 } 201 }
202 */
200 203
201 m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion); 204 m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion);
202 if (majorVersion == 1) 205// if (majorVersion == 1)
203 { 206// {
204 m_log.WarnFormat("[ARCHIVER]: Please be aware that version 1.0 OARs are not compatible with OpenSim 0.7.0.2 and earlier. Please use the --version=0 option if you want to produce a compatible OAR"); 207// m_log.WarnFormat("[ARCHIVER]: Please be aware that version 1.0 OARs are not compatible with OpenSim 0.7.0.2 and earlier. Please use the --version=0 option if you want to produce a compatible OAR");
205 } 208// }
209
206 210
207 StringWriter sw = new StringWriter(); 211 StringWriter sw = new StringWriter();
208 XmlTextWriter xtw = new XmlTextWriter(sw); 212 XmlTextWriter xtw = new XmlTextWriter(sw);