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.

1 files changed, 2 insertions, 2 deletions

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();