diff options
| author | Justin Clark-Casey (justincc) | 2014-11-29 00:16:23 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-11-29 00:16:23 +0000 |
| commit | 39eab72d7c4912a79bf5ce147fad8bf359d27273 (patch) | |
| tree | 58586d3a1e63a967cef48e537f6de321eb782f9a /OpenSim/Region/CoreModules/Framework | |
| parent | Somewhat improve avatar region crossings by properly preserving velocity when... (diff) | |
| download | opensim-SC-39eab72d7c4912a79bf5ce147fad8bf359d27273.zip opensim-SC-39eab72d7c4912a79bf5ce147fad8bf359d27273.tar.gz opensim-SC-39eab72d7c4912a79bf5ce147fad8bf359d27273.tar.bz2 opensim-SC-39eab72d7c4912a79bf5ce147fad8bf359d27273.tar.xz | |
When performing region cross, don't add the velocity to the new position in ETM.CrossAgentIntoNewRegionMain() since this has already been performed by SP.CheckForBorderCrossing()
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 09e8204..cb32eec 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1695,7 +1695,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1695 | { | 1695 | { |
| 1696 | AgentData cAgent = new AgentData(); | 1696 | AgentData cAgent = new AgentData(); |
| 1697 | agent.CopyTo(cAgent); | 1697 | agent.CopyTo(cAgent); |
| 1698 | cAgent.Position = pos + agent.Velocity; | 1698 | cAgent.Position = pos; |
| 1699 | |||
| 1699 | if (isFlying) | 1700 | if (isFlying) |
| 1700 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; | 1701 | cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; |
| 1701 | 1702 | ||