aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-11-08 02:38:15 +0000
committerMelanie2010-11-08 02:38:15 +0000
commit4f6dd8bda38a2b336506e24f8c41c8d8ebe2d69b (patch)
tree623948777f35ac4b68ef0b700512412c2235573b /OpenSim/Region/Framework/Scenes
parentCall the Cleanup when an agent logs out, when an agent leaves and just (diff)
downloadopensim-SC_OLD-4f6dd8bda38a2b336506e24f8c41c8d8ebe2d69b.zip
opensim-SC_OLD-4f6dd8bda38a2b336506e24f8c41c8d8ebe2d69b.tar.gz
opensim-SC_OLD-4f6dd8bda38a2b336506e24f8c41c8d8ebe2d69b.tar.bz2
opensim-SC_OLD-4f6dd8bda38a2b336506e24f8c41c8d8ebe2d69b.tar.xz
Call the cleanup after saving attachment states, so that the attachments
don't get killed before they can be saved
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
1 files changed, 3 insertions, 1 deletions
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
3154 3154
3155 } 3155 }
3156 m_eventManager.TriggerClientClosed(agentID, this); 3156 m_eventManager.TriggerClientClosed(agentID, this);
3157 CleanDroppedAttachments();
3158 } 3157 }
3159 catch (NullReferenceException) 3158 catch (NullReferenceException)
3160 { 3159 {
@@ -3163,6 +3162,9 @@ namespace OpenSim.Region.Framework.Scenes
3163 } 3162 }
3164 3163
3165 m_eventManager.TriggerOnRemovePresence(agentID); 3164 m_eventManager.TriggerOnRemovePresence(agentID);
3165
3166 CleanDroppedAttachments();
3167
3166 ForEachClient( 3168 ForEachClient(
3167 delegate(IClientAPI client) 3169 delegate(IClientAPI client)
3168 { 3170 {