diff options
| author | Melanie | 2013-05-16 21:59:14 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-16 21:59:14 +0100 |
| commit | 42c82b564ea0fe58376bffae2731bcedf4b842c7 (patch) | |
| tree | 7ed5d564f320c1dcf6b709a1436b584a59e74a5e /OpenSim/Region/CoreModules/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: remove long commented out scene cache clearing code in EntityTransferM... (diff) | |
| download | opensim-SC_OLD-42c82b564ea0fe58376bffae2731bcedf4b842c7.zip opensim-SC_OLD-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.gz opensim-SC_OLD-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.bz2 opensim-SC_OLD-42c82b564ea0fe58376bffae2731bcedf4b842c7.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 6e19805..6b90097 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -942,6 +942,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 942 | EnableChildAgents(sp); | 942 | EnableChildAgents(sp); |
| 943 | 943 | ||
| 944 | // Finally, kill the agent we just created at the destination. | 944 | // Finally, kill the agent we just created at the destination. |
| 945 | // XXX: Possibly this should be done asynchronously. | ||
| 945 | Scene.SimulationService.CloseAgent(finalDestination, sp.UUID); | 946 | Scene.SimulationService.CloseAgent(finalDestination, sp.UUID); |
| 946 | } | 947 | } |
| 947 | 948 | ||