aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey2014-05-27 23:29:54 +0100
committerJustin Clark-Casey2014-05-27 23:29:54 +0100
commit3f703ae1cb02cbcb0efaff061d495bacca941de0 (patch)
tree3221068b4bc4119023b3dfa621c19e126c2eb3f3 /OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
parentMerge branch 'master' into 0.8-post-fixes (diff)
parentminor: Comment out 2 error level debugging message in authentication code (diff)
downloadopensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.zip
opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.gz
opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.bz2
opensim-SC_OLD-3f703ae1cb02cbcb0efaff061d495bacca941de0.tar.xz
Merge branch 'master' into 0.8-post-fixes
Diffstat (limited to 'OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs')
-rw-r--r--OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
index ea100ee..e81cb78 100644
--- a/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
+++ b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs
@@ -121,7 +121,8 @@ namespace OpenSim.Framework.Serialization.Tests
121 TestHelpers.InMethod(); 121 TestHelpers.InMethod();
122// log4net.Config.XmlConfigurator.Configure(); 122// log4net.Config.XmlConfigurator.Configure();
123 123
124 LandData ld = LandDataSerializer.Deserialize(LandDataSerializer.Serialize(this.land, null)); 124 Dictionary<string, object> options = new Dictionary<string, object>();
125 LandData ld = LandDataSerializer.Deserialize(LandDataSerializer.Serialize(this.land, options));
125 Assert.That(ld, Is.Not.Null, "Deserialize(string) returned null"); 126 Assert.That(ld, Is.Not.Null, "Deserialize(string) returned null");
126// Assert.That(ld.AABBMax, Is.EqualTo(land.AABBMax)); 127// Assert.That(ld.AABBMax, Is.EqualTo(land.AABBMax));
127// Assert.That(ld.AABBMin, Is.EqualTo(land.AABBMin)); 128// Assert.That(ld.AABBMin, Is.EqualTo(land.AABBMin));