Don't attach attachements to child agents. This coincidentially fixes a race

condition that was the reason for mantis #2218.

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
             ScenePresence avatar = m_scene.GetScenePresence(agentID);
             if (avatar != null)
             {
+                // don't attach attachments to child agents
+                if (avatar.IsChildAgent) return;
+
                 DetachFromBackup(this);
                 m_rootPart.AttachedAvatar = agentID;