aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs4
3 files changed, 13 insertions, 3 deletions
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index de4f181..275d263 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -43,6 +43,8 @@ namespace OpenSim.Framework
43 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>, 43 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>,
44 ICloneable, IXmlSerializable 44 ICloneable, IXmlSerializable
45 { 45 {
46 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
47
46 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof(TaskInventoryItem)); 48 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof(TaskInventoryItem));
47 49
48 // The alternative of simply serializing the list doesn't appear to work on mono, since 50 // The alternative of simply serializing the list doesn't appear to work on mono, since
@@ -65,13 +67,21 @@ namespace OpenSim.Framework
65 // see IXmlSerializable 67 // see IXmlSerializable
66 public void ReadXml(XmlReader reader) 68 public void ReadXml(XmlReader reader)
67 { 69 {
70 m_log.DebugFormat(
71 "[TASK INVENTORY]: Initial task inventory deserialization CanDeserialize() call was {0}",
72 tiiSerializer.CanDeserialize(reader));
73
68 reader.Read(); 74 reader.Read();
69 while (tiiSerializer.CanDeserialize(reader)) 75 while (tiiSerializer.CanDeserialize(reader))
70 { 76 {
71 TaskInventoryItem item = (TaskInventoryItem)tiiSerializer.Deserialize(reader); 77 TaskInventoryItem item = (TaskInventoryItem)tiiSerializer.Deserialize(reader);
72 Add(item.ItemID, item); 78 Add(item.ItemID, item);
79
80 m_log.DebugFormat("[TASK INVENTORY]: Instanted prim item {0}, {1} from xml", item.Name, item.ItemID);
73 } 81 }
74 82
83 m_log.DebugFormat("[TASK INVENTORY]: Instantiated {0} prim items in total from xml", Count);
84
75// reader.Read(); 85// reader.Read();
76// while (reader.Name.Equals("TaskInventoryItem")) 86// while (reader.Name.Equals("TaskInventoryItem"))
77// { 87// {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index eb7ad33..6761fb4 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -287,7 +287,7 @@ namespace OpenSim.Region.Environment.Scenes
287 } 287 }
288 288
289 /// <summary> 289 /// <summary>
290 /// 290 /// Restore the object from its serialized xml representation.
291 /// </summary> 291 /// </summary>
292 public SceneObjectGroup(Scene scene, ulong regionHandle, string xmlData) 292 public SceneObjectGroup(Scene scene, ulong regionHandle, string xmlData)
293 { 293 {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index bc31e72..5e49314 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -785,7 +785,7 @@ namespace OpenSim.Region.Environment.Scenes
785 #endregion 785 #endregion
786 786
787 /// <summary> 787 /// <summary>
788 /// 788 /// Restore this part from the serialized xml representation.
789 /// </summary> 789 /// </summary>
790 /// <param name="xmlreader"></param> 790 /// <param name="xmlreader"></param>
791 /// <returns></returns> 791 /// <returns></returns>
@@ -848,7 +848,7 @@ namespace OpenSim.Region.Environment.Scenes
848 } 848 }
849 849
850 /// <summary> 850 /// <summary>
851 /// 851 /// Serialize this part to xml.
852 /// </summary> 852 /// </summary>
853 /// <param name="xmlWriter"></param> 853 /// <param name="xmlWriter"></param>
854 public void ToXml(XmlWriter xmlWriter) 854 public void ToXml(XmlWriter xmlWriter)