aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorSean Dague2008-05-07 18:40:18 +0000
committerSean Dague2008-05-07 18:40:18 +0000
commit5ff3c03c122b9a1df4080aeaad5ece1574d2aea3 (patch)
treed92c8b2b98d31f95eada910b561e8a0da9accc43 /OpenSim/Region/ClientStack
parent* Theoretically, everything is in place for scripted take controls... Theo... (diff)
downloadopensim-SC-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.zip
opensim-SC-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.tar.gz
opensim-SC-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.tar.bz2
opensim-SC-5ff3c03c122b9a1df4080aeaad5ece1574d2aea3.tar.xz
get all the right bits to SendPrimitiveToClient so we can actually
set vel, acc, and rvel in the packet (though this isn't done yet).
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs19
1 files changed, 11 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f152d5e..6fe5cc9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2054,22 +2054,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2054 } 2054 }
2055 2055
2056 public void SendPrimitiveToClient( 2056 public void SendPrimitiveToClient(
2057 ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, 2057 ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
2058 uint flags, 2058 LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel,
2059 LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, 2059 uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color,
2060 LLQuaternion rotation, byte clickAction) 2060 uint parentID, byte[] particleSystem, byte clickAction)
2061 { 2061 {
2062 byte[] textureanim = new byte[0]; 2062 byte[] textureanim = new byte[0];
2063 2063
2064 SendPrimitiveToClient(regionHandle, timeDilation, localID, primShape, pos, flags, 2064 SendPrimitiveToClient(regionHandle, timeDilation, localID, primShape, pos, vel,
2065 acc, rotation, rvel, flags,
2065 objectID, ownerID, text, color, parentID, particleSystem, 2066 objectID, ownerID, text, color, parentID, particleSystem,
2066 rotation, clickAction, textureanim, false,(uint)0, LLUUID.Zero); 2067 clickAction, textureanim, false,(uint)0, LLUUID.Zero);
2067 } 2068 }
2069
2068 public void SendPrimitiveToClient( 2070 public void SendPrimitiveToClient(
2069 ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, 2071 ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
2072 LLVector3 pos, LLVector3 vel, LLVector3 acc, LLQuaternion rotation, LLVector3 rvel,
2070 uint flags, 2073 uint flags,
2071 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,
2072 LLQuaternion rotation, byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, LLUUID AssetId) 2075 byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, LLUUID AssetId)
2073 { 2076 {
2074 ObjectUpdatePacket outPacket = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate); 2077 ObjectUpdatePacket outPacket = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate);
2075 // TODO: don't create new blocks if recycling an old packet 2078 // TODO: don't create new blocks if recycling an old packet