* Remove a bug I created in r5171 where taking an object would terminate the client session

* change code to use an explicit state variable instead of using SOG.Name = null to signal deletion

2 files changed, 16 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
index 6e53f28..d2b8018 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
@@ -31,6 +31,7 @@ using OpenSim.Region.Environment.Modules.World.Serialiser;
 using System;
 using System.IO;
 using System.Reflection;
+using System.Xml;
 using libsecondlife;
 using log4net;
 
@@ -101,6 +102,20 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
             m_log.InfoFormat("[ARCHIVER]: Loading prim data");
 
             IRegionSerialiser serialiser = m_scene.RequestModuleInterface<IRegionSerialiser>();
+            
+            // Temporary code to read each sog in the file separately, pending actually having these in separate files
+//            XmlTextReader xtr = new XmlTextReader(new StringReader(serializedPrims));            
+//            XmlDocument doc = new XmlDocument();
+//            reader.WhitespaceHandling = WhitespaceHandling.None;
+//            doc.Load(xtr);
+//            xtr.Close();
+//            XmlNode sceneNode = doc.FirstChild;
+//
+//            foreach (XmlNode objectNode in sceneNode.ChildNodes)
+//            {
+//                CreatePrimFromXml2(m_scene, objectNode.OuterXml);
+//            }
+            
             serialiser.LoadPrimsFromXml2(m_scene, new StringReader(serializedPrims));
         }
     }
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
index db16601..94161f0 100644
--- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs
@@ -114,6 +114,7 @@ namespace OpenSim.Region.Environment.Scenes
             doc.Load(reader);
             reader.Close();
             rootNode = doc.FirstChild;
+            
             foreach (XmlNode aPrimNode in rootNode.ChildNodes)
             {
                 CreatePrimFromXml2(scene, aPrimNode.OuterXml);