diff options
| author | Justin Clark-Casey (justincc) | 2010-10-19 02:12:36 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-10-19 02:12:36 +0100 |
| commit | 5dd372edc4d87e0bf39263c4b885b436f79f9bb2 (patch) | |
| tree | dd9e996d4a08c165f114a8f625950256b546b134 /OpenSim | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| parent | COmmented the wrong line instead, now I commented them all to be on the safe ... (diff) | |
| download | opensim-SC_OLD-5dd372edc4d87e0bf39263c4b885b436f79f9bb2.zip opensim-SC_OLD-5dd372edc4d87e0bf39263c4b885b436f79f9bb2.tar.gz opensim-SC_OLD-5dd372edc4d87e0bf39263c4b885b436f79f9bb2.tar.bz2 opensim-SC_OLD-5dd372edc4d87e0bf39263c4b885b436f79f9bb2.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index ef012d5..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 | ||
| @@ -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 | } |