diff options
| author | Justin Clark-Casey (justincc) | 2011-08-23 00:08:29 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-08-23 00:08:29 +0100 |
| commit | afd5469eec3111fa2de9b4e5e53f1f104a521086 (patch) | |
| tree | b20994df748de84c46497d5f4370afe3fec368ee /OpenSim | |
| parent | If an object failed to attach due to an exception, then try and detach it fro... (diff) | |
| download | opensim-SC_OLD-afd5469eec3111fa2de9b4e5e53f1f104a521086.zip opensim-SC_OLD-afd5469eec3111fa2de9b4e5e53f1f104a521086.tar.gz opensim-SC_OLD-afd5469eec3111fa2de9b4e5e53f1f104a521086.tar.bz2 opensim-SC_OLD-afd5469eec3111fa2de9b4e5e53f1f104a521086.tar.xz | |
Remove pointless contains check in ScenePresence.RemoveAttachment()
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9f9af45..9518161 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3509,12 +3509,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3509 | public void RemoveAttachment(SceneObjectGroup gobj) | 3509 | public void RemoveAttachment(SceneObjectGroup gobj) |
| 3510 | { | 3510 | { |
| 3511 | lock (m_attachments) | 3511 | lock (m_attachments) |
| 3512 | { | 3512 | m_attachments.Remove(gobj); |
| 3513 | if (m_attachments.Contains(gobj)) | ||
| 3514 | { | ||
| 3515 | m_attachments.Remove(gobj); | ||
| 3516 | } | ||
| 3517 | } | ||
| 3518 | } | 3513 | } |
| 3519 | 3514 | ||
| 3520 | public bool ValidateAttachments() | 3515 | public bool ValidateAttachments() |