aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-08 01:24:44 +0100
committerJustin Clark-Casey (justincc)2012-06-08 01:26:43 +0100
commit30f4a33f01751d151ae3923b48e6e98083791140 (patch)
treee361716ee927c731621276b8bc490924a71d277f /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentGo back to calling IncomingCloseAgent() in the "kick user" command for consis... (diff)
downloadopensim-SC_OLD-30f4a33f01751d151ae3923b48e6e98083791140.zip
opensim-SC_OLD-30f4a33f01751d151ae3923b48e6e98083791140.tar.gz
opensim-SC_OLD-30f4a33f01751d151ae3923b48e6e98083791140.tar.bz2
opensim-SC_OLD-30f4a33f01751d151ae3923b48e6e98083791140.tar.xz
Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTeleport() if an agent needs closing.
This is always done as part of Scene.RemoveClient() Also refactors try/catching in Scene.RemoveClient() to log NREs instead of silently discarding, since these are useful symptoms of problems.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3adafc1..029e0d7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3416,7 +3416,7 @@ namespace OpenSim.Region.Framework.Scenes
3416 3416
3417 public void Close() 3417 public void Close()
3418 { 3418 {
3419 if (!IsChildAgent) 3419 if (!IsChildAgent && m_scene.AttachmentsModule != null)
3420 m_scene.AttachmentsModule.DeleteAttachmentsFromScene(this, false); 3420 m_scene.AttachmentsModule.DeleteAttachmentsFromScene(this, false);
3421 3421
3422 // Clear known regions 3422 // Clear known regions