aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2010-11-08 02:37:28 +0000
committerMelanie2010-11-08 02:37:28 +0000
commit2f58d561371ed93202c276dfe0c359fcf6f70358 (patch)
tree915868d7c5659b298e0f605fe016ed99bcae1b3a /OpenSim/Region
parentCall attachment cleanup when an agent crosses out (diff)
downloadopensim-SC_OLD-2f58d561371ed93202c276dfe0c359fcf6f70358.zip
opensim-SC_OLD-2f58d561371ed93202c276dfe0c359fcf6f70358.tar.gz
opensim-SC_OLD-2f58d561371ed93202c276dfe0c359fcf6f70358.tar.bz2
opensim-SC_OLD-2f58d561371ed93202c276dfe0c359fcf6f70358.tar.xz
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
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index be01d44..dd817ce 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3154,6 +3154,7 @@ namespace OpenSim.Region.Framework.Scenes
3154 3154
3155 } 3155 }
3156 m_eventManager.TriggerClientClosed(agentID, this); 3156 m_eventManager.TriggerClientClosed(agentID, this);
3157 CleanDroppedAttachments();
3157 } 3158 }
3158 catch (NullReferenceException) 3159 catch (NullReferenceException)
3159 { 3160 {
@@ -3408,6 +3409,8 @@ namespace OpenSim.Region.Framework.Scenes
3408 3409
3409 if (vialogin) 3410 if (vialogin)
3410 { 3411 {
3412 CleanDroppedAttachments();
3413
3411 if (TestBorderCross(agent.startpos, Cardinals.E)) 3414 if (TestBorderCross(agent.startpos, Cardinals.E))
3412 { 3415 {
3413 Border crossedBorder = GetCrossedBorder(agent.startpos, Cardinals.E); 3416 Border crossedBorder = GetCrossedBorder(agent.startpos, Cardinals.E);