aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJohn Hurliman2009-11-09 17:13:56 -0800
committerJohn Hurliman2009-11-09 17:13:56 -0800
commit5145dfa53c2fd8ce0c9ece73ae44f36c9cc70931 (patch)
treee86fb0ecb945b2a659cf461908143d9a23858734 /OpenSim/Region/ClientStack
parentFollowing various discussions on irc and in the OpenSim dev OSGrid meeting la... (diff)
downloadopensim-SC_OLD-5145dfa53c2fd8ce0c9ece73ae44f36c9cc70931.zip
opensim-SC_OLD-5145dfa53c2fd8ce0c9ece73ae44f36c9cc70931.tar.gz
opensim-SC_OLD-5145dfa53c2fd8ce0c9ece73ae44f36c9cc70931.tar.bz2
opensim-SC_OLD-5145dfa53c2fd8ce0c9ece73ae44f36c9cc70931.tar.xz
* Removing the redundant SendPrimitiveTerseData.State field, it duplicates AttachPoint
* LLClientView.CreateImprovedTerseBlock() now uses AttachPoint and does the proper high-low swap (this should fix disappearing attachment pieces)
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 35ccad9..7eb829e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4037,11 +4037,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4037 4037
4038 protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(SendPrimitiveTerseData data) 4038 protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(SendPrimitiveTerseData data)
4039 { 4039 {
4040 return CreateImprovedTerseBlock(false, data.LocalID, data.State, Vector4.Zero, data.Position, data.Velocity, 4040 return CreateImprovedTerseBlock(false, data.LocalID, data.AttachPoint, Vector4.Zero, data.Position, data.Velocity,
4041 data.Acceleration, data.Rotation, data.AngularVelocity, data.TextureEntry); 4041 data.Acceleration, data.Rotation, data.AngularVelocity, data.TextureEntry);
4042 } 4042 }
4043 4043
4044 protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(bool avatar, uint localID, byte state, 4044 protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedTerseBlock(bool avatar, uint localID, int attachPoint,
4045 Vector4 collisionPlane, Vector3 position, Vector3 velocity, Vector3 acceleration, Quaternion rotation, 4045 Vector4 collisionPlane, Vector3 position, Vector3 velocity, Vector3 acceleration, Quaternion rotation,
4046 Vector3 angularVelocity, byte[] textureEntry) 4046 Vector3 angularVelocity, byte[] textureEntry)
4047 { 4047 {
@@ -4053,7 +4053,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4053 pos += 4; 4053 pos += 4;
4054 4054
4055 // Avatar/CollisionPlane 4055 // Avatar/CollisionPlane
4056 data[pos++] = state; 4056 data[pos++] = (byte)((attachPoint % 16) * 16 + (attachPoint / 16)); ;
4057 if (avatar) 4057 if (avatar)
4058 { 4058 {
4059 data[pos++] = 1; 4059 data[pos++] = 1;