aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-26 08:06:14 +0000
committerMelanie Thielker2008-11-26 08:06:14 +0000
commit3388584aa8c84eea8dcb98a34ecb556794e2fa7c (patch)
tree6bf32aa2773800adc7330cc2282a62d650ec0500
parentCommitting the LCO database layer. Native MySQL, no ADO. New reconnect (diff)
downloadopensim-SC_OLD-3388584aa8c84eea8dcb98a34ecb556794e2fa7c.zip
opensim-SC_OLD-3388584aa8c84eea8dcb98a34ecb556794e2fa7c.tar.gz
opensim-SC_OLD-3388584aa8c84eea8dcb98a34ecb556794e2fa7c.tar.bz2
opensim-SC_OLD-3388584aa8c84eea8dcb98a34ecb556794e2fa7c.tar.xz
Fix 2 of the failed tests. Cause terrain queries to return null when no
terrain is found, rather than a default "0" terrain. Remove the "remove object wrong region" test. UUIDs either are unique or they're not. This test tested a bad behavior I have chosen not to duplicate.
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs2
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs8
2 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 743c0d9..a3ac38e 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -507,7 +507,7 @@ namespace OpenSim.Data.MySQL
507 } 507 }
508 } 508 }
509 509
510 return terrain; 510 return null;
511 } 511 }
512 512
513 public void RemoveLandObject(UUID globalID) 513 public void RemoveLandObject(UUID globalID)
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 532d54e..bcec805 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -676,14 +676,6 @@ namespace OpenSim.Data.Tests
676 } 676 }
677 677
678 [Test] 678 [Test]
679 public void T051_RemoveObjectWrongRegion()
680 {
681 db.RemoveObject(prim1, UUID.Random());
682 SceneObjectGroup sog = FindSOG("object1", region1);
683 Assert.That(sog, Is.Not.Null);
684 }
685
686 [Test]
687 public void T052_RemoveObject() 679 public void T052_RemoveObject()
688 { 680 {
689 db.RemoveObject(prim1, region1); 681 db.RemoveObject(prim1, region1);