From 9f5ab3b965b1a3324918b7b2267c24709d42919b Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 2 Nov 2010 12:05:24 -0700
Subject: Old deserialization can't deal with commas in flag fields. Making use
 of -version option on save oar command. Bumped archives version to 0.5;
 version < 0.5 generates flag fields without commas. Everything else is
 identical.

---
 .../World/Archiver/ArchiveWriteRequestExecution.cs    |  7 ++-----
 .../World/Archiver/ArchiveWriteRequestPreparation.cs  | 19 ++++++++-----------
 2 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World')

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
index c062833..f8a599a 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
@@ -137,16 +137,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
 
             m_log.InfoFormat("[ARCHIVER]: Added terrain information to archive.");
 
-            Dictionary<string, object> serializationOptions = new Dictionary<string, object>();
-//            if (m_options.ContainsKey("version") && (string)m_options["version"] == "0")
-//                serializationOptions["old-guids"] = true;
-            
+           
             // Write out scene object metadata
             foreach (SceneObjectGroup sceneObject in m_sceneObjects)
             {
                 //m_log.DebugFormat("[ARCHIVER]: Saving {0} {1}, {2}", entity.Name, entity.UUID, entity.GetType());
 
-                string serializedObject = m_serialiser.SerializeGroupToXml2(sceneObject, serializationOptions);
+                string serializedObject = m_serialiser.SerializeGroupToXml2(sceneObject, m_options);
                 m_archiveWriter.WriteFile(ArchiveHelpers.CreateObjectPath(sceneObject), serializedObject);
             }
 
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
index 3182079..0567a82 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs
@@ -187,20 +187,17 @@ namespace OpenSim.Region.CoreModules.World.Archiver
         /// <returns></returns>
         public static string Create0p2ControlFile(Dictionary<string, object> options)
         {
-            int majorVersion = 0, minorVersion = 4;
-            
-            /*
-            if (options.ContainsKey("version") && (string)options["version"] == "0")
-            {
-                majorVersion = 0;
-                minorVersion = 3;
-            }
-            else
+            int majorVersion = 0, minorVersion = 5;
+
+            if (options.ContainsKey("version"))
             {
-                majorVersion = 1;
                 minorVersion = 0;
+                string[] parts = options["version"].ToString().Split('.');
+                if (parts.Length >= 1)
+                    majorVersion = Int32.Parse(parts[0]);
+                if (parts.Length >= 2)
+                    minorVersion = Int32.Parse(parts[1]);
             }
-            */
             
             m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion);
 //            if (majorVersion == 1)
-- 
cgit v1.1