diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 2da6d98..70abe77 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -1264,7 +1264,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1264 | // | 1264 | // |
1265 | // for one example of this kind of thing. In fact, the Linden servers appear to only send about | 1265 | // for one example of this kind of thing. In fact, the Linden servers appear to only send about |
1266 | // 6 to 7 items at a time, so let's stick with 6 | 1266 | // 6 to 7 items at a time, so let's stick with 6 |
1267 | int MAX_ITEMS_PER_PACKET = 6; | 1267 | int MAX_ITEMS_PER_PACKET = 5; |
1268 | int MAX_FOLDERS_PER_PACKET = 6; | ||
1268 | 1269 | ||
1269 | int totalItems = fetchItems ? items.Count : 0; | 1270 | int totalItems = fetchItems ? items.Count : 0; |
1270 | int totalFolders = fetchFolders ? folders.Count : 0; | 1271 | int totalFolders = fetchFolders ? folders.Count : 0; |
@@ -1287,8 +1288,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1287 | if (currentPacket == null) // Start a new packet | 1288 | if (currentPacket == null) // Start a new packet |
1288 | { | 1289 | { |
1289 | foldersToSend = totalFolders - foldersSent; | 1290 | foldersToSend = totalFolders - foldersSent; |
1290 | if (foldersToSend > MAX_ITEMS_PER_PACKET) | 1291 | if (foldersToSend > MAX_FOLDERS_PER_PACKET) |
1291 | foldersToSend = MAX_ITEMS_PER_PACKET; | 1292 | foldersToSend = MAX_FOLDERS_PER_PACKET; |
1292 | 1293 | ||
1293 | if (foldersToSend == 0) | 1294 | if (foldersToSend == 0) |
1294 | { | 1295 | { |
@@ -1301,7 +1302,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1301 | } | 1302 | } |
1302 | 1303 | ||
1303 | if (foldersToSend-- > 0) | 1304 | if (foldersToSend-- > 0) |
1304 | currentPacket.FolderData[foldersSent % MAX_ITEMS_PER_PACKET] = CreateFolderDataBlock(folders[foldersSent++]); | 1305 | currentPacket.FolderData[foldersSent % MAX_FOLDERS_PER_PACKET] = CreateFolderDataBlock(folders[foldersSent++]); |
1305 | else if(itemsToSend-- > 0) | 1306 | else if(itemsToSend-- > 0) |
1306 | currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]); | 1307 | currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]); |
1307 | else | 1308 | else |