diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 35b248a..fb9d638 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -2018,13 +2018,13 @@ namespace OpenSim.Region.ClientStack | |||
2018 | 2018 | ||
2019 | SendPrimitiveToClient(regionHandle, timeDilation, localID, primShape, pos, flags, | 2019 | SendPrimitiveToClient(regionHandle, timeDilation, localID, primShape, pos, flags, |
2020 | objectID, ownerID, text, color, parentID, particleSystem, | 2020 | objectID, ownerID, text, color, parentID, particleSystem, |
2021 | rotation, clickAction, textureanim, false,(uint)0); | 2021 | rotation, clickAction, textureanim, false,(uint)0, LLUUID.Zero); |
2022 | } | 2022 | } |
2023 | public void SendPrimitiveToClient( | 2023 | public void SendPrimitiveToClient( |
2024 | ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, | 2024 | ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, |
2025 | uint flags, | 2025 | uint flags, |
2026 | LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, | 2026 | LLUUID objectID, LLUUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, |
2027 | LLQuaternion rotation, byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint) | 2027 | LLQuaternion rotation, byte clickAction, byte[] textureanim, bool attachment, uint AttachPoint, LLUUID AssetId) |
2028 | { | 2028 | { |
2029 | ObjectUpdatePacket outPacket = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate); | 2029 | ObjectUpdatePacket outPacket = (ObjectUpdatePacket)PacketPool.Instance.GetPacket(PacketType.ObjectUpdate); |
2030 | // TODO: don't create new blocks if recycling an old packet | 2030 | // TODO: don't create new blocks if recycling an old packet |
@@ -2063,7 +2063,7 @@ namespace OpenSim.Region.ClientStack | |||
2063 | 2063 | ||
2064 | // Item from inventory??? | 2064 | // Item from inventory??? |
2065 | outPacket.ObjectData[0].NameValue = | 2065 | outPacket.ObjectData[0].NameValue = |
2066 | Helpers.StringToField("AttachItemID STRING RW SV " + objectID.UUID); | 2066 | Helpers.StringToField("AttachItemID STRING RW SV " + AssetId.UUID); |
2067 | outPacket.ObjectData[0].State = (byte)((AttachPoint % 16) * 16 + (AttachPoint / 16)); | 2067 | outPacket.ObjectData[0].State = (byte)((AttachPoint % 16) * 16 + (AttachPoint / 16)); |
2068 | } | 2068 | } |
2069 | 2069 | ||
@@ -2093,7 +2093,7 @@ namespace OpenSim.Region.ClientStack | |||
2093 | /// <param name="position"></param> | 2093 | /// <param name="position"></param> |
2094 | /// <param name="rotation"></param> | 2094 | /// <param name="rotation"></param> |
2095 | public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, | 2095 | public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, |
2096 | LLQuaternion rotation, byte state) | 2096 | LLQuaternion rotation, byte state, LLUUID AssetId) |
2097 | { | 2097 | { |
2098 | LLVector3 velocity = new LLVector3(0f, 0f, 0f); | 2098 | LLVector3 velocity = new LLVector3(0f, 0f, 0f); |
2099 | LLVector3 rotationalvelocity = new LLVector3(0f, 0f, 0f); | 2099 | LLVector3 rotationalvelocity = new LLVector3(0f, 0f, 0f); |
@@ -2102,7 +2102,7 @@ namespace OpenSim.Region.ClientStack | |||
2102 | terse.RegionData.RegionHandle = regionHandle; | 2102 | terse.RegionData.RegionHandle = regionHandle; |
2103 | terse.RegionData.TimeDilation = timeDilation; | 2103 | terse.RegionData.TimeDilation = timeDilation; |
2104 | terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; | 2104 | terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1]; |
2105 | terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, state); | 2105 | terse.ObjectData[0] = CreatePrimImprovedBlock(localID, position, rotation, velocity, rotationalvelocity, state); // AssetID should fall into here probably somehow... |
2106 | terse.Header.Reliable = false; | 2106 | terse.Header.Reliable = false; |
2107 | OutPacket(terse, ThrottleOutPacketType.Task); | 2107 | OutPacket(terse, ThrottleOutPacketType.Task); |
2108 | } | 2108 | } |
@@ -2305,8 +2305,9 @@ namespace OpenSim.Region.ClientStack | |||
2305 | bytes[i++] = (byte)((rvely >> 8) % 256); | 2305 | bytes[i++] = (byte)((rvely >> 8) % 256); |
2306 | bytes[i++] = (byte)(rvelz % 256); | 2306 | bytes[i++] = (byte)(rvelz % 256); |
2307 | bytes[i++] = (byte)((rvelz >> 8) % 256); | 2307 | bytes[i++] = (byte)((rvelz >> 8) % 256); |
2308 | |||
2309 | dat.Data = bytes; | 2308 | dat.Data = bytes; |
2309 | |||
2310 | |||
2310 | return dat; | 2311 | return dat; |
2311 | } | 2312 | } |
2312 | 2313 | ||