aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie2012-07-19 12:27:36 +0200
committerMelanie2012-07-19 12:27:36 +0200
commitce8b9e6c570f73a5c70dfc2b52bbb595637b717d (patch)
tree8bc9a882acb8f3eb79eca386ba021d4fb6953a42 /OpenSim/Region/ClientStack/Linden
parentFix llSameGroup to work according to specs (diff)
downloadopensim-SC_OLD-ce8b9e6c570f73a5c70dfc2b52bbb595637b717d.zip
opensim-SC_OLD-ce8b9e6c570f73a5c70dfc2b52bbb595637b717d.tar.gz
opensim-SC_OLD-ce8b9e6c570f73a5c70dfc2b52bbb595637b717d.tar.bz2
opensim-SC_OLD-ce8b9e6c570f73a5c70dfc2b52bbb595637b717d.tar.xz
Fix slow loading of task inventory
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-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 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)