6 files changed, 280 insertions, 107 deletions

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index bf0ff75..11eca12 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -41,6 +41,7 @@ using OpenSim.Framework.Serialization.External;
 using OpenSim.Region.CoreModules.World.Terrain;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.Framework.Scenes.Serialization;
 using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.World.Archiver
@@ -266,7 +267,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
                 }
                 */
 
-                SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
+                SceneObjectGroup sceneObject = SceneObjectSerializer.FromXml2Format(serialisedSceneObject);
+//                SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
 
                 bool isTelehub = (sceneObject.UUID == oldTelehubUUID);
 
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 394ca27..5deaf52 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -292,6 +292,59 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
         }
 
         /// <summary>
+        /// Test loading an OpenSim Region Archive where the scene object parts are not ordered by link number (e.g.
+        /// 2 can come after 3).
+        /// </summary>
+        [Test]
+        public void TestLoadOarUnorderedParts()
+        {
+            TestHelpers.InMethod();
+
+            UUID ownerId = TestHelpers.ParseTail(0xaaaa);
+
+            MemoryStream archiveWriteStream = new MemoryStream();
+            TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
+
+            tar.WriteFile(
+                ArchiveConstants.CONTROL_FILE_PATH,
+                new ArchiveWriteRequestPreparation(null, (Stream)null, Guid.Empty).CreateControlFile(new Dictionary<string, Object>()));
+
+            SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, ownerId, "obj1-", 0x11);
+            SceneObjectPart sop2
+                = SceneHelpers.CreateSceneObjectPart("obj1-Part2", TestHelpers.ParseTail(0x12), ownerId);
+            SceneObjectPart sop3
+                = SceneHelpers.CreateSceneObjectPart("obj1-Part3", TestHelpers.ParseTail(0x13), ownerId);
+
+            // Add the parts so they will be written out in reverse order to the oar
+            sog1.AddPart(sop3);
+            sop3.LinkNum = 3;
+            sog1.AddPart(sop2);
+            sop2.LinkNum = 2;
+
+            tar.WriteFile(
+                ArchiveConstants.CreateOarObjectPath(sog1.Name, sog1.UUID, sog1.AbsolutePosition),
+                SceneObjectSerializer.ToXml2Format(sog1));
+
+            tar.Close();
+
+            MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
+
+            lock (this)
+            {
+                m_scene.EventManager.OnOarFileLoaded += LoadCompleted;
+                m_archiverModule.DearchiveRegion(archiveReadStream);
+            }
+
+            Assert.That(m_lastErrorMessage, Is.Null);
+
+            SceneObjectPart part2 = m_scene.GetSceneObjectPart("obj1-Part2");
+            Assert.That(part2.LinkNum, Is.EqualTo(2));
+
+            SceneObjectPart part3 = m_scene.GetSceneObjectPart("obj1-Part3");
+            Assert.That(part3.LinkNum, Is.EqualTo(3));
+        }
+
+        /// <summary>
         /// Test loading an OpenSim Region Archive.
         /// </summary>
         [Test]
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index 5e928f3..830d9cb 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -29,8 +29,10 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 using log4net;
 using Mono.Addins;
+using NDesk.Options;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -78,25 +80,31 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_scene = scene;
             m_console = MainConsole.Instance;
 
-            m_console.Commands.AddCommand("Objects", false, "delete object owner",
-                                          "delete object owner <UUID>",
-                                          "Delete a scene object by owner", HandleDeleteObject);
+            m_console.Commands.AddCommand(
+                "Objects", false, "delete object owner",
+                "delete object owner <UUID>",
+                "Delete a scene object by owner", HandleDeleteObject);
 
-            m_console.Commands.AddCommand("Objects", false, "delete object creator",
-                                          "delete object creator <UUID>",
-                                          "Delete a scene object by creator", HandleDeleteObject);
+            m_console.Commands.AddCommand(
+                "Objects", false, "delete object creator",
+                "delete object creator <UUID>",
+                "Delete a scene object by creator", HandleDeleteObject);
 
-            m_console.Commands.AddCommand("Objects", false, "delete object uuid",
-                                          "delete object uuid <UUID>",
-                                          "Delete a scene object by uuid", HandleDeleteObject);
+            m_console.Commands.AddCommand(
+                "Objects", false, "delete object uuid",
+                "delete object uuid <UUID>",
+                "Delete a scene object by uuid", HandleDeleteObject);
 
-            m_console.Commands.AddCommand("Objects", false, "delete object name",
-                                          "delete object name <name>",
-                                          "Delete a scene object by name", HandleDeleteObject);
+            m_console.Commands.AddCommand(
+                "Objects", false, "delete object name",
+                "delete object name [--regex] <name>",
+                "Delete a scene object by name.\nIf --regex is specified then the name is treatead as a regular expression",
+                HandleDeleteObject);
 
