From 4f6dd8bda38a2b336506e24f8c41c8d8ebe2d69b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 8 Nov 2010 02:38:15 +0000
Subject: 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(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index dd817ce..77d7472 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3154,7 +3154,6 @@ namespace OpenSim.Region.Framework.Scenes
 
                     }
                     m_eventManager.TriggerClientClosed(agentID, this);
-                    CleanDroppedAttachments();
                 }
                 catch (NullReferenceException)
                 {
@@ -3163,6 +3162,9 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 
                 m_eventManager.TriggerOnRemovePresence(agentID);
+
+                CleanDroppedAttachments();
+
                 ForEachClient(
                     delegate(IClientAPI client)
                     {
-- 
cgit v1.1