diff options
| author | Melanie | 2009-11-22 03:14:21 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-22 03:14:21 +0000 |
| commit | 87bce9008622ed941916296ce04714cdff087aea (patch) | |
| tree | 9b77638b092c1b42198584347391b3b976f4eb17 /OpenSim/Region/Framework | |
| parent | Minor packet ordering fix (diff) | |
| parent | * Comment out some example code for later. (diff) | |
| download | opensim-SC_OLD-87bce9008622ed941916296ce04714cdff087aea.zip opensim-SC_OLD-87bce9008622ed941916296ce04714cdff087aea.tar.gz opensim-SC_OLD-87bce9008622ed941916296ce04714cdff087aea.tar.bz2 opensim-SC_OLD-87bce9008622ed941916296ce04714cdff087aea.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 99f3141..0437a6d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1016,9 +1016,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1016 | } | 1016 | } |
| 1017 | 1017 | ||
| 1018 | Animator.TrySetMovementAnimation("LAND"); | 1018 | Animator.TrySetMovementAnimation("LAND"); |
| 1019 | SendFullUpdateToAllClients(); | 1019 | //SendFullUpdateToAllClients(); |
| 1020 | ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, | 1020 | ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, |
| 1021 | AbsolutePosition, Velocity, -Vector3.UnitZ, m_bodyRot, Vector4.UnitW, m_uuid, null, GetUpdatePriority(ControllingClient))); | 1021 | AbsolutePosition, Velocity, Vector3.Zero, m_bodyRot, new Vector4(0,0,1,AbsolutePosition.Z - 0.5f), m_uuid, null, GetUpdatePriority(ControllingClient))); |
| 1022 | } | 1022 | } |
| 1023 | 1023 | ||
| 1024 | public void AddNeighbourRegion(ulong regionHandle, string cap) | 1024 | public void AddNeighbourRegion(ulong regionHandle, string cap) |