diff options
| author | UbitUmarov | 2018-03-27 16:03:44 +0100 |
|---|---|---|
| committer | UbitUmarov | 2018-03-27 16:03:44 +0100 |
| commit | cb134e5487877cafef2287713aba1045270fcb84 (patch) | |
| tree | d4238115cef7e378e0fb1ad2d48e30bf4f384163 /OpenSim | |
| parent | mantis 8257: fix the default realm (ie table name) of AuthenticationService (diff) | |
| download | opensim-SC-cb134e5487877cafef2287713aba1045270fcb84.zip opensim-SC-cb134e5487877cafef2287713aba1045270fcb84.tar.gz opensim-SC-cb134e5487877cafef2287713aba1045270fcb84.tar.bz2 opensim-SC-cb134e5487877cafef2287713aba1045270fcb84.tar.xz | |
mantis8307: avoid a null ref
Diffstat (limited to 'OpenSim')
| -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 |