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

Merge branch 'master' into httptests

httptests
UbitUmarov 2018-03-27 20:01:55 +01:00
parent 20d221a963 6b02c99194
commit b1569d09bf
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1178,6 +1178,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
agent.SenderWantsToWaitForRoot = true; agent.SenderWantsToWaitForRoot = true;
//SetCallbackURL(agent, sp.Scene.RegionInfo); //SetCallbackURL(agent, sp.Scene.RegionInfo);
// Reset the do not close flag. This must be done before the destination opens child connections (here // Reset the do not close flag. This must be done before the destination opens child connections (here
@ -1548,6 +1549,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
CrossAsyncDelegate icon = (CrossAsyncDelegate)iar.AsyncState; CrossAsyncDelegate icon = (CrossAsyncDelegate)iar.AsyncState;
ScenePresence agent = icon.EndInvoke(iar); ScenePresence agent = icon.EndInvoke(iar);
if(agent == null || agent.IsDeleted)
return;
if(!agent.IsChildAgent) if(!agent.IsChildAgent)
{ {
@ -1575,7 +1578,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
ctx, out newpos, out failureReason); ctx, out newpos, out failureReason);
if (neighbourRegion == null) if (neighbourRegion == null)
{ {
if (failureReason != String.Empty) if (!agent.IsDeleted && failureReason != String.Empty && agent.ControllingClient != null)
agent.ControllingClient.SendAlertMessage(failureReason); agent.ControllingClient.SendAlertMessage(failureReason);
return agent; return agent;
} }