diff options
| author | Jonathan Freedman | 2010-10-18 23:00:48 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-18 23:00:48 -0400 |
| commit | 12128f1917d9f6288e268ccce9304c2b8c825d92 (patch) | |
| tree | a1825bf495e15aadb86ce0ce457007717933988c /OpenSim/Region/Framework | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| parent | Add 'contributors' notice for zlib.net.dll to keep track of its origin and ve... (diff) | |
| download | opensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.zip opensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.tar.gz opensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.tar.bz2 opensim-SC_OLD-12128f1917d9f6288e268ccce9304c2b8c825d92.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 252304b..7b94a81 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
| @@ -1363,7 +1363,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 1363 | } | 1363 | } |
| 1364 | else | 1364 | else |
| 1365 | { | 1365 | { |
| 1366 | m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element {0}", nodeName); | 1366 | // m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element {0}", nodeName); |
| 1367 | reader.ReadOuterXml(); // ignore | 1367 | reader.ReadOuterXml(); // ignore |
| 1368 | } | 1368 | } |
| 1369 | 1369 | ||
| @@ -1438,7 +1438,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 1438 | p(item, reader); | 1438 | p(item, reader); |
| 1439 | else | 1439 | else |
| 1440 | { | 1440 | { |
| 1441 | m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in TaskInventory {0}, {1}", reader.Name, reader.Value); | 1441 | // m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in TaskInventory {0}, {1}", reader.Name, reader.Value); |
| 1442 | reader.ReadOuterXml(); | 1442 | reader.ReadOuterXml(); |
| 1443 | } | 1443 | } |
| 1444 | } | 1444 | } |
| @@ -1467,7 +1467,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
| 1467 | p(shape, reader); | 1467 | p(shape, reader); |
| 1468 | else | 1468 | else |
| 1469 | { | 1469 | { |
| 1470 | m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name); | 1470 | // m_log.DebugFormat("[SceneObjectSerializer]: caught unknown element in Shape {0}", reader.Name); |
| 1471 | reader.ReadOuterXml(); | 1471 | reader.ReadOuterXml(); |
| 1472 | } | 1472 | } |
| 1473 | } | 1473 | } |