From 3b63699b9d9f26248af8e27b3ea183903bdeaa67 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 1 Apr 2019 13:55:54 +0100 Subject: [PATCH] still issues on fast hg tps --- .../Framework/EntityTransfer/EntityTransferModule.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 01b4f106e7..fb2fd07490 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs @@ -1163,7 +1163,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer return; } - m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp); + //shut this up for now + m_entityTransferStateMachine.ResetFromTransit(sp.UUID); + + //m_entityTransferStateMachine.UpdateInTransit(sp.UUID, AgentTransferState.CleaningUp); sp.HasMovedAway(!(OutSideViewRange || logout)); @@ -1181,6 +1184,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer sp.CloseChildAgents(childRegionsToClose); } + // if far jump we do need to close anyways if (NeedsClosing(reg, OutSideViewRange)) { @@ -1194,6 +1198,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer break; } while (--count > 0); + if (!sp.IsDeleted) { m_log.DebugFormat( @@ -2464,7 +2469,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer //Scene.CloseAgent(sp.UUID, false); sp.IsInTransit = false; - m_entityTransferStateMachine.ResetFromTransit(id); // this needs cleanup //m_entityTransferStateMachine.SetAgentArrivedAtDestination(id); }