ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

delegate.BeginInvoke is a dead end

Browse Source
This commit is contained in:
UbitUmarov
2021-09-09 18:27:16 +01:00
parent c1a39589f6
commit 29e3cc3bd9
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1601,28 +1601,23 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
{
agent.IsInLocalTransit = true;
agent.IsInTransit = true;
CrossAsyncDelegate d = CrossAsync;
d.BeginInvoke(agent, isFlying, CrossCompleted, d);
return true;
}
private void CrossCompleted(IAsyncResult iar)
{
CrossAsyncDelegate icon = (CrossAsyncDelegate)iar.AsyncState;
ScenePresence agent = icon.EndInvoke(iar);
if(agent == null || agent.IsDeleted)
return;
if(!agent.IsChildAgent)
WorkManager.RunInThreadPool(delegate
{
// crossing failed
agent.CrossToNewRegionFail();
}
else
m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
ScenePresence ag = agent;
CrossAsync(ag, isFlying);
if (ag.IsDeleted)
return;
if (!ag.IsChildAgent)
{
// crossing failed
ag.CrossToNewRegionFail();
}
else
m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", ag.Firstname, ag.Lastname);
agent.IsInTransit = false;
ag.IsInTransit = false;
}, null,"AgentRegionCross-"+agent.UUID.ToString());
return true;
}
public ScenePresence CrossAsync(ScenePresence agent, bool isFlying)
@@ -1654,7 +1649,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
return agent;
}
// agent.IsInTransit = true;
//agent.IsInTransit = true;
CrossAgentToNewRegionAsync(agent, newpos, neighbourRegion, isFlying, ctx);
agent.IsInTransit = false;
return agent;