diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index e6289bd..ad9074c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -2122,16 +2122,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2122 | replytask.InventoryData.TaskID = taskID; | 2122 | replytask.InventoryData.TaskID = taskID; |
2123 | replytask.InventoryData.Serial = serial; | 2123 | replytask.InventoryData.Serial = serial; |
2124 | replytask.InventoryData.Filename = fileName; | 2124 | replytask.InventoryData.Filename = fileName; |
2125 | OutPacket(replytask, ThrottleOutPacketType.Asset); | 2125 | OutPacket(replytask, ThrottleOutPacketType.Task); |
2126 | } | 2126 | } |
2127 | 2127 | ||
2128 | public void SendXferPacket(ulong xferID, uint packet, byte[] data) | 2128 | public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory) |
2129 | { | 2129 | { |
2130 | ThrottleOutPacketType type = ThrottleOutPacketType.Asset; | ||
2131 | if (isTaskInventory) | ||
2132 | type = ThrottleOutPacketType.Task; | ||
2133 | |||
2130 | SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket); | 2134 | SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket); |
2131 | sendXfer.XferID.ID = xferID; | 2135 | sendXfer.XferID.ID = xferID; |
2132 | sendXfer.XferID.Packet = packet; | 2136 | sendXfer.XferID.Packet = packet; |
2133 | sendXfer.DataPacket.Data = data; | 2137 | sendXfer.DataPacket.Data = data; |
2134 | OutPacket(sendXfer, ThrottleOutPacketType.Asset); | 2138 | OutPacket(sendXfer, type); |
2135 | } | 2139 | } |
2136 | 2140 | ||
2137 | public void SendAbortXferPacket(ulong xferID) | 2141 | public void SendAbortXferPacket(ulong xferID) |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 6e7a6a8..b09f607 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1516,7 +1516,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1516 | if (!client.IsLoggingOut) | 1516 | if (!client.IsLoggingOut) |
1517 | { | 1517 | { |
1518 | client.IsLoggingOut = true; | 1518 | client.IsLoggingOut = true; |
1519 | client.Close(); | 1519 | client.Close(false); |
1520 | } | 1520 | } |
1521 | } | 1521 | } |
1522 | } | 1522 | } |