1 files changed, 36 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3343d08..3576a88 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3162,6 +3162,9 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 m_eventManager.TriggerOnRemovePresence(agentID);
+
+                CleanDroppedAttachments();
+
                 ForEachClient(
                     delegate(IClientAPI client)
                     {
@@ -3408,6 +3411,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (vialogin) 
             {
+                CleanDroppedAttachments();
+
                 if (TestBorderCross(agent.startpos, Cardinals.E))
                 {
                     Border crossedBorder = GetCrossedBorder(agent.startpos, Cardinals.E);
@@ -4984,5 +4989,36 @@ namespace OpenSim.Region.Framework.Scenes
                     throw new Exception(error);
             }
         }
+
+        public void CleanDroppedAttachments()
+        {
+            List<SceneObjectGroup> objectsToDelete =
+                    new List<SceneObjectGroup>();
+
+            ForEachSOG(delegate (SceneObjectGroup grp)
+                    {
+                        if (grp.RootPart.Shape.State != 0)
+                        {
+                            if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp)))
+                            {
+                                objectsToDelete.Add(grp);
+                                return;
+                            }
+
+                            ScenePresence sp = GetScenePresence(agentID);
+                            if (sp == null)
+                            {
+                                objectsToDelete.Add(grp);
+                                return;
+                            }
+                        }
+                    });
+            
+            foreach (SceneObjectGroup grp in objectsToDelete)
+            {
+                m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
+                DeleteSceneObject(grp, true);
+            }
+        }
     }
 }