aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-10-15 23:20:03 -0700
committeropensim mirror account2010-10-15 23:20:03 -0700
commit6998f9268bb61548beb08ec47c85434b85f0bf93 (patch)
tree1b357a3151dba9bfb1881ca690317f319b01a336
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentRip out version option since it turns out that the changed object serializati... (diff)
downloadopensim-SC_OLD-6998f9268bb61548beb08ec47c85434b85f0bf93.zip
opensim-SC_OLD-6998f9268bb61548beb08ec47c85434b85f0bf93.tar.gz
opensim-SC_OLD-6998f9268bb61548beb08ec47c85434b85f0bf93.tar.bz2
opensim-SC_OLD-6998f9268bb61548beb08ec47c85434b85f0bf93.tar.xz
Merge branch 'master' of /var/git/opensim/
-rw-r--r--OpenSim/Region/Application/OpenSim.cs5
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs14
3 files changed, 13 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 66ffd76..7a0142f 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -264,11 +264,10 @@ namespace OpenSim
264 LoadOar); 264 LoadOar);
265 265
266 m_console.Commands.AddCommand("region", false, "save oar", 266 m_console.Commands.AddCommand("region", false, "save oar",
267 "save oar [--version=<version>] [<OAR path>]", 267 "save oar [<OAR path>]",
268 "Save a region's data to an OAR archive.", 268 "Save a region's data to an OAR archive.",
269 "The OAR path must be a filesystem path." 269 "The OAR path must be a filesystem path."
270 + " If this is not given then the oar is saved to region.oar in the current directory." + Environment.NewLine 270 + " If this is not given then the oar is saved to region.oar in the current directory.",
271 + "--version=0 produces old version 0.3 OARs that are compatible with OpenSim 0.7.0.2 and earlier. Current OAR version is 1.0. This version of OpenSim can load any OAR later than version 0.3",
272 SaveOar); 271 SaveOar);
273 272
274 m_console.Commands.AddCommand("region", false, "edit scale", 273 m_console.Commands.AddCommand("region", false, "edit scale",
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index 79bec56..c062833 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -138,8 +138,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
138 m_log.InfoFormat("[ARCHIVER]: Added terrain information to archive."); 138 m_log.InfoFormat("[ARCHIVER]: Added terrain information to archive.");
139 139
140 Dictionary<string, object> serializationOptions = new Dictionary<string, object>(); 140 Dictionary<string, object> serializationOptions = new Dictionary<string, object>();
141 if (m_options.ContainsKey("version") && (string)m_options["version"] == "0") 141// if (m_options.ContainsKey("version") && (string)m_options["version"] == "0")
142 serializationOptions["old-guids"] = true; 142// serializationOptions["old-guids"] = true;
143 143
144 // Write out scene object metadata 144 // Write out scene object metadata
145 foreach (SceneObjectGroup sceneObject in m_sceneObjects) 145 foreach (SceneObjectGroup sceneObject in m_sceneObjects)
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);