4 files changed, 44 insertions, 50 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index c23cea5..ed3e516 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -176,44 +176,44 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
                     stream = response.GetResponseStream();
                     if (stream != null)
                     {
-                        Bitmap image = new Bitmap(stream);
-                        Size newsize;
-
-                        // TODO: make this a bit less hard coded
-                        if ((image.Height < 64) && (image.Width < 64))
-                        {
-                            newsize = new Size(32, 32);
-                        }
-                        else if ((image.Height < 128) && (image.Width < 128))
-                        {
-                            newsize = new Size(64, 64);
-                        }
-                        else if ((image.Height < 256) && (image.Width < 256))
-                        {
-                            newsize = new Size(128, 128);
-                        }
-                        else if ((image.Height < 512 && image.Width < 512))
-                        {
-                            newsize = new Size(256, 256);
-                        }
-                        else if ((image.Height < 1024 && image.Width < 1024))
-                        {
-                            newsize = new Size(512, 512);
-                        }
-                        else
-                        {
-                            newsize = new Size(1024, 1024);
-                        }
-
-                        Bitmap resize = new Bitmap(image, newsize);
-                        
                         try
                         {
+                            Bitmap image = new Bitmap(stream);
+                            Size newsize;
+
+                            // TODO: make this a bit less hard coded
+                            if ((image.Height < 64) && (image.Width < 64))
+                            {
+                                newsize = new Size(32, 32);
+                            }
+                            else if ((image.Height < 128) && (image.Width < 128))
+                            {
+                                newsize = new Size(64, 64);
+                            }
+                            else if ((image.Height < 256) && (image.Width < 256))
+                            {
+                                newsize = new Size(128, 128);
+                            }
+                            else if ((image.Height < 512 && image.Width < 512))
+                            {
+                                newsize = new Size(256, 256);
+                            }
+                            else if ((image.Height < 1024 && image.Width < 1024))
+                            {
+                                newsize = new Size(512, 512);
+                            }
+                            else
+                            {
+                                newsize = new Size(1024, 1024);
+                            }
+
+                            Bitmap resize = new Bitmap(image, newsize);
+
                             imageJ2000 = OpenJPEG.EncodeFromImage(resize, true);
                         } 
                         catch (Exception)
                         {
-                            m_log.Error("[LOADIMAGEURLMODULE]: OpenJpeg Encode Failed.  Empty byte data returned!");
+                            m_log.Error("[LOADIMAGEURLMODULE]: OpenJpeg Conversion Failed.  Empty byte data returned!");
                         }
                     }
                     else
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 34205e3..bd01bb9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -261,7 +261,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public  InventoryItemBase GetItem(InventoryItemBase item)
         {
-            m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID);
+            //m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetItem {0}", item.ID);
             if (item == null)
                 return null;
 
@@ -272,7 +272,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
 
         public  InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
-            m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID);
+            //m_log.DebugFormat("[XINVENTORY CONNECTOR]: GetFolder {0}", folder.ID);
             if (folder == null)
                 return null;
 
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)