From b9e12ed3b7e6f33a824129ce6e79519140a34aa2 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Tue, 24 Aug 2010 18:20:24 +0200
Subject: [PATCH 1/4] Add a method to delete left over / dropped attachments

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 32 ++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 957c4e8978..d0619d7ff1 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5040,5 +5040,37 @@ 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)
+                        {
+                            UUID agentID = grp.OwnerID;
+                            if (agentID == UUID.Zero)
+                            {
+                                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);
+            }
+        }
     }
 }

From 5a05de0eec5cba9500fd4803e2bf2ffb54d92265 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Tue, 24 Aug 2010 18:38:54 +0200
Subject: [PATCH 2/4] Call attachment cleanup when an agent crosses out

---
 .../Framework/EntityTransfer/EntityTransferModule.cs            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 0ba67d3ebf..ee07f30178 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -446,6 +446,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // Now let's make it officially a child agent
                 sp.MakeChildAgent();
 
+                sp.Scene.CleanDroppedAttachments();
+
                 // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
 
                 if (NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg))

From 512a13dbe7a8dfa36a662f64caf573f467173b95 Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Tue, 24 Aug 2010 18:52:00 +0200
Subject: [PATCH 3/4] 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

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index d0619d7ff1..6452dfe31b 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);

From 4e324ae3cbf5c4ce16900bd5e57d8671c1de0cfc Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Tue, 24 Aug 2010 19:07:42 +0200
Subject: [PATCH 4/4] Call the cleanup after saving attachment states, so that
 the attachments don't get killed before they can be saved

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6452dfe31b..37d797e2ae 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3199,7 +3199,6 @@ 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)
                 {
@@ -3210,6 +3209,9 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.Debug("[Scene] Beginning OnRemovePresence");
                 m_eventManager.TriggerOnRemovePresence(agentID);
                 m_log.Debug("[Scene] Finished OnRemovePresence");
+
+                CleanDroppedAttachments();
+
                 ForEachClient(
                     delegate(IClientAPI client)
                     {