diff options
author | Melanie | 2012-02-15 01:11:17 +0000 |
---|---|---|
committer | Melanie | 2012-02-15 01:11:17 +0000 |
commit | 272ba5a741ad1b486ee11174a46fa15573a78e83 (patch) | |
tree | 41a330f517cff6bda34e38657ad0d359a35eab86 /OpenSim/Region/Framework/Scenes/Serialization | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Refactor appearance saving for NPC to use AvatarFactoryModule interface. (diff) | |
download | opensim-SC_OLD-272ba5a741ad1b486ee11174a46fa15573a78e83.zip opensim-SC_OLD-272ba5a741ad1b486ee11174a46fa15573a78e83.tar.gz opensim-SC_OLD-272ba5a741ad1b486ee11174a46fa15573a78e83.tar.bz2 opensim-SC_OLD-272ba5a741ad1b486ee11174a46fa15573a78e83.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Serialization')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index ba33122..4b80e37 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -1486,7 +1486,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1486 | m_SOPXmlProcessors, | 1486 | m_SOPXmlProcessors, |
1487 | reader, | 1487 | reader, |
1488 | (o, nodeName, e) | 1488 | (o, nodeName, e) |
1489 | => m_log.ErrorFormat( | 1489 | => m_log.DebugFormat( |
1490 | "[SceneObjectSerializer]: Exception while parsing {0} in object {1} {2}: {3}{4}", | 1490 | "[SceneObjectSerializer]: Exception while parsing {0} in object {1} {2}: {3}{4}", |
1491 | ((SceneObjectPart)o).Name, ((SceneObjectPart)o).UUID, nodeName, e.Message, e.StackTrace)); | 1491 | ((SceneObjectPart)o).Name, ((SceneObjectPart)o).UUID, nodeName, e.Message, e.StackTrace)); |
1492 | 1492 | ||
@@ -1539,14 +1539,18 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
1539 | 1539 | ||
1540 | reader.ReadStartElement(name, String.Empty); // Shape | 1540 | reader.ReadStartElement(name, String.Empty); // Shape |
1541 | 1541 | ||
1542 | ExternalRepresentationUtils.ExecuteReadProcessors( | 1542 | errors = ExternalRepresentationUtils.ExecuteReadProcessors( |
1543 | shape, | 1543 | shape, |
1544 | m_ShapeXmlProcessors, | 1544 | m_ShapeXmlProcessors, |
1545 | reader, | 1545 | reader, |
1546 | (o, nodeName, e) | 1546 | (o, nodeName, e) |
1547 | => m_log.ErrorFormat( | 1547 | => |
1548 | "[SceneObjectSerializer]: Exception while parsing Shape property {0}: {1}{2}", | 1548 | { |
1549 | nodeName, e.Message, e.StackTrace)); | 1549 | m_log.DebugFormat( |
1550 | "[SceneObjectSerializer]: Exception while parsing Shape property {0}: {1}{2}", | ||
1551 | nodeName, e.Message, e.StackTrace); | ||
1552 | } | ||
1553 | ); | ||
1550 | 1554 | ||
1551 | reader.ReadEndElement(); // Shape | 1555 | reader.ReadEndElement(); // Shape |
1552 | 1556 | ||