diff options
| author | Melanie | 2010-10-19 00:52:35 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-19 00:52:35 +0100 |
| commit | e0a02d6ca3a0d139ce0508a180538f305d21e544 (patch) | |
| tree | 24ff210b75a089d2ec0ca9d394c774c8e9fa294b /OpenSim/Region/Framework | |
| parent | Change substring matching to prefix matching in region search. This affects (diff) | |
| parent | Comment a spammy debug message in the serializer (diff) | |
| download | opensim-SC-e0a02d6ca3a0d139ce0508a180538f305d21e544.zip opensim-SC-e0a02d6ca3a0d139ce0508a180538f305d21e544.tar.gz opensim-SC-e0a02d6ca3a0d139ce0508a180538f305d21e544.tar.bz2 opensim-SC-e0a02d6ca3a0d139ce0508a180538f305d21e544.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index acdaf95..49ebe81 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
| @@ -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 | } |