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

change avatar arrival at hg destination handling

0.9.1.0-post-fixes
UbitUmarov 2019-04-01 13:18:40 +01:00
parent 3327bed34b
commit 5dc7623e38
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1190,12 +1190,14 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
Thread.Sleep(250); Thread.Sleep(250);
if(sp.IsDeleted) if(sp.IsDeleted)
return; return;
if(!sp.IsInTransit)
break;
} while (--count > 0); } while (--count > 0);
if (!sp.IsDeleted) if (!sp.IsDeleted)
{ {
m_log.DebugFormat( m_log.DebugFormat(
"[ENTITY TRANSFER MODULE]: Closing agent {0} in {1} after teleport timeout", sp.Name, Scene.Name); "[ENTITY TRANSFER MODULE]: Closing agent {0} in {1} after teleport {2}", sp.Name, Scene.Name, sp.IsInTransit?"timeout":"");
sp.Scene.CloseAgent(sp.UUID, false); sp.Scene.CloseAgent(sp.UUID, false);
} }
return; return;
@ -2460,7 +2462,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
if(sp == null || sp.IsDeleted || !sp.IsInTransit) if(sp == null || sp.IsDeleted || !sp.IsInTransit)
return; return;
Scene.CloseAgent(sp.UUID, false); //Scene.CloseAgent(sp.UUID, false);
sp.IsInTransit = false;
m_entityTransferStateMachine.ResetFromTransit(id); // this needs cleanup m_entityTransferStateMachine.ResetFromTransit(id); // this needs cleanup
//m_entityTransferStateMachine.SetAgentArrivedAtDestination(id); //m_entityTransferStateMachine.SetAgentArrivedAtDestination(id);
} }