diff options
author | Justin Clarke Casey | 2008-04-04 15:02:20 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-04 15:02:20 +0000 |
commit | cdff09d0bbd0e71f10906deedff5649110d13b2a (patch) | |
tree | 994903393dddeae79f989ff5e25dc4c91c6db7cb | |
parent | From: Dr Scofield <hud@zurich.ibm.com> (diff) | |
download | opensim-SC_OLD-cdff09d0bbd0e71f10906deedff5649110d13b2a.zip opensim-SC_OLD-cdff09d0bbd0e71f10906deedff5649110d13b2a.tar.gz opensim-SC_OLD-cdff09d0bbd0e71f10906deedff5649110d13b2a.tar.bz2 opensim-SC_OLD-cdff09d0bbd0e71f10906deedff5649110d13b2a.tar.xz |
* Removing debugging goo for mantis 854 since the fix is reported to work.
-rw-r--r-- | OpenSim/Framework/TaskInventoryItem.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs index aa4b9eb..91c952d 100644 --- a/OpenSim/Framework/TaskInventoryItem.cs +++ b/OpenSim/Framework/TaskInventoryItem.cs | |||
@@ -77,14 +77,16 @@ namespace OpenSim.Framework | |||
77 | TaskInventoryItem item = (TaskInventoryItem)tiiSerializer.Deserialize(reader); | 77 | TaskInventoryItem item = (TaskInventoryItem)tiiSerializer.Deserialize(reader); |
78 | Add(item.ItemID, item); | 78 | Add(item.ItemID, item); |
79 | 79 | ||
80 | m_log.DebugFormat("[TASK INVENTORY]: Instanted prim item {0}, {1} from xml", item.Name, item.ItemID); | 80 | // m_log.DebugFormat("[TASK INVENTORY]: Instanted prim item {0}, {1} from xml", item.Name, item.ItemID); |
81 | } | 81 | } |
82 | 82 | ||
83 | m_log.DebugFormat("[TASK INVENTORY]: Instantiated {0} prim items in total from xml", Count); | 83 | // m_log.DebugFormat("[TASK INVENTORY]: Instantiated {0} prim items in total from xml", Count); |
84 | 84 | ||
85 | // For some .net implementations, this last read is necessary so that we advance beyond the end tag | ||
86 | // of the element wrapping this object so that the rest of the serialization can complete normally. | ||
85 | reader.Read(); | 87 | reader.Read(); |
86 | 88 | ||
87 | m_log.DebugFormat("[TASK INVENTORY]: Current node {0}", reader.Name); | 89 | // m_log.DebugFormat("[TASK INVENTORY]: Current node {0}", reader.Name); |
88 | 90 | ||
89 | // reader.Read(); | 91 | // reader.Read(); |
90 | // while (reader.Name.Equals("TaskInventoryItem")) | 92 | // while (reader.Name.Equals("TaskInventoryItem")) |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index d12de19..0e2a4ee 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -302,7 +302,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
302 | m_rootPart = SceneObjectPart.FromXml(reader); | 302 | m_rootPart = SceneObjectPart.FromXml(reader); |
303 | AddPart(m_rootPart); | 303 | AddPart(m_rootPart); |
304 | 304 | ||
305 | m_log.DebugFormat("[SCENE OBJECT GROUP]: Current node {0}", reader.Name); | 305 | // m_log.DebugFormat("[SCENE OBJECT GROUP]: Current node {0}", reader.Name); |
306 | 306 | ||
307 | reader.ReadEndElement(); | 307 | reader.ReadEndElement(); |
308 | 308 | ||