aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2011-05-13 12:05:46 +0100
committerMelanie2011-05-13 12:05:46 +0100
commit75d4956ee58340adca06d2ad602e2cd87b2e5943 (patch)
tree8203a626b75a7926bcffe8044847724fd53dae40 /OpenSim/Region/ClientStack
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-75d4956ee58340adca06d2ad602e2cd87b2e5943.zip
opensim-SC-75d4956ee58340adca06d2ad602e2cd87b2e5943.tar.gz
opensim-SC-75d4956ee58340adca06d2ad602e2cd87b2e5943.tar.bz2
opensim-SC-75d4956ee58340adca06d2ad602e2cd87b2e5943.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index de40abd..7564907 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1630,14 +1630,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1630 currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]); 1630 currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]);
1631 else 1631 else
1632 { 1632 {
1633// m_log.DebugFormat(
1634// "[LLCLIENTVIEW]: Sending inventory folder details packet to {0} for folder {1}", Name, folderID);
1633 OutPacket(currentPacket, ThrottleOutPacketType.Asset, false); 1635 OutPacket(currentPacket, ThrottleOutPacketType.Asset, false);
1634 currentPacket = null; 1636 currentPacket = null;
1635 } 1637 }
1636
1637 } 1638 }
1638 1639
1639 if (currentPacket != null) 1640 if (currentPacket != null)
1641 {
1642// m_log.DebugFormat(
1643// "[LLCLIENTVIEW]: Sending inventory folder details packet to {0} for folder {1}", Name, folderID);
1640 OutPacket(currentPacket, ThrottleOutPacketType.Asset, false); 1644 OutPacket(currentPacket, ThrottleOutPacketType.Asset, false);
1645 }
1641 } 1646 }
1642 1647
1643 private InventoryDescendentsPacket.FolderDataBlock CreateFolderDataBlock(InventoryFolderBase folder) 1648 private InventoryDescendentsPacket.FolderDataBlock CreateFolderDataBlock(InventoryFolderBase folder)