From f6071c030dc608f1026d32e8e91a7d348313dff2 Mon Sep 17 00:00:00 2001 From: Homer Horwitz Date: Sun, 21 Sep 2008 16:07:41 +0000 Subject: [PATCH] Don't attach attachements to child agents. This coincidentially fixes a race condition that was the reason for mantis #2218. --- OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index b0b402c473..ff89ef901a 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;