aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2018-03-27 20:01:55 +0100
committerUbitUmarov2018-03-27 20:01:55 +0100
commitb1569d09bf32838931514ebb3eb97641b650f89e (patch)
tree68eeea93e037b7ca0a51b98856603794164fbf1d /OpenSim
parentMerge branch 'master' into httptests (diff)
parentfix previus commit with the right source file :( (diff)
downloadopensim-SC-b1569d09bf32838931514ebb3eb97641b650f89e.zip
opensim-SC-b1569d09bf32838931514ebb3eb97641b650f89e.tar.gz
opensim-SC-b1569d09bf32838931514ebb3eb97641b650f89e.tar.bz2
opensim-SC-b1569d09bf32838931514ebb3eb97641b650f89e.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index da1ae6e9..2334e0b 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1178,6 +1178,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1178 agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; 1178 agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
1179 1179
1180 agent.SenderWantsToWaitForRoot = true; 1180 agent.SenderWantsToWaitForRoot = true;
1181
1181 //SetCallbackURL(agent, sp.Scene.RegionInfo); 1182 //SetCallbackURL(agent, sp.Scene.RegionInfo);
1182 1183
1183 // Reset the do not close flag. This must be done before the destination opens child connections (here 1184 // 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
1548 CrossAsyncDelegate icon = (CrossAsyncDelegate)iar.AsyncState; 1549 CrossAsyncDelegate icon = (CrossAsyncDelegate)iar.AsyncState;
1549 ScenePresence agent = icon.EndInvoke(iar); 1550 ScenePresence agent = icon.EndInvoke(iar);
1550 1551
1552 if(agent == null || agent.IsDeleted)
1553 return;
1551 1554
1552 if(!agent.IsChildAgent) 1555 if(!agent.IsChildAgent)
1553 { 1556 {
@@ -1575,7 +1578,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1575 ctx, out newpos, out failureReason); 1578 ctx, out newpos, out failureReason);
1576 if (neighbourRegion == null) 1579 if (neighbourRegion == null)
1577 { 1580 {
1578 if (failureReason != String.Empty) 1581 if (!agent.IsDeleted && failureReason != String.Empty && agent.ControllingClient != null)
1579 agent.ControllingClient.SendAlertMessage(failureReason); 1582 agent.ControllingClient.SendAlertMessage(failureReason);
1580 return agent; 1583 return agent;
1581 } 1584 }