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.

1 files changed, 8 insertions, 11 deletions

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)