-            m_console.Commands.AddCommand("Objects", false, "delete object outside",
-                                          "delete object outside",
-                                          "Delete all scene objects outside region boundaries", HandleDeleteObject);
+            m_console.Commands.AddCommand(
+                "Objects", false, "delete object outside",
+                "delete object outside",
+                "Delete all scene objects outside region boundaries", HandleDeleteObject);
 
             m_console.Commands.AddCommand(
                 "Objects",
@@ -109,8 +117,9 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 "Objects",
                 false,
                 "show object name",
-                "show object name <name>",
-                "Show details of scene objects with the given name", HandleShowObjectByName);
+                "show object name [--regex] <name>",
+                "Show details of scene objects with the given name.\nIf --regex is specified then the name is treatead as a regular expression",
+                HandleShowObjectByName);
 
             m_console.Commands.AddCommand(
                 "Objects",
@@ -123,8 +132,9 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 "Objects",
                 false,
                 "show part name",
-                "show part name <name>",
-                "Show details of scene object parts with the given name", HandleShowPartByName);
+                "show part name [--regex] <name>",
+                "Show details of scene object parts with the given name.\nIf --regex is specified then the name is treatead as a regular expression",
+                HandleShowPartByName);
         }
 
         public void RemoveRegion(Scene scene)
@@ -169,22 +179,38 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_console.OutputFormat(sb.ToString());
         }
 
-        private void HandleShowObjectByName(string module, string[] cmd)
+        private void HandleShowObjectByName(string module, string[] cmdparams)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
 
-            if (cmd.Length < 4)
+            bool useRegex = false;
+            OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
+
+            List<string> mainParams = options.Parse(cmdparams);
+
+            if (mainParams.Count < 4)
             {
-                m_console.OutputFormat("Usage: show object name <name>");
+                m_console.OutputFormat("Usage: show object name [--regex] <name>");
                 return;
             }
 
-            string name = cmd[3];
+            string name = mainParams[3];
 
             List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
+            Action<SceneObjectGroup> searchAction;
+
+            if (useRegex)
+            {
+                Regex nameRegex = new Regex(name);
+                searchAction = so => { if (nameRegex.IsMatch(so.Name)) { sceneObjects.Add(so); }};
+            }
+            else
+            {
+                searchAction = so => { if (so.Name == name) { sceneObjects.Add(so); }};
+            }
 
-            m_scene.ForEachSOG(so => { if (so.Name == name) { sceneObjects.Add(so); }});
+            m_scene.ForEachSOG(searchAction);
 
             if (sceneObjects.Count == 0)
             {
@@ -235,22 +261,39 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
             m_console.OutputFormat(sb.ToString());
         }
 
-        private void HandleShowPartByName(string module, string[] cmd)
+        private void HandleShowPartByName(string module, string[] cmdparams)
         {
             if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
                 return;
 
-            if (cmd.Length < 4)
+            bool useRegex = false;
+            OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
+
+            List<string> mainParams = options.Parse(cmdparams);
+
+            if (mainParams.Count < 4)
             {
-                m_console.OutputFormat("Usage: show part name <name>");
+                m_console.OutputFormat("Usage: show part name [--regex] <name>");
                 return;
             }
 
-            string name = cmd[3];
+            string name = mainParams[3];
 
             List<SceneObjectPart> parts = new List<SceneObjectPart>();
 
-            m_scene.ForEachSOG(so => so.ForEachPart(sop => { if (sop.Name == name) { parts.Add(sop); } }));
+            Action<SceneObjectGroup> searchAction;
+
+            if (useRegex)
+            {
+                Regex nameRegex = new Regex(name);
+                searchAction = so => so.ForEachPart(sop => { if (nameRegex.IsMatch(sop.Name)) { parts.Add(sop); } });
+            }
+            else
+            {
+                searchAction = so => so.ForEachPart(sop => { if (sop.Name == name) { parts.Add(sop); } });
+            }
+
+            m_scene.ForEachSOG(searchAction);
 
             if (parts.Count == 0)
             {
@@ -312,105 +355,169 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 o = cmd[3];
             }
 
-            List<SceneObjectGroup> deletes = new List<SceneObjectGroup>();
-
+            List<SceneObjectGroup> deletes = null;
             UUID match;
+            bool requireConfirmation = true;
 
             switch (mode)
             {
-            case "owner":
-                if (!UUID.TryParse(o, out match))
-                    return;
-
-                m_scene.ForEachSOG(delegate (SceneObjectGroup g)
-                {
-                    if (g.OwnerID == match && !g.IsAttachment)
-                        deletes.Add(g);
-                });
+                case "owner":
+                    if (!UUID.TryParse(o, out match))
+                        return;
 
-//                if (deletes.Count == 0)
-//                    m_console.OutputFormat("No objects were found with owner {0}", match);
+                    deletes = new List<SceneObjectGroup>();
 
-                break;
+                    m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+                    {
+                        if (g.OwnerID == match && !g.IsAttachment)
+                            deletes.Add(g);
+                    });
+        
+        //                if (deletes.Count == 0)
+        //                    m_console.OutputFormat("No objects were found with owner {0}", match);
+        
+                    break;
+        
+                case "creator":
+                    if (!UUID.TryParse(o, out match))
+                        return;
 
-            case "creator":
-                if (!UUID.TryParse(o, out match))
-                    return;
+                    deletes = new List<SceneObjectGroup>();
 
-                m_scene.ForEachSOG(delegate (SceneObjectGroup g)
-                {
-                    if (g.RootPart.CreatorID == match && !g.IsAttachment)
-                        deletes.Add(g);
-                });
+                    m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+                    {
+                        if (g.RootPart.CreatorID == match && !g.IsAttachment)
+                            deletes.Add(g);
+                    });
+        
+        //                if (deletes.Count == 0)
+        //                    m_console.OutputFormat("No objects were found with creator {0}", match);
+        
+                    break;
+        
+                case "uuid":
+                    if (!UUID.TryParse(o, out match))
+                        return;
 
