diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 7eb829e..9570769 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -4060,7 +4060,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4060 | 4060 | ||
4061 | if (collisionPlane == Vector4.Zero) | 4061 | if (collisionPlane == Vector4.Zero) |
4062 | collisionPlane = Vector4.UnitW; | 4062 | collisionPlane = Vector4.UnitW; |
4063 | 4063 | //m_log.DebugFormat("CollisionPlane: {0}",collisionPlane); | |
4064 | collisionPlane.ToBytes(data, pos); | 4064 | collisionPlane.ToBytes(data, pos); |
4065 | pos += 16; | 4065 | pos += 16; |
4066 | } | 4066 | } |
@@ -4145,12 +4145,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
4145 | update.PCode = (byte)PCode.Avatar; | 4145 | update.PCode = (byte)PCode.Avatar; |
4146 | update.ProfileCurve = 1; | 4146 | update.ProfileCurve = 1; |
4147 | update.PSBlock = Utils.EmptyBytes; | 4147 | update.PSBlock = Utils.EmptyBytes; |
4148 | update.Scale = Vector3.One; | 4148 | update.Scale = new Vector3(0.45f,0.6f,1.9f); |
4149 | update.Text = Utils.EmptyBytes; | 4149 | update.Text = Utils.EmptyBytes; |
4150 | update.TextColor = new byte[4]; | 4150 | update.TextColor = new byte[4]; |
4151 | update.TextureAnim = Utils.EmptyBytes; | 4151 | update.TextureAnim = Utils.EmptyBytes; |
4152 | update.TextureEntry = data.TextureEntry ?? Utils.EmptyBytes; | 4152 | update.TextureEntry = data.TextureEntry ?? Utils.EmptyBytes; |
4153 | update.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24); // TODO: Replace these numbers with PrimFlags | 4153 | update.UpdateFlags = (uint)(PrimFlags.Physics | PrimFlags.ObjectModify | PrimFlags.ObjectCopy | PrimFlags.ObjectAnyOwner | PrimFlags.ObjectYouOwner | PrimFlags.ObjectMove | PrimFlags.InventoryEmpty | PrimFlags.ObjectTransfer | PrimFlags.ObjectOwnerModify);//61 + (9 << 8) + (130 << 16) + (16 << 24); // TODO: Replace these numbers with PrimFlags |
4154 | 4154 | ||
4155 | return update; | 4155 | return update; |
4156 | } | 4156 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 424c25b..0d1133f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -994,9 +994,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
994 | } | 994 | } |
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, | 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))); | 999 | AbsolutePosition, Velocity, Vector3.Zero, m_bodyRot, new Vector4(0,0,1,AbsolutePosition.Z - 0.5f), m_uuid, null, GetUpdatePriority(ControllingClient))); |
1000 | } | 1000 | } |
1001 | 1001 | ||
1002 | public void AddNeighbourRegion(ulong regionHandle, string cap) | 1002 | public void AddNeighbourRegion(ulong regionHandle, string cap) |