diff options
author | Justin Clark-Casey (justincc) | 2010-09-07 00:34:06 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-09-07 01:12:06 +0100 |
commit | 11f4a65f42dea66091cb08423479fa6ae46c98aa (patch) | |
tree | f16956aa3d2cac3ae325ffda621f2bd79b40310e /OpenSim/Data | |
parent | Add test that checks correct persistence when an unlink is quickly followed b... (diff) | |
download | opensim-SC-11f4a65f42dea66091cb08423479fa6ae46c98aa.zip opensim-SC-11f4a65f42dea66091cb08423479fa6ae46c98aa.tar.gz opensim-SC-11f4a65f42dea66091cb08423479fa6ae46c98aa.tar.bz2 opensim-SC-11f4a65f42dea66091cb08423479fa6ae46c98aa.tar.xz |
Fix deletion persistence when freshly delinked prims are removed
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.
Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index 30253c3..a39e68d 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
@@ -247,6 +247,8 @@ namespace OpenSim.Data.MySQL | |||
247 | 247 | ||
248 | public void RemoveObject(UUID obj, UUID regionUUID) | 248 | public void RemoveObject(UUID obj, UUID regionUUID) |
249 | { | 249 | { |
250 | // m_log.DebugFormat("[REGION DB]: Deleting scene object {0} from {1} in database", obj, regionUUID); | ||
251 | |||
250 | List<UUID> uuids = new List<UUID>(); | 252 | List<UUID> uuids = new List<UUID>(); |
251 | 253 | ||
252 | // Formerly, this used to check the region UUID. | 254 | // Formerly, this used to check the region UUID. |