OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Add some temporary task inventory item inflation debug messages to investigate mantis 854

0.6.0-stable
Justin Clarke Casey 2008-04-02 15:16:32 +00:00
parent b28ef3ca14
commit 1038c244cf
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/TaskInventoryItem.cs
View File

@ -43,6 +43,8 @@ namespace OpenSim.Framework
public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>, public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>,
ICloneable, IXmlSerializable 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)); private static XmlSerializer tiiSerializer = new XmlSerializer(typeof(TaskInventoryItem));
// The alternative of simply serializing the list doesn't appear to work on mono, since // The alternative of simply serializing the list doesn't appear to work on mono, since
@ -65,13 +67,21 @@ namespace OpenSim.Framework
// see IXmlSerializable // see IXmlSerializable
public void ReadXml(XmlReader reader) public void ReadXml(XmlReader reader)
{ {
m_log.DebugFormat(
"[TASK INVENTORY]: Initial task inventory deserialization CanDeserialize() call was {0}",
tiiSerializer.CanDeserialize(reader));
reader.Read(); reader.Read();
while (tiiSerializer.CanDeserialize(reader)) while (tiiSerializer.CanDeserialize(reader))
{ {
TaskInventoryItem item = (TaskInventoryItem)tiiSerializer.Deserialize(reader); TaskInventoryItem item = (TaskInventoryItem)tiiSerializer.Deserialize(reader);
Add(item.ItemID, item); 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(); // reader.Read();
// while (reader.Name.Equals("TaskInventoryItem")) // while (reader.Name.Equals("TaskInventoryItem"))
// { // {

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -287,7 +287,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
/// <summary> /// <summary>
/// /// Restore the object from its serialized xml representation.
/// </summary> /// </summary>
public SceneObjectGroup(Scene scene, ulong regionHandle, string xmlData) public SceneObjectGroup(Scene scene, ulong regionHandle, string xmlData)
{ {

4
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -785,7 +785,7 @@ namespace OpenSim.Region.Environment.Scenes
#endregion #endregion
/// <summary> /// <summary>
/// /// Restore this part from the serialized xml representation.
/// </summary> /// </summary>
/// <param name="xmlreader"></param> /// <param name="xmlreader"></param>
/// <returns></returns> /// <returns></returns>
@ -848,7 +848,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
/// <summary> /// <summary>
/// /// Serialize this part to xml.
/// </summary> /// </summary>
/// <param name="xmlWriter"></param> /// <param name="xmlWriter"></param>
public void ToXml(XmlWriter xmlWriter) public void ToXml(XmlWriter xmlWriter)