aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2010-11-08 03:06:58 +0000
committerMelanie2010-11-08 03:06:58 +0000
commit798abd1508354e8af824f97121bc834d98e85648 (patch)
tree27b7e703a71366908c6d92877b4f737867b7ede0 /OpenSim/Region/Framework/Scenes
parentFix merge artefacts (diff)
downloadopensim-SC_OLD-798abd1508354e8af824f97121bc834d98e85648.zip
opensim-SC_OLD-798abd1508354e8af824f97121bc834d98e85648.tar.gz
opensim-SC_OLD-798abd1508354e8af824f97121bc834d98e85648.tar.bz2
opensim-SC_OLD-798abd1508354e8af824f97121bc834d98e85648.tar.xz
Reinstate a lost fix
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3fc195a..94a773d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3164,8 +3164,6 @@ namespace OpenSim.Region.Framework.Scenes
3164 3164
3165 m_eventManager.TriggerOnRemovePresence(agentID); 3165 m_eventManager.TriggerOnRemovePresence(agentID);
3166 3166
3167 CleanDroppedAttachments();
3168
3169 ForEachClient( 3167 ForEachClient(
3170 delegate(IClientAPI client) 3168 delegate(IClientAPI client)
3171 { 3169 {
@@ -3198,6 +3196,7 @@ namespace OpenSim.Region.Framework.Scenes
3198 } 3196 }
3199 3197
3200 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); 3198 m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode);
3199 CleanDroppedAttachments();
3201 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); 3200 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
3202 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); 3201 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
3203 } 3202 }