-//                if (deletes.Count == 0)
-//                    m_console.OutputFormat("No objects were found with creator {0}", match);
+                    requireConfirmation = false;
+                    deletes = new List<SceneObjectGroup>();
+        
+                    m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+                    {
+                        if (g.UUID == match && !g.IsAttachment)
+                            deletes.Add(g);
+                    });
+        
+        //                if (deletes.Count == 0)
+        //                    m_console.OutputFormat("No objects were found with uuid {0}", match);
+        
+                    break;
+        
+                case "name":
+                    deletes = GetDeleteCandidatesByName(module, cmd);
+                    break;
+        
+                case "outside":
+                    deletes = new List<SceneObjectGroup>();
 
-                break;
+                    m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+                    {
+                        SceneObjectPart rootPart = g.RootPart;
+                        bool delete = false;
+        
+                        if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0)
+                        {
+                            delete = true;
+                        }
+                        else
+                        {
+                            ILandObject parcel
+                                = m_scene.LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y);
+        
+                            if (parcel == null || parcel.LandData.Name == "NO LAND")
+                                delete = true;
+                        }
+        
+                        if (delete && !g.IsAttachment && !deletes.Contains(g))
+                            deletes.Add(g);
+                    });
+        
+                    if (deletes.Count == 0)
+                        m_console.OutputFormat("No objects were found outside region bounds");
+        
+                    break;
 
-            case "uuid":
-                if (!UUID.TryParse(o, out match))
+                default:
+                    m_console.OutputFormat("Unrecognized mode {0}", mode);
                     return;
+            }
 
-                m_scene.ForEachSOG(delegate (SceneObjectGroup g)
-                {
-                    if (g.UUID == match && !g.IsAttachment)
-                        deletes.Add(g);
-                });
-
-//                if (deletes.Count == 0)
-//                    m_console.OutputFormat("No objects were found with uuid {0}", match);
-
-                break;
+            if (deletes == null || deletes.Count <= 0)
+                return;
 
-            case "name":
-                m_scene.ForEachSOG(delegate (SceneObjectGroup g)
+            if (requireConfirmation)
+            {
+                string response = MainConsole.Instance.CmdPrompt(
+                    string.Format(
+                        "Are you sure that you want to delete {0} objects from {1}",
+                        deletes.Count, m_scene.RegionInfo.RegionName),
+                    "n");
+    
+                if (response.ToLower() != "y")
                 {
-                    if (g.RootPart.Name == o && !g.IsAttachment)
-                        deletes.Add(g);
-                });
-
-//                if (deletes.Count == 0)
-//                    m_console.OutputFormat("No objects were found with name {0}", o);
+                    MainConsole.Instance.OutputFormat(
+                        "Aborting delete of {0} objects from {1}", deletes.Count, m_scene.RegionInfo.RegionName);
 
-                break;
+                    return;
+                }
+            }
 
