aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie2010-06-12 01:25:25 +0100
committerMelanie2010-06-12 01:25:25 +0100
commitc8ed9724437d9bf1972d4ef3e2b10dd9fa3e7e70 (patch)
tree0c0e165c75dc520a9788813a1768db3e9f145054 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentSome people don't use Simian. Make the connector respect that it's disabled (diff)
downloadopensim-SC_OLD-c8ed9724437d9bf1972d4ef3e2b10dd9fa3e7e70.zip
opensim-SC_OLD-c8ed9724437d9bf1972d4ef3e2b10dd9fa3e7e70.tar.gz
opensim-SC_OLD-c8ed9724437d9bf1972d4ef3e2b10dd9fa3e7e70.tar.bz2
opensim-SC_OLD-c8ed9724437d9bf1972d4ef3e2b10dd9fa3e7e70.tar.xz
Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet
we used to send before slimupdates and explicitly send it
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs20
1 files changed, 1 insertions, 19 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 15b9446..c1e835e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1015,25 +1015,7 @@ namespace OpenSim.Region.Framework.Scenes
1015 1015
1016 public void StopFlying() 1016 public void StopFlying()
1017 { 1017 {
1018 // It turns out to get the agent to stop flying, you have to feed it stop flying velocities 1018 ControllingClient.StopFlying(this);
1019 // There's no explicit message to send the client to tell it to stop flying.. it relies on the
1020 // velocity, collision plane and avatar height
1021
1022 // Add 1/6 the avatar's height to it's position so it doesn't shoot into the air
1023 // when the avatar stands up
1024
1025 if (m_avHeight != 127.0f)
1026 {
1027 AbsolutePosition = AbsolutePosition + new Vector3(0f, 0f, (m_avHeight / 6f));
1028 }
1029 else
1030 {
1031 AbsolutePosition = AbsolutePosition + new Vector3(0f, 0f, (1.56f / 6f));
1032 }
1033
1034 ControllingClient.SendPrimUpdate(this, PrimUpdateFlags.Position);
1035 //ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId,
1036 // AbsolutePosition, Velocity, Vector3.Zero, m_bodyRot, new Vector4(0,0,1,AbsolutePosition.Z - 0.5f), m_uuid, null, GetUpdatePriority(ControllingClient)));
1037 } 1019 }
1038 1020
1039 public void AddNeighbourRegion(ulong regionHandle, string cap) 1021 public void AddNeighbourRegion(ulong regionHandle, string cap)