diff options
| author | Justin Clark-Casey (justincc) | 2012-06-25 22:48:13 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-25 22:48:13 +0100 |
| commit | e5b739aaebace6b028f3f6bf05d21ff7a7c5affe (patch) | |
| tree | f76c578681da34fddb0c36eeada8af57eaf0bbc4 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | In AttachmentsModule.DetachSingleAttachmentToInvInternal(), remove attachment... (diff) | |
| download | opensim-SC_OLD-e5b739aaebace6b028f3f6bf05d21ff7a7c5affe.zip opensim-SC_OLD-e5b739aaebace6b028f3f6bf05d21ff7a7c5affe.tar.gz opensim-SC_OLD-e5b739aaebace6b028f3f6bf05d21ff7a7c5affe.tar.bz2 opensim-SC_OLD-e5b739aaebace6b028f3f6bf05d21ff7a7c5affe.tar.xz | |
When attachments are being saved and deleted for a closing root agent, delete first to avoid a hud race condition with update threads.
If delete doesn't occur first then the update thread can outrace the IsAttachment = false necessary to save attachments and send hud artifacts to other viewers.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 3909fd4..909c7c8 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3416,9 +3416,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3416 | 3416 | ||
| 3417 | public void Close() | 3417 | public void Close() |
| 3418 | { | 3418 | { |
| 3419 | if (!IsChildAgent && m_scene.AttachmentsModule != null) | ||
| 3420 | m_scene.AttachmentsModule.DeleteAttachmentsFromScene(this, false); | ||
| 3421 | |||
| 3422 | // Clear known regions | 3419 | // Clear known regions |
| 3423 | KnownRegions = new Dictionary<ulong, string>(); | 3420 | KnownRegions = new Dictionary<ulong, string>(); |
| 3424 | 3421 | ||