Call the Cleanup when an agent logs out, when an agent leaves and just

before an agent logs in directly. Intentionally not calling this from MakeRoot
as that would mess up attachment transfer in teleport

1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index be01d44..dd817ce 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3154,6 +3154,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                     }
                     m_eventManager.TriggerClientClosed(agentID, this);
+                    CleanDroppedAttachments();
                 }
                 catch (NullReferenceException)
                 {
@@ -3408,6 +3409,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (vialogin) 
             {
+                CleanDroppedAttachments();
+
                 if (TestBorderCross(agent.startpos, Cardinals.E))
                 {
                     Border crossedBorder = GetCrossedBorder(agent.startpos, Cardinals.E);