-            case "outside":
-                m_scene.ForEachSOG(delegate (SceneObjectGroup g)
-                {
-                    SceneObjectPart rootPart = g.RootPart;
-                    bool delete = false;
+            m_console.OutputFormat("Deleting {0} objects in {1}", deletes.Count, m_scene.RegionInfo.RegionName);
 
-                    if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0)
-                    {
-                        delete = true;
-                    }
-                    else
-                    {
-                        ILandObject parcel
-                            = m_scene.LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y);
+            foreach (SceneObjectGroup g in deletes)
+            {
+                m_console.OutputFormat("Deleting object {0} {1}", g.UUID, g.Name);
+                m_scene.DeleteSceneObject(g, false);
+            }
+        }
 
-                        if (parcel == null || parcel.LandData.Name == "NO LAND")
-                            delete = true;
-                    }
+        private List<SceneObjectGroup> GetDeleteCandidatesByName(string module, string[] cmdparams)
+        {
+            if (!(m_console.ConsoleScene == null || m_console.ConsoleScene == m_scene))
+                return null;
 
-                    if (delete && !g.IsAttachment && !deletes.Contains(g))
-                        deletes.Add(g);
-                });
+            bool useRegex = false;
+            OptionSet options = new OptionSet().Add("regex", v=> useRegex = v != null );
 
-//                if (deletes.Count == 0)
-//                    m_console.OutputFormat("No objects were found outside region bounds");
+            List<string> mainParams = options.Parse(cmdparams);
 
-                break;
+            if (mainParams.Count < 4)
+            {
+                m_console.OutputFormat("Usage: delete object name [--regex] <name>");
+                return null;
             }
 
-            m_console.OutputFormat("Deleting {0} objects in {1}", deletes.Count, m_scene.RegionInfo.RegionName);
+            string name = mainParams[3];
 
-            foreach (SceneObjectGroup g in deletes)
+            List<SceneObjectGroup> sceneObjects = new List<SceneObjectGroup>();
+            Action<SceneObjectGroup> searchAction;
+
+            if (useRegex)
             {
-                m_console.OutputFormat("Deleting object {0} {1}", g.UUID, g.Name);
-                m_scene.DeleteSceneObject(g, false);
+                Regex nameRegex = new Regex(name);
+                searchAction = so => { if (nameRegex.IsMatch(so.Name)) { sceneObjects.Add(so); }};
+            }
+            else
+            {
+                searchAction = so => { if (so.Name == name) { sceneObjects.Add(so); }};
             }
+
+            m_scene.ForEachSOG(searchAction);
+
+            if (sceneObjects.Count == 0)
+                m_console.OutputFormat("No objects with name {0} found in {1}", name, m_scene.RegionInfo.RegionName);
+
+            return sceneObjects;
         }
     }
 }
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index e3f06f8..dc76d22 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -944,7 +944,18 @@ namespace OpenSim.Region.Framework.Scenes
         public int LinkNum
         {
             get { return m_linkNum; }
-            set { m_linkNum = value; }
+            set
+            {
+//                if (ParentGroup != null)
+//                {
+//                    m_log.DebugFormat(
+//                        "[SCENE OBJECT PART]: Setting linknum of {0}@{1} to {2} from {3}",
+//                        Name, AbsolutePosition, value, m_linkNum);
+//                    Util.PrintCallStack();
+//                }
+
+                m_linkNum = value;
+            }
         }
 
         public byte ClickAction
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 78f9434..59829d9 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -624,7 +624,7 @@ namespace OpenSim.Tests.Common
         /// <param name="ownerId"></param>
         /// <param name="partNamePrefix">
         /// The prefix to be given to part names.  This will be suffixed with "Part<part no>"
-        /// (e.g. mynamePart0 for the root part)
+        /// (e.g. mynamePart1 for the root part)
         /// </param>
         /// <param name="uuidTail">
         /// The hexadecimal last part of the UUID for parts created.  A UUID of the form "00000000-0000-0000-0000-{0:XD12}"
@@ -637,14 +637,14 @@ namespace OpenSim.Tests.Common
             
             SceneObjectGroup sog 
                 = new SceneObjectGroup(
-                    CreateSceneObjectPart(string.Format("{0}Part0", partNamePrefix), new UUID(rawSogId), ownerId));
+                    CreateSceneObjectPart(string.Format("{0}Part1", partNamePrefix), new UUID(rawSogId), ownerId));
             
             if (parts > 1)
-                for (int i = 1; i < parts; i++)
+                for (int i = 2; i <= parts; i++)
                     sog.AddPart(
                         CreateSceneObjectPart(
                             string.Format("{0}Part{1}", partNamePrefix, i), 
-                            new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail + i)), 
+                            new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail + i - 1)),
                             ownerId));
             
             return sog;
diff --git a/bin/Ionic.Zip.dll b/bin/Ionic.Zip.dll
index 95fa928..95fa928 100755..100644
--- a/bin/Ionic.Zip.dll
+++ b/bin/Ionic.Zip.dll