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

Inventory subfolders working again in grid mode.

afrisby
Brian McBee 2008-01-05 18:50:00 +00:00
parent d430b7d815
commit b96da29d1a
1 changed files with 62 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/ClientStack/ClientView.cs
View File

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