diff options
author | UbitUmarov | 2014-09-16 21:25:06 +0100 |
---|---|---|
committer | UbitUmarov | 2014-09-16 21:25:06 +0100 |
commit | affcdcce8b2bd59f3c7f83e38adb9e1246f7d00f (patch) | |
tree | d81e62c7c3d856f4f125aab22b807b55142fb100 /OpenSim/Region/CoreModules/Framework/EntityTransfer | |
parent | Reinstate closing the client if CloseAgen returns false. This was part (diff) | |
download | opensim-SC-affcdcce8b2bd59f3c7f83e38adb9e1246f7d00f.zip opensim-SC-affcdcce8b2bd59f3c7f83e38adb9e1246f7d00f.tar.gz opensim-SC-affcdcce8b2bd59f3c7f83e38adb9e1246f7d00f.tar.bz2 opensim-SC-affcdcce8b2bd59f3c7f83e38adb9e1246f7d00f.tar.xz |
try to send fly state on tps
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 19c068a..b735f36 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -868,6 +868,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
868 | // Let's send a full update of the agent. This is a synchronous call. | 868 | // Let's send a full update of the agent. This is a synchronous call. |
869 | AgentData agent = new AgentData(); | 869 | AgentData agent = new AgentData(); |
870 | sp.CopyTo(agent); | 870 | sp.CopyTo(agent); |
871 | |||
872 | if ((teleportFlags & (uint)TeleportFlags.IsFlying) != 0) | ||
873 | agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; | ||
874 | |||
871 | agent.Position = agentCircuit.startpos; | 875 | agent.Position = agentCircuit.startpos; |
872 | SetCallbackURL(agent, sp.Scene.RegionInfo); | 876 | SetCallbackURL(agent, sp.Scene.RegionInfo); |
873 | 877 | ||
@@ -1109,6 +1113,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1109 | AgentData agent = new AgentData(); | 1113 | AgentData agent = new AgentData(); |
1110 | sp.CopyTo(agent); | 1114 | sp.CopyTo(agent); |
1111 | agent.Position = agentCircuit.startpos; | 1115 | agent.Position = agentCircuit.startpos; |
1116 | |||
1117 | if ((teleportFlags & (uint)TeleportFlags.IsFlying) != 0) | ||
1118 | agent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; | ||
1119 | |||
1112 | agent.SenderWantsToWaitForRoot = true; | 1120 | agent.SenderWantsToWaitForRoot = true; |
1113 | //SetCallbackURL(agent, sp.Scene.RegionInfo); | 1121 | //SetCallbackURL(agent, sp.Scene.RegionInfo); |
1114 | 1122 | ||