aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-03 17:13:45 +0000
committerJustin Clarke Casey2008-04-03 17:13:45 +0000
commitb9b99ee87c1ce5fc52ed91adb5f8e417604bde0d (patch)
treecb9b7983211b9cb281aa4ad3f1847c831baf0c0c
parent* From: Dr Scofield <hud@zurich.ibm.com> (diff)
downloadopensim-SC_OLD-b9b99ee87c1ce5fc52ed91adb5f8e417604bde0d.zip
opensim-SC_OLD-b9b99ee87c1ce5fc52ed91adb5f8e417604bde0d.tar.gz
opensim-SC_OLD-b9b99ee87c1ce5fc52ed91adb5f8e417604bde0d.tar.bz2
opensim-SC_OLD-b9b99ee87c1ce5fc52ed91adb5f8e417604bde0d.tar.xz
* Attempted resolution for mantis 854
* Also adds more temporary debugging goo in case the fix didn't work
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs3
2 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 275d263..aa4b9eb 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -82,6 +82,10 @@ namespace OpenSim.Framework
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 reader.Read();
86
87 m_log.DebugFormat("[TASK INVENTORY]: Current node {0}", reader.Name);
88
85// reader.Read(); 89// reader.Read();
86// while (reader.Name.Equals("TaskInventoryItem")) 90// while (reader.Name.Equals("TaskInventoryItem"))
87// { 91// {
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 6761fb4..d12de19 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -301,6 +301,9 @@ namespace OpenSim.Region.Environment.Scenes
301 reader.ReadStartElement("RootPart"); 301 reader.ReadStartElement("RootPart");
302 m_rootPart = SceneObjectPart.FromXml(reader); 302 m_rootPart = SceneObjectPart.FromXml(reader);
303 AddPart(m_rootPart); 303 AddPart(m_rootPart);
304
305 m_log.DebugFormat("[SCENE OBJECT GROUP]: Current node {0}", reader.Name);
306
304 reader.ReadEndElement(); 307 reader.ReadEndElement();
305 308
306 while (reader.Read()) 309 while (reader.Read())