diff options
| author | Homer Horwitz | 2008-09-21 16:07:41 +0000 |
|---|---|---|
| committer | Homer Horwitz | 2008-09-21 16:07:41 +0000 |
| commit | f6071c030dc608f1026d32e8e91a7d348313dff2 (patch) | |
| tree | 173da688d6d8f6a59af8f6cf3c01ae726198764c /OpenSim | |
| parent | Mantis #2232 (diff) | |
| download | opensim-SC-f6071c030dc608f1026d32e8e91a7d348313dff2.zip opensim-SC-f6071c030dc608f1026d32e8e91a7d348313dff2.tar.gz opensim-SC-f6071c030dc608f1026d32e8e91a7d348313dff2.tar.bz2 opensim-SC-f6071c030dc608f1026d32e8e91a7d348313dff2.tar.xz | |
Don't attach attachements to child agents. This coincidentially fixes a race
condition that was the reason for mantis #2218.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index b0b402c..ff89ef9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
| @@ -710,6 +710,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 710 | ScenePresence avatar = m_scene.GetScenePresence(agentID); | 710 | ScenePresence avatar = m_scene.GetScenePresence(agentID); |
| 711 | if (avatar != null) | 711 | if (avatar != null) |
| 712 | { | 712 | { |
| 713 | // don't attach attachments to child agents | ||
| 714 | if (avatar.IsChildAgent) return; | ||
| 715 | |||
| 713 | DetachFromBackup(this); | 716 | DetachFromBackup(this); |
| 714 | m_rootPart.AttachedAvatar = agentID; | 717 | m_rootPart.AttachedAvatar = agentID; |
| 715 | 718 | ||