diff options
| author | UbitUmarov | 2018-03-27 16:08:34 +0100 |
|---|---|---|
| committer | UbitUmarov | 2018-03-27 16:08:34 +0100 |
| commit | 20d221a963efdebc5bf93e3074a614c70c3ed6d0 (patch) | |
| tree | 7603af489b1adee78a88c617166cde6267bea7f5 | |
| parent | fix merge issue (diff) | |
| parent | mantis8307: avoid a null ref (diff) | |
| download | opensim-SC-20d221a963efdebc5bf93e3074a614c70c3ed6d0.zip opensim-SC-20d221a963efdebc5bf93e3074a614c70c3ed6d0.tar.gz opensim-SC-20d221a963efdebc5bf93e3074a614c70c3ed6d0.tar.bz2 opensim-SC-20d221a963efdebc5bf93e3074a614c70c3ed6d0.tar.xz | |
Merge branch 'master' into httptests
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index d51b9da..da1ae6e9 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1178,7 +1178,6 @@ 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 | |||
| 1182 | //SetCallbackURL(agent, sp.Scene.RegionInfo); | 1181 | //SetCallbackURL(agent, sp.Scene.RegionInfo); |
| 1183 | 1182 | ||
| 1184 | // Reset the do not close flag. This must be done before the destination opens child connections (here | 1183 | // Reset the do not close flag. This must be done before the destination opens child connections (here |