diff options
| author | Justin Clark-Casey (justincc) | 2012-06-08 01:24:44 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-08 01:26:43 +0100 |
| commit | 30f4a33f01751d151ae3923b48e6e98083791140 (patch) | |
| tree | e361716ee927c731621276b8bc490924a71d277f /OpenSim/Region/CoreModules | |
| parent | Go back to calling IncomingCloseAgent() in the "kick user" command for consis... (diff) | |
| download | opensim-SC-30f4a33f01751d151ae3923b48e6e98083791140.zip opensim-SC-30f4a33f01751d151ae3923b48e6e98083791140.tar.gz opensim-SC-30f4a33f01751d151ae3923b48e6e98083791140.tar.bz2 opensim-SC-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/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 1 |
1 files changed, 0 insertions, 1 deletions
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 | |||
| 644 | // an agent cannot teleport back to this region if it has teleported away. | 644 | // an agent cannot teleport back to this region if it has teleported away. |
| 645 | Thread.Sleep(2000); | 645 | Thread.Sleep(2000); |
| 646 | 646 | ||
| 647 | sp.Close(); | ||
| 648 | sp.Scene.IncomingCloseAgent(sp.UUID); | 647 | sp.Scene.IncomingCloseAgent(sp.UUID); |
| 649 | } | 648 | } |
| 650 | else | 649 | else |