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
                                           LoadOar);
 
             m_console.Commands.AddCommand("region", false, "save oar",
-                                          "save oar [--version=<version>] [<OAR path>]",
+                                          "save oar [<OAR path>]",
                                           "Save a region's data to an OAR archive.",
                                           "The OAR path must be a filesystem path."
-                                          + "  If this is not given then the oar is saved to region.oar in the current directory." + Environment.NewLine
-                                          + "--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",
+                                          + "  If this is not given then the oar is saved to region.oar in the current directory.",
                                           SaveOar);
 
             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
             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;
+//            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)
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
         /// <returns></returns>
         public static string Create0p2ControlFile(Dictionary<string, object> options)
         {
-            int majorVersion, minorVersion;
+            int majorVersion = 0, minorVersion = 4;
+            
+            /*
             if (options.ContainsKey("version") && (string)options["version"] == "0")
             {
                 majorVersion = 0;
@@ -197,12 +199,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 majorVersion = 1;
                 minorVersion = 0;
             }  
+            */
             
             m_log.InfoFormat("[ARCHIVER]: Creating version {0}.{1} OAR", majorVersion, minorVersion);
-            if (majorVersion == 1)
-            {
-                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");                
-            }
+//            if (majorVersion == 1)
+//            {
+//                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");                
+//            }
+            
             
             StringWriter sw = new StringWriter();
             XmlTextWriter xtw = new XmlTextWriter(sw);