diff options
author | Teravus Ovares (Dan Olivares) | 2009-11-21 19:38:38 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-11-21 19:38:38 -0500 |
commit | f7916d10f3b5ee006035afefe5301a8610820a0c (patch) | |
tree | e72d509380097e8c43ebb6bd0de360451b7d2fe2 /OpenSim/Region/ClientStack | |
parent | * Hack to get avatar to land on prim. This is a big nasty hack that tricks ... (diff) | |
download | opensim-SC-f7916d10f3b5ee006035afefe5301a8610820a0c.zip opensim-SC-f7916d10f3b5ee006035afefe5301a8610820a0c.tar.gz opensim-SC-f7916d10f3b5ee006035afefe5301a8610820a0c.tar.bz2 opensim-SC-f7916d10f3b5ee006035afefe5301a8610820a0c.tar.xz |
* This fixes landing on Prim and removes the hack from yesterday. Landing on prim should work fine again.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 6 |
1 files changed, 3 insertions, 3 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 | } |