diff options
author | Melanie Thielker | 2010-04-23 14:41:20 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-04-23 14:41:20 +0200 |
commit | 780630d7c05f7306ffceb52db0eda1401112f426 (patch) | |
tree | ec66c7e8e1bd3b94e543d87e389d23753bda2dd8 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-780630d7c05f7306ffceb52db0eda1401112f426.zip opensim-SC-780630d7c05f7306ffceb52db0eda1401112f426.tar.gz opensim-SC-780630d7c05f7306ffceb52db0eda1401112f426.tar.bz2 opensim-SC-780630d7c05f7306ffceb52db0eda1401112f426.tar.xz |
Fix a nullref in attachment handling. Add some debug to find the attachment
state issue
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 04df35a..ce4802d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -333,8 +333,10 @@ 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); | ||
336 | if (m_part.ParentGroup.m_savedScriptState.ContainsKey(oldID)) | 337 | if (m_part.ParentGroup.m_savedScriptState.ContainsKey(oldID)) |
337 | { | 338 | { |
339 | m_log.DebugFormat("[ScriptState]: Found script state for {0}, applying to new script item {1}", oldID, newID); | ||
338 | XmlDocument doc = new XmlDocument(); | 340 | XmlDocument doc = new XmlDocument(); |
339 | 341 | ||
340 | doc.LoadXml(m_part.ParentGroup.m_savedScriptState[oldID]); | 342 | doc.LoadXml(m_part.ParentGroup.m_savedScriptState[oldID]); |
@@ -380,6 +382,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
380 | } | 382 | } |
381 | m_part.ParentGroup.m_savedScriptState.Remove(oldID); | 383 | m_part.ParentGroup.m_savedScriptState.Remove(oldID); |
382 | } | 384 | } |
385 | else | ||
386 | { | ||
387 | m_log.DebugFormat("[ScriptState]: No state for old ID {0}", oldID); | ||
388 | } | ||
383 | } | 389 | } |
384 | 390 | ||
385 | /// <summary> | 391 | /// <summary> |