* 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.

1 files changed, 17 insertions, 27 deletions

diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 91c952d..c9c8054 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -67,41 +67,31 @@ namespace OpenSim.Framework
         // see IXmlSerializable
         public void ReadXml(XmlReader reader)
         {
-            m_log.DebugFormat(
-                "[TASK INVENTORY]: Initial task inventory deserialization CanDeserialize() call was {0}",
-                tiiSerializer.CanDeserialize(reader));
-            
-            reader.Read();
-            while (tiiSerializer.CanDeserialize(reader))
+            m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node before actions, {0}", reader.Name);           
+
+            if (!reader.IsEmptyElement)
             {
-                TaskInventoryItem item = (TaskInventoryItem)tiiSerializer.Deserialize(reader);
-                Add(item.ItemID, item);
+                reader.Read();
+                while (tiiSerializer.CanDeserialize(reader))
+                {
+                    TaskInventoryItem item = (TaskInventoryItem)tiiSerializer.Deserialize(reader);
+                    Add(item.ItemID, item);
+                    
+                    m_log.DebugFormat("[TASK INVENTORY]: Instanted prim item {0}, {1} from xml", item.Name, item.ItemID);
+                }
                 
-//                m_log.DebugFormat("[TASK INVENTORY]: Instanted prim item {0}, {1} from xml", item.Name, item.ItemID);
+                m_log.DebugFormat("[TASK INVENTORY]: Instantiated {0} prim items in total from xml", Count);
+            }
+            else
+            {
+                m_log.DebugFormat("[TASK INVENTORY]: Skipping empty element {0}", reader.Name);
             }
-            
-//            m_log.DebugFormat("[TASK INVENTORY]: Instantiated {0} prim items in total from xml", Count);
             
             // For some .net implementations, this last read is necessary so that we advance beyond the end tag 
             // of the element wrapping this object so that the rest of the serialization can complete normally.
             reader.Read();
             
-//            m_log.DebugFormat("[TASK INVENTORY]: Current node {0}", reader.Name);
-            
-//            reader.Read();
-//            while (reader.Name.Equals("TaskInventoryItem"))
-//            {
-//                TaskInventoryItem item = (TaskInventoryItem)tiiSerializer.Deserialize(reader);
-//                Add(item.ItemID, item);
-//            }    
-
-//            ICollection<TaskInventoryItem> items 
-//                = (ICollection<TaskInventoryItem>)tiiSerializer.Deserialize(reader);
-//            
-//            foreach (TaskInventoryItem item in items)
-//            {
-//                Add(item.ItemID, item);
-//            }
+            m_log.DebugFormat("[TASK INVENTORY]: ReadXml Current node after actions, {0}", reader.Name);            
         }
         
         // see IXmlSerializable