diff options
author | Sean Dague | 2008-05-07 19:37:37 +0000 |
---|---|---|
committer | Sean Dague | 2008-05-07 19:37:37 +0000 |
commit | b77aa39d64912e5eee68f99381a488d026031bf2 (patch) | |
tree | b5775db76e59131bb15714575e71a939e21901bb | |
parent | ok, reverting the bad packet fill in, going to try this again (diff) | |
download | opensim-SC_OLD-b77aa39d64912e5eee68f99381a488d026031bf2.zip opensim-SC_OLD-b77aa39d64912e5eee68f99381a488d026031bf2.tar.gz opensim-SC_OLD-b77aa39d64912e5eee68f99381a488d026031bf2.tar.bz2 opensim-SC_OLD-b77aa39d64912e5eee68f99381a488d026031bf2.tar.xz |
check in a new approach to this
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 6fe5cc9..28f8364 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2069,7 +2069,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2069 | 2069 | ||
2070 | public void SendPrimitiveToClient( | 2070 | public void SendPrimitiveToClient( |
2071 | ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, | 2071 | ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, |
2072 | LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel, | 2072 | LLVector3 pos, LLVector3 velocity, LLVector3 acceleration, LLQuaternion rotation, LLVector3 rotational_velocity, |
2073 | uint flags, | 2073 | uint flags, |
2074 | LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, | 2074 | LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, |
2075 | byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, LLUUID AssetId) | 2075 | byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, LLUUID AssetId) |
@@ -2121,9 +2121,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2121 | byte[] pb = pos.GetBytes(); | 2121 | byte[] pb = pos.GetBytes(); |
2122 | Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length); | 2122 | Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length); |
2123 | 2123 | ||
2124 | // byte[] vel = velocity.GetBytes(); | ||
2125 | // Array.Copy(vel, 0, outPacket.ObjectData[0].ObjectData, 12, vel.Length); | ||
2126 | |||
2124 | byte[] rot = rotation.GetBytes(); | 2127 | byte[] rot = rotation.GetBytes(); |
2125 | Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 36, rot.Length); | 2128 | Array.Copy(rot, 0, outPacket.ObjectData[0].ObjectData, 36, rot.Length); |
2126 | 2129 | ||
2130 | byte[] rvel = rotational_velocity.GetBytes(); | ||
2131 | Array.Copy(rvel, 0, outPacket.ObjectData[0].ObjectData, 44, rvel.Length); | ||
2132 | |||
2127 | if (textureanim.Length > 0) | 2133 | if (textureanim.Length > 0) |
2128 | { | 2134 | { |
2129 | outPacket.ObjectData[0].TextureAnim = textureanim; | 2135 | outPacket.ObjectData[0].TextureAnim = textureanim; |