diff options
author | Justin Clark-Casey (justincc) | 2010-10-19 02:08:50 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-19 02:08:50 +0100 |
commit | 99388ce6101ff5b2a2c269a2d6cce0b0375f1136 (patch) | |
tree | a35030eea96f2340bed155fa6f842d8854625cc0 /OpenSim/Region/CoreModules | |
parent | Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC grou... (diff) | |
parent | Comment a spammy debug message in the serializer (diff) | |
download | opensim-SC_OLD-99388ce6101ff5b2a2c269a2d6cce0b0375f1136.zip opensim-SC_OLD-99388ce6101ff5b2a2c269a2d6cce0b0375f1136.tar.gz opensim-SC_OLD-99388ce6101ff5b2a2c269a2d6cce0b0375f1136.tar.bz2 opensim-SC_OLD-99388ce6101ff5b2a2c269a2d6cce0b0375f1136.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs index bac7827..f10e848 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs | |||
@@ -303,15 +303,19 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests | |||
303 | { | 303 | { |
304 | case "UUID": | 304 | case "UUID": |
305 | xtr.ReadStartElement("UUID"); | 305 | xtr.ReadStartElement("UUID"); |
306 | uuid = UUID.Parse(xtr.ReadElementString("Guid")); | 306 | try |
307 | xtr.ReadEndElement(); | 307 | { |
308 | uuid = UUID.Parse(xtr.ReadElementString("UUID")); | ||
309 | xtr.ReadEndElement(); | ||
310 | } | ||
311 | catch { } // ignore everything but <UUID><UUID>...</UUID></UUID> | ||
308 | break; | 312 | break; |
309 | case "Name": | 313 | case "Name": |
310 | name = xtr.ReadElementContentAsString(); | 314 | name = xtr.ReadElementContentAsString(); |
311 | break; | 315 | break; |
312 | case "CreatorID": | 316 | case "CreatorID": |
313 | xtr.ReadStartElement("CreatorID"); | 317 | xtr.ReadStartElement("CreatorID"); |
314 | creatorId = UUID.Parse(xtr.ReadElementString("Guid")); | 318 | creatorId = UUID.Parse(xtr.ReadElementString("UUID")); |
315 | xtr.ReadEndElement(); | 319 | xtr.ReadEndElement(); |
316 | break; | 320 | break; |
317 | } | 321 | } |