ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Okay you can put down your pitchforks - this patch should fix rezzing of items (with inventory) on Windows

Browse Source 
* 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.
This commit is contained in:
Justin Clarke Casey
2008-04-07 16:30:29 +00:00
parent 2b23734a16
commit 2caea75aa8
3 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
OpenSim/Framework/TaskInventoryItem.cs
View File

@@ -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