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 d0619d7..6452dfe 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3199,6 +3199,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_log.Debug("[Scene] Beginning ClientClosed");
                     m_eventManager.TriggerClientClosed(agentID, this);
                     m_log.Debug("[Scene] Finished ClientClosed");
+                    CleanDroppedAttachments();
                 }
                 catch (NullReferenceException)
                 {
@@ -3442,6 +3443,8 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (vialogin) 
             {
+                CleanDroppedAttachments();
+
                 if (TestBorderCross(agent.startpos, Cardinals.E))
                 {
                     Border crossedBorder = GetCrossedBorder(agent.startpos, Cardinals.E);