Make sure state machine is reset if crossing is aborted
parent
e3ea2c4bee
commit
ee18db027c
|
@ -1132,10 +1132,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
|||
bool isFlying, string version)
|
||||
{
|
||||
if (!CrossAgentToNewRegionPrep(agent, neighbourRegion))
|
||||
{
|
||||
m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
|
||||
return agent;
|
||||
}
|
||||
|
||||
if (!CrossAgentIntoNewRegionMain(agent, pos, neighbourRegion, isFlying))
|
||||
{
|
||||
m_entityTransferStateMachine.ResetFromTransit(agent.UUID);
|
||||
return agent;
|
||||
}
|
||||
|
||||
CrossAgentToNewRegionPost(agent, pos, neighbourRegion, isFlying, version);
|
||||
return agent;
|
||||
|
|
Loading…
Reference in New Issue