From d0099271948e6c908a11da0158ca3471d2afb568 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Wed, 1 Oct 2008 15:41:36 +0000
Subject: add delete prim tests.  Found and fixed bugs where region is not
 respected by sqlite or mysql drivers so that deleting and object in a region
 actually deletes that object from any region.

---
 OpenSim/Data/MySQL/MySQLRegionData.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Data/MySQL')

diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index e6a9686..0e8ca68 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -333,7 +333,7 @@ namespace OpenSim.Data.MySQL
             DataTable prims = m_primTable;
             DataTable shapes = m_shapeTable;
 
-            string selectExp = "SceneGroupID = '" + Util.ToRawUuidString(obj) + "'";
+            string selectExp = "SceneGroupID = '" + Util.ToRawUuidString(obj) + "' and RegionUUID = '" + Util.ToRawUuidString(regionUUID) + "'";
             lock (m_dataSet)
             {
                 DataRow[] primRows = prims.Select(selectExp);
@@ -347,7 +347,7 @@ namespace OpenSim.Data.MySQL
                         shapeRow.Delete();
                     }
 
-                        RemoveItems(uuid);
+                    RemoveItems(uuid);
 
                     // Remove prim row
                     row.Delete();
-- 
cgit v1.1