diff options
| author | Justin Clarke Casey | 2009-02-03 19:13:17 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2009-02-03 19:13:17 +0000 |
| commit | cff7664a37305fde7bca3df84994c3a6a3a9c62e (patch) | |
| tree | 4d8900000e5d6febd5ce1b6dd62cb1b5e7b379e1 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
| parent | OK, commenting the return again :-/ (diff) | |
| download | opensim-SC-cff7664a37305fde7bca3df84994c3a6a3a9c62e.zip opensim-SC-cff7664a37305fde7bca3df84994c3a6a3a9c62e.tar.gz opensim-SC-cff7664a37305fde7bca3df84994c3a6a3a9c62e.tar.bz2 opensim-SC-cff7664a37305fde7bca3df84994c3a6a3a9c62e.tar.xz | |
* Mark the old group after linking as deleted
* Add unit test assertions to check this
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 6388bc1..bdede36 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
| @@ -2049,7 +2049,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 2049 | } | 2049 | } |
| 2050 | 2050 | ||
| 2051 | m_scene.UnlinkSceneObject(objectGroup.UUID, true); | 2051 | m_scene.UnlinkSceneObject(objectGroup.UUID, true); |
| 2052 | objectGroup.Children.Clear(); | 2052 | objectGroup.m_isDeleted = true; |
| 2053 | objectGroup.m_parts.Clear(); | ||
| 2053 | 2054 | ||
| 2054 | // Can't do this yet since backup still makes use of the root part without any synchronization | 2055 | // Can't do this yet since backup still makes use of the root part without any synchronization |
| 2055 | // objectGroup.m_rootPart = null; | 2056 | // objectGroup.m_rootPart = null; |