From 1038c244cf950f291252b95dabcda5b550a0db2c Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 2 Apr 2008 15:16:32 +0000 Subject: * Add some temporary task inventory item inflation debug messages to investigate mantis 854 --- OpenSim/Framework/TaskInventoryItem.cs | 10 ++++++++++ OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 +- OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 4 ++-- 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 public class TaskInventoryDictionary : Dictionary, ICloneable, IXmlSerializable { + private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); + private static XmlSerializer tiiSerializer = new XmlSerializer(typeof(TaskInventoryItem)); // The alternative of simply serializing the list doesn't appear to work on mono, since @@ -65,13 +67,21 @@ 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)) { 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]: Instantiated {0} prim items in total from xml", Count); + // reader.Read(); // while (reader.Name.Equals("TaskInventoryItem")) // { 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 } /// - /// + /// Restore the object from its serialized xml representation. /// public SceneObjectGroup(Scene scene, ulong regionHandle, string xmlData) { 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 #endregion /// - /// + /// Restore this part from the serialized xml representation. /// /// /// @@ -848,7 +848,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// Serialize this part to xml. /// /// public void ToXml(XmlWriter xmlWriter) -- cgit v1.1