OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

still issues on fast hg tps

0.9.1.0-post-fixes
UbitUmarov 2019-04-01 13:55:54 +01:00
parent 5dc7623e38
commit 3b63699b9d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
View File

@ -1163,7 +1163,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return; 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)); sp.HasMovedAway(!(OutSideViewRange || logout));
@ -1181,6 +1184,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
sp.CloseChildAgents(childRegionsToClose); sp.CloseChildAgents(childRegionsToClose);
} }
// if far jump we do need to close anyways // if far jump we do need to close anyways
if (NeedsClosing(reg, OutSideViewRange)) if (NeedsClosing(reg, OutSideViewRange))
{ {
@ -1194,6 +1198,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
break; break;
} while (--count > 0); } while (--count > 0);
if (!sp.IsDeleted) if (!sp.IsDeleted)
{ {
m_log.DebugFormat( m_log.DebugFormat(
@ -2464,7 +2469,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
//Scene.CloseAgent(sp.UUID, false); //Scene.CloseAgent(sp.UUID, false);
sp.IsInTransit = false; sp.IsInTransit = false;
m_entityTransferStateMachine.ResetFromTransit(id); // this needs cleanup
//m_entityTransferStateMachine.SetAgentArrivedAtDestination(id); //m_entityTransferStateMachine.SetAgentArrivedAtDestination(id);
} }