diff options
author | Melanie | 2009-11-04 03:56:31 +0000 |
---|---|---|
committer | Melanie | 2009-11-04 03:56:31 +0000 |
commit | 5bcc02c97b78f76a274440ca0b62830d820299d9 (patch) | |
tree | b97999cce6ce61706c1d43f3f5edfc1814d8cfbd /OpenSim | |
parent | Correctly set the totall number of descendents in inventory retrieval (diff) | |
download | opensim-SC_OLD-5bcc02c97b78f76a274440ca0b62830d820299d9.zip opensim-SC_OLD-5bcc02c97b78f76a274440ca0b62830d820299d9.tar.gz opensim-SC_OLD-5bcc02c97b78f76a274440ca0b62830d820299d9.tar.bz2 opensim-SC_OLD-5bcc02c97b78f76a274440ca0b62830d820299d9.tar.xz |
Prevent autosplitting of inventory descendents packets. Also reduces the
number of items per packet to 5 to prevent asserts
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 479da6d..e26d50a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -1264,7 +1264,7 @@ 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 | 1268 | ||
1269 | int totalItems = fetchItems ? items.Count : 0; | 1269 | int totalItems = fetchItems ? items.Count : 0; |
1270 | int totalFolders = fetchFolders ? folders.Count : 0; | 1270 | int totalFolders = fetchFolders ? folders.Count : 0; |
@@ -1415,6 +1415,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1415 | descend.AgentData.Version = version; | 1415 | descend.AgentData.Version = version; |
1416 | descend.AgentData.Descendents = descendents; | 1416 | descend.AgentData.Descendents = descendents; |
1417 | 1417 | ||
1418 | // Disable multiple packets | ||
1419 | descend.HasVariableBlocks = false; | ||
1420 | |||
1418 | if (folders > 0) | 1421 | if (folders > 0) |
1419 | descend.FolderData = new InventoryDescendentsPacket.FolderDataBlock[folders]; | 1422 | descend.FolderData = new InventoryDescendentsPacket.FolderDataBlock[folders]; |
1420 | else | 1423 | else |