diff options
| author | Melanie | 2009-11-21 16:00:18 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-21 16:00:18 +0000 |
| commit | 0844e5951cac40120aa0e4407b79c0f8b171b0ec (patch) | |
| tree | dbf0d59676a46a32d8c9992421c245b3f27e5af2 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'careminster' into tests (diff) | |
| parent | * Hack to get avatar to land on prim. This is a big nasty hack that tricks ... (diff) | |
| download | opensim-SC-0844e5951cac40120aa0e4407b79c0f8b171b0ec.zip opensim-SC-0844e5951cac40120aa0e4407b79c0f8b171b0ec.tar.gz opensim-SC-0844e5951cac40120aa0e4407b79c0f8b171b0ec.tar.bz2 opensim-SC-0844e5951cac40120aa0e4407b79c0f8b171b0ec.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1dedcf1..424c25b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -995,6 +995,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 995 | 995 | ||
| 996 | Animator.TrySetMovementAnimation("LAND"); | 996 | Animator.TrySetMovementAnimation("LAND"); |
| 997 | SendFullUpdateToAllClients(); | 997 | SendFullUpdateToAllClients(); |
| 998 | ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, | ||
| 999 | AbsolutePosition, Velocity, -Vector3.UnitZ, m_bodyRot, Vector4.UnitW, m_uuid, null, GetUpdatePriority(ControllingClient))); | ||
| 998 | } | 1000 | } |
| 999 | 1001 | ||
| 1000 | public void AddNeighbourRegion(ulong regionHandle, string cap) | 1002 | public void AddNeighbourRegion(ulong regionHandle, string cap) |