From 3388584aa8c84eea8dcb98a34ecb556794e2fa7c Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 26 Nov 2008 08:06:14 +0000
Subject: 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.

---
 OpenSim/Data/MySQL/MySQLRegionData.cs | 2 +-
 OpenSim/Data/Tests/BasicRegionTest.cs | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

(limited to 'OpenSim/Data')

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
                 }
             }
 
-            return terrain;
+            return null;
         }
 
         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
         }
 
         [Test]
-        public void T051_RemoveObjectWrongRegion()
-        {
-            db.RemoveObject(prim1, UUID.Random());
-            SceneObjectGroup sog = FindSOG("object1", region1);
-            Assert.That(sog, Is.Not.Null);
-        }
-
-        [Test]
         public void T052_RemoveObject()
         {
             db.RemoveObject(prim1, region1);
-- 
cgit v1.1