aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-13 20:43:26 +0000
committerJustin Clark-Casey (justincc)2012-02-13 20:43:26 +0000
commit189c67db957cadfe1bb5bd8aad0c86dec1ff295b (patch)
tree5bc7edae8044dac005ce841d99a6aad3154a87c3 /OpenSim/Region/Framework/Scenes
parentFix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.or... (diff)
downloadopensim-SC_OLD-189c67db957cadfe1bb5bd8aad0c86dec1ff295b.zip
opensim-SC_OLD-189c67db957cadfe1bb5bd8aad0c86dec1ff295b.tar.gz
opensim-SC_OLD-189c67db957cadfe1bb5bd8aad0c86dec1ff295b.tar.bz2
opensim-SC_OLD-189c67db957cadfe1bb5bd8aad0c86dec1ff295b.tar.xz
On object deserialization, go back to logging errors at DEBUG level rather than ERROR. Restore extra log message if shape processing fails.
Logging level was DEBUG before 312e145 (Fri Feb 3 2012). 312e145 also accidentally removed the 'general error' log message if any shape deserialization failed. This commit restores it, though this has no functional impact.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs14
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 ab02f92..0a32214 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1470,7 +1470,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1470 m_SOPXmlProcessors, 1470 m_SOPXmlProcessors,
1471 reader, 1471 reader,
1472 (o, nodeName, e) 1472 (o, nodeName, e)
1473 => m_log.ErrorFormat( 1473 => m_log.DebugFormat(
1474 "[SceneObjectSerializer]: Exception while parsing {0} in object {1} {2}: {3}{4}", 1474 "[SceneObjectSerializer]: Exception while parsing {0} in object {1} {2}: {3}{4}",
1475 ((SceneObjectPart)o).Name, ((SceneObjectPart)o).UUID, nodeName, e.Message, e.StackTrace)); 1475 ((SceneObjectPart)o).Name, ((SceneObjectPart)o).UUID, nodeName, e.Message, e.StackTrace));
1476 1476
@@ -1535,14 +1535,18 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1535 1535
1536 reader.ReadStartElement(name, String.Empty); // Shape 1536 reader.ReadStartElement(name, String.Empty); // Shape
1537 1537
1538 ExternalRepresentationUtils.ExecuteReadProcessors( 1538 errors = ExternalRepresentationUtils.ExecuteReadProcessors(
1539 shape, 1539 shape,
1540 m_ShapeXmlProcessors, 1540 m_ShapeXmlProcessors,
1541 reader, 1541 reader,
1542 (o, nodeName, e) 1542 (o, nodeName, e)
1543 => m_log.ErrorFormat( 1543 =>
1544 "[SceneObjectSerializer]: Exception while parsing Shape property {0}: {1}{2}", 1544 {
1545 nodeName, e.Message, e.StackTrace)); 1545 m_log.DebugFormat(
1546 "[SceneObjectSerializer]: Exception while parsing Shape property {0}: {1}{2}",
1547 nodeName, e.Message, e.StackTrace);
1548 }
1549 );
1546 1550
1547 reader.ReadEndElement(); // Shape 1551 reader.ReadEndElement(); // Shape
1548 1552