aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLRegionData.cs
diff options
context:
space:
mode:
authorSean Dague2008-10-01 15:41:36 +0000
committerSean Dague2008-10-01 15:41:36 +0000
commitd0099271948e6c908a11da0158ca3471d2afb568 (patch)
tree20b31fe040ba2acd1ffd4eea9557c8099a2cccdf /OpenSim/Data/MySQL/MySQLRegionData.cs
parentAdd a user server XMLRPC method to set the MOTD and the minimum GodLevel (diff)
downloadopensim-SC_OLD-d0099271948e6c908a11da0158ca3471d2afb568.zip
opensim-SC_OLD-d0099271948e6c908a11da0158ca3471d2afb568.tar.gz
opensim-SC_OLD-d0099271948e6c908a11da0158ca3471d2afb568.tar.bz2
opensim-SC_OLD-d0099271948e6c908a11da0158ca3471d2afb568.tar.xz
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.
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLRegionData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs4
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
333 DataTable prims = m_primTable; 333 DataTable prims = m_primTable;
334 DataTable shapes = m_shapeTable; 334 DataTable shapes = m_shapeTable;
335 335
336 string selectExp = "SceneGroupID = '" + Util.ToRawUuidString(obj) + "'"; 336 string selectExp = "SceneGroupID = '" + Util.ToRawUuidString(obj) + "' and RegionUUID = '" + Util.ToRawUuidString(regionUUID) + "'";
337 lock (m_dataSet) 337 lock (m_dataSet)
338 { 338 {
339 DataRow[] primRows = prims.Select(selectExp); 339 DataRow[] primRows = prims.Select(selectExp);
@@ -347,7 +347,7 @@ namespace OpenSim.Data.MySQL
347 shapeRow.Delete(); 347 shapeRow.Delete();
348 } 348 }
349 349
350 RemoveItems(uuid); 350 RemoveItems(uuid);
351 351
352 // Remove prim row 352 // Remove prim row
353 row.Delete(); 353 row.Delete();