aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2012-07-20 09:35:22 +0100
committerMelanie2012-07-20 09:35:22 +0100
commitdf866fd300b94e43326e0b8e194055b5c6cf2afe (patch)
treef84db3b1e03d14488eedb078546c3d174ff8857c /OpenSim/Region/ClientStack
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'ubitwork' into avination (diff)
downloadopensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.zip
opensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.gz
opensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.bz2
opensim-SC_OLD-df866fd300b94e43326e0b8e194055b5c6cf2afe.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs10
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 4be83f3..098e4eb 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2149,16 +2149,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2149 replytask.InventoryData.TaskID = taskID; 2149 replytask.InventoryData.TaskID = taskID;
2150 replytask.InventoryData.Serial = serial; 2150 replytask.InventoryData.Serial = serial;
2151 replytask.InventoryData.Filename = fileName; 2151 replytask.InventoryData.Filename = fileName;
2152 OutPacket(replytask, ThrottleOutPacketType.Asset); 2152 OutPacket(replytask, ThrottleOutPacketType.Task);
2153 } 2153 }
2154 2154
2155 public void SendXferPacket(ulong xferID, uint packet, byte[] data) 2155 public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
2156 { 2156 {
2157 ThrottleOutPacketType type = ThrottleOutPacketType.Asset;
2158 if (isTaskInventory)
2159 type = ThrottleOutPacketType.Task;
2160
2157 SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket); 2161 SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket);
2158 sendXfer.XferID.ID = xferID; 2162 sendXfer.XferID.ID = xferID;
2159 sendXfer.XferID.Packet = packet; 2163 sendXfer.XferID.Packet = packet;
2160 sendXfer.DataPacket.Data = data; 2164 sendXfer.DataPacket.Data = data;
2161 OutPacket(sendXfer, ThrottleOutPacketType.Asset); 2165 OutPacket(sendXfer, type);
2162 } 2166 }
2163 2167
2164 public void SendAbortXferPacket(ulong xferID) 2168 public void SendAbortXferPacket(ulong xferID)