diff options
| author | Melanie | 2012-06-08 01:12:37 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-08 01:12:37 +0100 |
| commit | 8ebe2cd3daf9fccfe45171893794d3d7d91d1462 (patch) | |
| tree | 51ad026e72126256c3931c5eb0628e437042f576 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTelepo... (diff) | |
| download | opensim-SC_OLD-8ebe2cd3daf9fccfe45171893794d3d7d91d1462.zip opensim-SC_OLD-8ebe2cd3daf9fccfe45171893794d3d7d91d1462.tar.gz opensim-SC_OLD-8ebe2cd3daf9fccfe45171893794d3d7d91d1462.tar.bz2 opensim-SC_OLD-8ebe2cd3daf9fccfe45171893794d3d7d91d1462.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
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 b9897c4..7b13213 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 |