From 30f4a33f01751d151ae3923b48e6e98083791140 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 8 Jun 2012 01:24:44 +0100
Subject: 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.
---
 .../Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs  | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Framework')

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index f2926ea..7d82060 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -644,7 +644,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 // an agent cannot teleport back to this region if it has teleported away.
                 Thread.Sleep(2000);
 
-                sp.Close();
                 sp.Scene.IncomingCloseAgent(sp.UUID);
             }
             else
-- 
cgit v1.1