diff options
Added a ForceSceneObjectBackup method to Scene, which as it says forces a database backup/update on the SceneObjectGroup.
This is now called at the beginning of DeRezObject, so we know the database is upto date before we attempt to delete a object.
Fix Mantis #1004
Which happened because Database backups don't happen if a object is still selected, so when you select a part in a link-set and then unlink it and then delete it, all without unselecting the prim at all. The unlink changes never get updated to the database. So then when the call to delete the prim from the database happens, which is called with the SceneObjectId. That SceneObjectId is never found, as the database still has that prim as part of another link set.
It is possible that these changes might have to be reverted and for us to find a different method of fixing the problem. If the performance overhead is too high or it causes any other problems.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 32bd9aa..194d782 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -728,7 +728,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
728 | { | 728 | { |
729 | if (!entity.IsDeleted && entity is SceneObjectGroup && ((SceneObjectGroup)entity).HasGroupChanged) | 729 | if (!entity.IsDeleted && entity is SceneObjectGroup && ((SceneObjectGroup)entity).HasGroupChanged) |
730 | { | 730 | { |
731 | ((SceneObjectGroup)entity).ProcessBackup(m_storageManager.DataStore); | 731 | ((SceneObjectGroup)entity).ProcessBackup(m_storageManager.DataStore, false); |
732 | } | 732 | } |
733 | } | 733 | } |
734 | 734 | ||
@@ -1052,6 +1052,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
1052 | } | 1052 | } |
1053 | } | 1053 | } |
1054 | 1054 | ||
1055 | public void ForceSceneObjectBackup(SceneObjectGroup group) | ||
1056 | { | ||
1057 | if (group != null) | ||
1058 | { | ||
1059 | group.ProcessBackup(m_storageManager.DataStore, true); | ||
1060 | } | ||
1061 | } | ||
1062 | |||
1055 | public void AddReturn(UUID agentID, string objectName, Vector3 location, string reason) | 1063 | public void AddReturn(UUID agentID, string objectName, Vector3 location, string reason) |
1056 | { | 1064 | { |
1057 | lock (m_returns) | 1065 | lock (m_returns) |