From 2caea75aa8ec1b003e7866bba2109c72df2a10c2 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 7 Apr 2008 16:30:29 +0000
Subject: * Okay you can put down your pitchforks - this patch should fix
 rezzing of items (with inventory) on Windows * Now properly dealing with
 prims which don't contain items - thanks to thomas for the patch which gave
 insight into this situation * Also, an xml exception no longer crahes the
 client session * Leaving in debugging lines in case there are further
 problems * Not yet tested on Linux, though I'm just about to.

---
 .../Region/Environment/Scenes/SceneObjectGroup.cs  | 62 +++++++++++++---------
 .../Scenes/SceneObjectPart.Inventory.cs            |  1 -
 2 files changed, 36 insertions(+), 27 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index e2ba681..38c7e45 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -296,36 +296,46 @@ namespace OpenSim.Region.Environment.Scenes
             
             StringReader sr = new StringReader(xmlData);
             XmlTextReader reader = new XmlTextReader(sr);
-            reader.Read();
-            reader.ReadStartElement("SceneObjectGroup");
-            reader.ReadStartElement("RootPart");
-            m_rootPart = SceneObjectPart.FromXml(reader);
-            AddPart(m_rootPart);
-            
-//            m_log.DebugFormat("[SCENE OBJECT GROUP]: Current node {0}", reader.Name);            
-            
-            reader.ReadEndElement();
-
-            while (reader.Read())
+            try
             {
-                switch (reader.NodeType)
+                reader.Read();
+                reader.ReadStartElement("SceneObjectGroup");
+                reader.ReadStartElement("RootPart");
+                m_rootPart = SceneObjectPart.FromXml(reader);
+                AddPart(m_rootPart);
+                
+                m_log.DebugFormat("[SCENE OBJECT GROUP]: Current node {0}", reader.Name);            
+                
+                reader.ReadEndElement();
+    
+                while (reader.Read())
                 {
-                    case XmlNodeType.Element:
-                        if (reader.Name == "Part")
-                        {
-                            reader.Read();
-                            SceneObjectPart part = SceneObjectPart.FromXml(reader);
-                            part.LocalId = m_scene.PrimIDAllocate();
-                            AddPart(part);
-                            part.RegionHandle = m_regionHandle;
-
-                            part.TrimPermissions();
-                        }
-                        break;
-                    case XmlNodeType.EndElement:
-                        break;
+                    switch (reader.NodeType)
+                    {
+                        case XmlNodeType.Element:
+                            if (reader.Name == "Part")
+                            {
+                                reader.Read();
+                                SceneObjectPart part = SceneObjectPart.FromXml(reader);
+                                part.LocalId = m_scene.PrimIDAllocate();
+                                AddPart(part);
+                                part.RegionHandle = m_regionHandle;
+    
+                                part.TrimPermissions();
+                            }
+                            break;
+                        case XmlNodeType.EndElement:
+                            break;
+                    }
                 }
             }
+            catch (XmlException e)
+            {
+                m_log.ErrorFormat("[SCENE OBJECT GROUP]: Deserialization of following xml failed, {0}", xmlData);
+                
+                // Let's see if carrying on does anything for us
+            }
+            
             reader.Close();
             sr.Close();
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 395c8c6..16da516 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -77,7 +77,6 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary> 
         protected TaskInventoryDictionary m_taskInventory = new TaskInventoryDictionary();
 
-        [XmlIgnore]
         public TaskInventoryDictionary TaskInventory
         {
             get { return m_taskInventory; }
-- 
cgit v1.1