diff options
| author | Justin Clark-Casey (justincc) | 2011-08-31 17:53:58 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-08-31 17:53:58 +0100 |
| commit | 7d58b5fa157b4c3e842573d9fb02a9822034f4b0 (patch) | |
| tree | b726d3c045a2ccbad3530b27c00e8a03027f5548 /OpenSim/Region/Framework/Scenes | |
| parent | If a FireAndForget thread terminates with an exception, then catch and log ra... (diff) | |
| download | opensim-SC-7d58b5fa157b4c3e842573d9fb02a9822034f4b0.zip opensim-SC-7d58b5fa157b4c3e842573d9fb02a9822034f4b0.tar.gz opensim-SC-7d58b5fa157b4c3e842573d9fb02a9822034f4b0.tar.bz2 opensim-SC-7d58b5fa157b4c3e842573d9fb02a9822034f4b0.tar.xz | |
move common code into AttachmentsModule.DeleteAttachmentsFromScene()
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 5e96b0a..0d284a5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3401,19 +3401,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3401 | 3401 | ||
| 3402 | public void Close() | 3402 | public void Close() |
| 3403 | { | 3403 | { |
| 3404 | lock (m_attachments) | 3404 | m_scene.AttachmentsModule.DeleteAttachmentsFromScene(this, false); |
| 3405 | { | ||
| 3406 | // Delete attachments from scene | ||
| 3407 | // Don't try to save, as this thread won't live long | ||
| 3408 | // enough to complete the save. This would cause no copy | ||
| 3409 | // attachments to poof! | ||
| 3410 | // | ||
| 3411 | foreach (SceneObjectGroup grp in m_attachments) | ||
| 3412 | { | ||
| 3413 | m_scene.DeleteSceneObject(grp, false); | ||
| 3414 | } | ||
| 3415 | m_attachments.Clear(); | ||
| 3416 | } | ||
| 3417 | 3405 | ||
| 3418 | lock (m_knownChildRegions) | 3406 | lock (m_knownChildRegions) |
| 3419 | { | 3407 | { |