aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorDiva Canto2010-10-17 10:35:38 -0700
committerDiva Canto2010-10-17 10:35:38 -0700
commit22eff055d4c03d2bb0bd44f4259a280761d90715 (patch)
tree393cf829e3c3ec3c5a8b2ff4f88b60e6595955b7 /OpenSim/Region/CoreModules
parentDrop max oar loading version back to 0 from 1 (diff)
downloadopensim-SC_OLD-22eff055d4c03d2bb0bd44f4259a280761d90715.zip
opensim-SC_OLD-22eff055d4c03d2bb0bd44f4259a280761d90715.tar.gz
opensim-SC_OLD-22eff055d4c03d2bb0bd44f4259a280761d90715.tar.bz2
opensim-SC_OLD-22eff055d4c03d2bb0bd44f4259a280761d90715.tar.xz
.NET automagical serialization of SOPs replaced by manual serialization across the board.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs10
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 }