OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix slow loading of task inventory

avinationmerge
Melanie 2012-07-19 12:27:36 +02:00
parent 4917637ce6
commit ce8b9e6c57
6 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/IClientAPI.cs
View File

@ -1177,7 +1177,7 @@ namespace OpenSim.Framework
/// <param name="node"></param> /// <param name="node"></param>
void SendBulkUpdateInventory(InventoryNodeBase node); void SendBulkUpdateInventory(InventoryNodeBase node);
void SendXferPacket(ulong xferID, uint packet, byte[] data); void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory);
void SendAbortXferPacket(ulong xferID); void SendAbortXferPacket(ulong xferID);

10
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -2122,16 +2122,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP
replytask.InventoryData.TaskID = taskID; replytask.InventoryData.TaskID = taskID;
replytask.InventoryData.Serial = serial; replytask.InventoryData.Serial = serial;
replytask.InventoryData.Filename = fileName; replytask.InventoryData.Filename = fileName;
OutPacket(replytask, ThrottleOutPacketType.Asset); OutPacket(replytask, ThrottleOutPacketType.Task);
} }
public void SendXferPacket(ulong xferID, uint packet, byte[] data) public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
{ {
ThrottleOutPacketType type = ThrottleOutPacketType.Asset;
if (isTaskInventory)
type = ThrottleOutPacketType.Task;
SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket); SendXferPacketPacket sendXfer = (SendXferPacketPacket)PacketPool.Instance.GetPacket(PacketType.SendXferPacket);
sendXfer.XferID.ID = xferID; sendXfer.XferID.ID = xferID;
sendXfer.XferID.Packet = packet; sendXfer.XferID.Packet = packet;
sendXfer.DataPacket.Data = data; sendXfer.DataPacket.Data = data;
OutPacket(sendXfer, ThrottleOutPacketType.Asset); OutPacket(sendXfer, type);
} }
public void SendAbortXferPacket(ulong xferID) public void SendAbortXferPacket(ulong xferID)

11
OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
View File

@ -145,6 +145,8 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
{ {
byte[] fileData = NewFiles[fileName].Data; byte[] fileData = NewFiles[fileName].Data;
XferDownLoad transaction = new XferDownLoad(fileName, fileData, xferID, remoteClient); XferDownLoad transaction = new XferDownLoad(fileName, fileData, xferID, remoteClient);
if (fileName.StartsWith("inventory_"))
transaction.isTaskInventory = true;
Transfers.Add(xferID, transaction); Transfers.Add(xferID, transaction);
@ -228,6 +230,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
public uint Packet = 0; public uint Packet = 0;
public uint Serial = 1; public uint Serial = 1;
public ulong XferID = 0; public ulong XferID = 0;
public bool isTaskInventory = false;
public XferDownLoad(string fileName, byte[] data, ulong xferID, IClientAPI client) public XferDownLoad(string fileName, byte[] data, ulong xferID, IClientAPI client)
{ {
@ -253,7 +256,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
byte[] transferData = new byte[Data.Length + 4]; byte[] transferData = new byte[Data.Length + 4];
Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4); Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4);
Array.Copy(Data, 0, transferData, 4, Data.Length); Array.Copy(Data, 0, transferData, 4, Data.Length);
Client.SendXferPacket(XferID, 0 + 0x80000000, transferData); Client.SendXferPacket(XferID, 0 + 0x80000000, transferData, isTaskInventory);
complete = true; complete = true;
} }
else else
@ -261,7 +264,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
byte[] transferData = new byte[1000 + 4]; byte[] transferData = new byte[1000 + 4];
Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4); Array.Copy(Utils.IntToBytes(Data.Length), 0, transferData, 0, 4);
Array.Copy(Data, 0, transferData, 4, 1000); Array.Copy(Data, 0, transferData, 4, 1000);
Client.SendXferPacket(XferID, 0, transferData); Client.SendXferPacket(XferID, 0, transferData, isTaskInventory);
Packet++; Packet++;
DataPointer = 1000; DataPointer = 1000;
} }
@ -282,7 +285,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
{ {
byte[] transferData = new byte[1000]; byte[] transferData = new byte[1000];
Array.Copy(Data, DataPointer, transferData, 0, 1000); Array.Copy(Data, DataPointer, transferData, 0, 1000);
Client.SendXferPacket(XferID, Packet, transferData); Client.SendXferPacket(XferID, Packet, transferData, isTaskInventory);
Packet++; Packet++;
DataPointer += 1000; DataPointer += 1000;
} }
@ -291,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
byte[] transferData = new byte[Data.Length - DataPointer]; byte[] transferData = new byte[Data.Length - DataPointer];
Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer); Array.Copy(Data, DataPointer, transferData, 0, Data.Length - DataPointer);
uint endPacket = Packet |= (uint) 0x80000000; uint endPacket = Packet |= (uint) 0x80000000;
Client.SendXferPacket(XferID, endPacket, transferData); Client.SendXferPacket(XferID, endPacket, transferData, isTaskInventory);
Packet++; Packet++;
DataPointer += (Data.Length - DataPointer); DataPointer += (Data.Length - DataPointer);

2
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
View File

@ -1122,7 +1122,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
} }
public void SendXferPacket(ulong xferID, uint packet, byte[] data) public void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
{ {
} }

2
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
View File

@ -755,7 +755,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
{ {
} }
public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
{ {
} }
public virtual void SendAbortXferPacket(ulong xferID) public virtual void SendAbortXferPacket(ulong xferID)

2
OpenSim/Tests/Common/Mock/TestClient.cs
View File

@ -732,7 +732,7 @@ namespace OpenSim.Tests.Common.Mock
{ {
} }
public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
{ {
} }