aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2010-04-23 17:48:50 +0200
committerMelanie Thielker2010-04-23 17:48:50 +0200
commit31e0704c8d7f6100153ddedd64be7f2ab1ad9311 (patch)
tree9381701e84174f94c03909706c79a9bb5752d105 /OpenSim
parentFix a nullref in attachment handling. Add some debug to find the attachment (diff)
downloadopensim-SC_OLD-31e0704c8d7f6100153ddedd64be7f2ab1ad9311.zip
opensim-SC_OLD-31e0704c8d7f6100153ddedd64be7f2ab1ad9311.tar.gz
opensim-SC_OLD-31e0704c8d7f6100153ddedd64be7f2ab1ad9311.tar.bz2
opensim-SC_OLD-31e0704c8d7f6100153ddedd64be7f2ab1ad9311.tar.xz
Remove debug output, the culprit has been identified
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs6
3 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 44fd2e1..e6e414f 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1628,7 +1628,6 @@ namespace OpenSim.Region.Framework.Scenes
1628 remoteClient.AgentId); 1628 remoteClient.AgentId);
1629 AssetService.Store(asset); 1629 AssetService.Store(asset);
1630 1630
1631 m_log.DebugFormat("[ScriptState]: Saved attachment as asset {0}", asset.FullID);
1632 item.AssetID = asset.FullID; 1631 item.AssetID = asset.FullID;
1633 item.Description = asset.Description; 1632 item.Description = asset.Description;
1634 item.Name = asset.Name; 1633 item.Name = asset.Name;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 1f8c732..84c3719 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -612,7 +612,6 @@ namespace OpenSim.Region.Framework.Scenes
612 { 612 {
613 UUID itemid = new UUID(node.Attributes["UUID"].Value); 613 UUID itemid = new UUID(node.Attributes["UUID"].Value);
614 m_savedScriptState.Add(itemid, node.InnerXml); 614 m_savedScriptState.Add(itemid, node.InnerXml);
615 m_log.DebugFormat("[ScriptState]: Retrieved state for script item ID {0}", itemid.ToString());
616 } 615 }
617 } 616 }
618 } 617 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index ce4802d..04df35a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -333,10 +333,8 @@ namespace OpenSim.Region.Framework.Scenes
333 if (engines == null) // No engine at all 333 if (engines == null) // No engine at all
334 return; 334 return;
335 335
336 m_log.DebugFormat("[ScriptState]: Item ID changed: {0} to {1}", oldID, newID);
337 if (m_part.ParentGroup.m_savedScriptState.ContainsKey(oldID)) 336 if (m_part.ParentGroup.m_savedScriptState.ContainsKey(oldID))
338 { 337 {
339 m_log.DebugFormat("[ScriptState]: Found script state for {0}, applying to new script item {1}", oldID, newID);
340 XmlDocument doc = new XmlDocument(); 338 XmlDocument doc = new XmlDocument();
341 339
342 doc.LoadXml(m_part.ParentGroup.m_savedScriptState[oldID]); 340 doc.LoadXml(m_part.ParentGroup.m_savedScriptState[oldID]);
@@ -382,10 +380,6 @@ namespace OpenSim.Region.Framework.Scenes
382 } 380 }
383 m_part.ParentGroup.m_savedScriptState.Remove(oldID); 381 m_part.ParentGroup.m_savedScriptState.Remove(oldID);
384 } 382 }
385 else
386 {
387 m_log.DebugFormat("[ScriptState]: No state for old ID {0}", oldID);
388 }
389 } 383 }
390 384
391 /// <summary> 385 /// <summary>