diff options
| author | Justin Clarke Casey | 2008-05-25 00:09:08 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-05-25 00:09:08 +0000 |
| commit | bc92d72828925d8b3df72cf66b003ae73731a352 (patch) | |
| tree | cd0c17a61ebf5950d58cf70d6cb3c05af70d28d8 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
| parent | * Refactor: Collapse some multiple remove object paths (diff) | |
| download | opensim-SC-bc92d72828925d8b3df72cf66b003ae73731a352.zip opensim-SC-bc92d72828925d8b3df72cf66b003ae73731a352.tar.gz opensim-SC-bc92d72828925d8b3df72cf66b003ae73731a352.tar.bz2 opensim-SC-bc92d72828925d8b3df72cf66b003ae73731a352.tar.xz | |
* Refactor: Collapses parts of different code paths in scene used when deleting and unlinking an object
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index f4e1ef4..3407d4e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
| @@ -1744,9 +1744,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1744 | part.ClearUndoState(); | 1744 | part.ClearUndoState(); |
| 1745 | } | 1745 | } |
| 1746 | 1746 | ||
| 1747 | DetachFromBackup(objectGroup); | 1747 | m_scene.UnlinkSceneObject(objectGroup.UUID); |
| 1748 | |||
| 1749 | m_scene.DeleteEntity(objectGroup.UUID); | ||
| 1750 | 1748 | ||
| 1751 | // TODO Deleting the parts may cause problems later on if they have already | 1749 | // TODO Deleting the parts may cause problems later on if they have already |
| 1752 | // made it into the update queue. However, sending out updates for those parts is now | 1750 | // made it into the update queue. However, sending out updates for those parts is now |