diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 8cd3ac6..b6f67f7 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1098,27 +1098,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1098 | 1098 | ||
1099 | public void StopFlying() | 1099 | public void StopFlying() |
1100 | { | 1100 | { |
1101 | // It turns out to get the agent to stop flying, you have to feed it stop flying velocities | 1101 | ControllingClient.StopFlying(this); |
1102 | // There's no explicit message to send the client to tell it to stop flying.. it relies on the | ||
1103 | // velocity, collision plane and avatar height | ||
1104 | |||
1105 | // Add 1/6 the avatar's height to it's position so it doesn't shoot into the air | ||
1106 | // when the avatar stands up | ||
1107 | |||
1108 | if (m_avHeight != 127.0f) | ||
1109 | { | ||
1110 | AbsolutePosition = AbsolutePosition + new Vector3(0f, 0f, (m_avHeight / 6f)); | ||
1111 | } | ||
1112 | else | ||
1113 | { | ||
1114 | AbsolutePosition = AbsolutePosition + new Vector3(0f, 0f, (1.56f / 6f)); | ||
1115 | } | ||
1116 | |||
1117 | m_updateCount = UPDATE_COUNT; //KF: Trigger Anim updates to catch falling anim. | ||
1118 | |||
1119 | ControllingClient.SendPrimUpdate(this, PrimUpdateFlags.Position); | ||
1120 | //ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, | ||
1121 | // AbsolutePosition, Velocity, Vector3.Zero, m_bodyRot, new Vector4(0,0,1,AbsolutePosition.Z - 0.5f), m_uuid, null, GetUpdatePriority(ControllingClient))); | ||
1122 | } | 1102 | } |
1123 | 1103 | ||
1124 | public void AddNeighbourRegion(ulong regionHandle, string cap) | 1104 | public void AddNeighbourRegion(ulong regionHandle, string cap) |