diff options
| author | Melanie | 2013-04-04 03:17:38 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-04 03:17:38 +0100 |
| commit | b16a560b779b925425ded0b4a84c4c0c04487883 (patch) | |
| tree | 11c06ea200f47f04e4068ce146431f3bdef240f6 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Stop falsely logging that a teleport was being aborted on client logou... (diff) | |
| download | opensim-SC-b16a560b779b925425ded0b4a84c4c0c04487883.zip opensim-SC-b16a560b779b925425ded0b4a84c4c0c04487883.tar.gz opensim-SC-b16a560b779b925425ded0b4a84c4c0c04487883.tar.bz2 opensim-SC-b16a560b779b925425ded0b4a84c4c0c04487883.tar.xz | |
Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index b70aeb7..6e19805 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -280,10 +280,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 280 | 280 | ||
| 281 | private void OnConnectionClosed(IClientAPI client) | 281 | private void OnConnectionClosed(IClientAPI client) |
| 282 | { | 282 | { |
| 283 | if (client.IsLoggingOut) | 283 | if (client.IsLoggingOut && m_entityTransferStateMachine.UpdateInTransit(client.AgentId, AgentTransferState.Aborting)) |
| 284 | { | 284 | { |
| 285 | m_entityTransferStateMachine.UpdateInTransit(client.AgentId, AgentTransferState.Aborting); | ||
| 286 | |||
| 287 | m_log.DebugFormat( | 285 | m_log.DebugFormat( |
| 288 | "[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout", | 286 | "[ENTITY TRANSFER MODULE]: Aborted teleport request from {0} in {1} due to simultaneous logout", |
| 289 | client.Name, Scene.Name); | 287 | client.Name, Scene.Name); |