* Inserting code to prepare to fix trash emptying and the edit texture inventory (again)
* Can't just do this fix since it stops subfolders working (though it appears subfolder renaming may be fubar at the moment)0.6.0-stable
parent
79209c4297
commit
872184fa2a
|
@ -1150,6 +1150,9 @@ namespace OpenSim.Region.ClientStack
|
|||
List<InventoryFolderBase> folders,
|
||||
bool fetchFolders, bool fetchItems)
|
||||
{
|
||||
// XXX Very temporarily, always fetch the folders
|
||||
fetchFolders = true;
|
||||
|
||||
// An inventory descendents packet consists of a single agent section and an inventory details
|
||||
// section for each inventory item. The size of each inventory item is approximately 550 bytes.
|
||||
// In theory, UDP has a maximum packet size of 64k, so it should be possible to send descendent
|
||||
|
@ -1163,13 +1166,11 @@ namespace OpenSim.Region.ClientStack
|
|||
int MAX_ITEMS_PER_PACKET = 6;
|
||||
|
||||
Encoding enc = Encoding.ASCII;
|
||||
InventoryDescendentsPacket descend;
|
||||
int i;
|
||||
int count;
|
||||
uint FULL_MASK_PERMISSIONS = 2147483647;
|
||||
|
||||
if (fetchItems)
|
||||
{
|
||||
descend = CreateInventoryDescendentsPacket(ownerID, folderID);
|
||||
InventoryDescendentsPacket descend = CreateInventoryDescendentsPacket(ownerID, folderID);
|
||||
|
||||
if (items.Count < MAX_ITEMS_PER_PACKET)
|
||||
{
|
||||
|
@ -1191,8 +1192,8 @@ namespace OpenSim.Region.ClientStack
|
|||
descend.AgentData.Descendents += folders.Count;
|
||||
}
|
||||
|
||||
count = 0;
|
||||
i = 0;
|
||||
int count = 0;
|
||||
int i = 0;
|
||||
foreach (InventoryItemBase item in items)
|
||||
{
|
||||
descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
|
||||
|
@ -1207,14 +1208,14 @@ namespace OpenSim.Region.ClientStack
|
|||
descend.ItemData[i].FolderID = item.parentFolderID;
|
||||
descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
|
||||
descend.ItemData[i].GroupMask = 0;
|
||||
descend.ItemData[i].InvType = (sbyte)item.invType;
|
||||
descend.ItemData[i].InvType = (sbyte) item.invType;
|
||||
descend.ItemData[i].Name = Helpers.StringToField(item.inventoryName);
|
||||
descend.ItemData[i].NextOwnerMask = item.inventoryNextPermissions;
|
||||
descend.ItemData[i].OwnerID = item.avatarID;
|
||||
descend.ItemData[i].OwnerMask = item.inventoryCurrentPermissions;
|
||||
descend.ItemData[i].SalePrice = 0;
|
||||
descend.ItemData[i].SaleType = 0;
|
||||
descend.ItemData[i].Type = (sbyte)item.assetType;
|
||||
descend.ItemData[i].Type = (sbyte) item.assetType;
|
||||
descend.ItemData[i].CRC =
|
||||
Helpers.InventoryCRC(descend.ItemData[i].CreationDate, descend.ItemData[i].SaleType,
|
||||
descend.ItemData[i].InvType, descend.ItemData[i].Type,
|
||||
|
@ -1257,8 +1258,9 @@ namespace OpenSim.Region.ClientStack
|
|||
}
|
||||
|
||||
//send subfolders
|
||||
|
||||
descend = CreateInventoryDescendentsPacket(ownerID, folderID);
|
||||
if (fetchFolders)
|
||||
{
|
||||
InventoryDescendentsPacket descend = CreateInventoryDescendentsPacket(ownerID, folderID);
|
||||
|
||||
if (folders.Count < MAX_ITEMS_PER_PACKET)
|
||||
{
|
||||
|
@ -1278,15 +1280,15 @@ namespace OpenSim.Region.ClientStack
|
|||
descend.AgentData.Descendents += items.Count;
|
||||
}
|
||||
|
||||
i = 0;
|
||||
count = 0;
|
||||
int i = 0;
|
||||
int count = 0;
|
||||
foreach (InventoryFolderBase folder in folders)
|
||||
{
|
||||
descend.FolderData[i] = new InventoryDescendentsPacket.FolderDataBlock();
|
||||
descend.FolderData[i].FolderID = folder.folderID;
|
||||
descend.FolderData[i].Name = Helpers.StringToField(folder.name);
|
||||
descend.FolderData[i].ParentID = folder.parentID;
|
||||
descend.FolderData[i].Type = (sbyte)folder.type;
|
||||
descend.FolderData[i].Type = (sbyte) folder.type;
|
||||
|
||||
i++;
|
||||
count++;
|
||||
|
@ -1318,7 +1320,7 @@ namespace OpenSim.Region.ClientStack
|
|||
{
|
||||
OutPacket(descend, ThrottleOutPacketType.Asset);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private InventoryDescendentsPacket CreateInventoryDescendentsPacket(LLUUID ownerID, LLUUID folderID)
|
||||
|
|
Loading…
Reference in New Issue