diff options
author | Justin Clark-Casey (justincc) | 2013-04-03 00:48:36 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-04-03 00:48:36 +0100 |
commit | 94d44142e37a9191162a426f28dd23f40b0cf4aa (patch) | |
tree | 4763a2ddafab8db709533fd31cd8f8c96468d80d /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent val... (diff) | |
download | opensim-SC_OLD-94d44142e37a9191162a426f28dd23f40b0cf4aa.zip opensim-SC_OLD-94d44142e37a9191162a426f28dd23f40b0cf4aa.tar.gz opensim-SC_OLD-94d44142e37a9191162a426f28dd23f40b0cf4aa.tar.bz2 opensim-SC_OLD-94d44142e37a9191162a426f28dd23f40b0cf4aa.tar.xz |
minor: Stop falsely logging that a teleport was being aborted on client logout even when no teleport was active.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-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 3e69bf2..ca0cef1 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); |