Inventory subfolders working again in grid mode.
parent
d430b7d815
commit
b96da29d1a
|
@ -949,10 +949,13 @@ namespace OpenSim.Region.ClientStack
|
|||
|
||||
Encoding enc = Encoding.ASCII;
|
||||
uint FULL_MASK_PERMISSIONS = 2147483647;
|
||||
InventoryDescendentsPacket descend;
|
||||
int i;
|
||||
int count;
|
||||
|
||||
if (fetchItems)
|
||||
{
|
||||
InventoryDescendentsPacket descend = CreateInventoryDescendentsPacket(ownerID, folderID);
|
||||
descend = CreateInventoryDescendentsPacket(ownerID, folderID);
|
||||
|
||||
if (items.Count < MAX_ITEMS_PER_PACKET)
|
||||
{
|
||||
|
@ -974,8 +977,8 @@ namespace OpenSim.Region.ClientStack
|
|||
descend.AgentData.Descendents += folders.Count;
|
||||
}
|
||||
|
||||
int count = 0;
|
||||
int i = 0;
|
||||
count = 0;
|
||||
i = 0;
|
||||
foreach (InventoryItemBase item in items)
|
||||
{
|
||||
descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
|
||||
|
@ -1040,9 +1043,8 @@ namespace OpenSim.Region.ClientStack
|
|||
}
|
||||
|
||||
//send subfolders
|
||||
if (fetchFolders)
|
||||
{
|
||||
InventoryDescendentsPacket descend = CreateInventoryDescendentsPacket(ownerID, folderID);
|
||||
|
||||
descend = CreateInventoryDescendentsPacket(ownerID, folderID);
|
||||
|
||||
if (folders.Count < MAX_ITEMS_PER_PACKET)
|
||||
{
|
||||
|
@ -1062,8 +1064,8 @@ namespace OpenSim.Region.ClientStack
|
|||
descend.AgentData.Descendents += items.Count;
|
||||
}
|
||||
|
||||
int i = 0;
|
||||
int count = 0;
|
||||
i = 0;
|
||||
count = 0;
|
||||
foreach (InventoryFolderBase folder in folders)
|
||||
{
|
||||
descend.FolderData[i] = new InventoryDescendentsPacket.FolderDataBlock();
|
||||
|
@ -1102,7 +1104,7 @@ namespace OpenSim.Region.ClientStack
|
|||
{
|
||||
OutPacket(descend, ThrottleOutPacketType.Asset);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private InventoryDescendentsPacket CreateInventoryDescendentsPacket(LLUUID ownerID, LLUUID folderID)
|
||||
|
|
Loading…
Reference in New Issue