diff options
| author | Melanie | 2010-10-18 19:08:55 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-18 19:08:55 +0100 |
| commit | e48ac9380312057af261b10e4a313917410d00f4 (patch) | |
| tree | 8f26340e30109351bec6e2d59c67c783c733cc75 /OpenSim/Region/CoreModules | |
| parent | Bump migration version on LastSeen field so it is actually run (diff) | |
| parent | remove some cruft from last commit (diff) | |
| download | opensim-SC_OLD-e48ac9380312057af261b10e4a313917410d00f4.zip opensim-SC_OLD-e48ac9380312057af261b10e4a313917410d00f4.tar.gz opensim-SC_OLD-e48ac9380312057af261b10e4a313917410d00f4.tar.bz2 opensim-SC_OLD-e48ac9380312057af261b10e4a313917410d00f4.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -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 | } |