diff options
author | Justin Clark-Casey (justincc) | 2011-05-13 03:24:19 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-05-13 03:24:19 +0100 |
commit | 5f9edd195c702fac57ab76bca1c0357bce224868 (patch) | |
tree | 46c2c2e155987c77abed27af3169315fcf97bd1f /OpenSim/Region/ClientStack/Linden | |
parent | One more debug message for offline IMs. (diff) | |
download | opensim-SC_OLD-5f9edd195c702fac57ab76bca1c0357bce224868.zip opensim-SC_OLD-5f9edd195c702fac57ab76bca1c0357bce224868.tar.gz opensim-SC_OLD-5f9edd195c702fac57ab76bca1c0357bce224868.tar.bz2 opensim-SC_OLD-5f9edd195c702fac57ab76bca1c0357bce224868.tar.xz |
Fix broken inventory links on viewer 2.
It appears that if the viewer requests a folder containing links, we must also send the folders that contain the link targets first.
This was tested with Kokua 0.1.0 WIP though I predict it will also work with other viewer 2s
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 7 |
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 1da9d5e..5a2c45c 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1612,14 +1612,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1612 | currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]); | 1612 | currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]); |
1613 | else | 1613 | else |
1614 | { | 1614 | { |
1615 | // m_log.DebugFormat( | ||
1616 | // "[LLCLIENTVIEW]: Sending inventory folder details packet to {0} for folder {1}", Name, folderID); | ||
1615 | OutPacket(currentPacket, ThrottleOutPacketType.Asset, false); | 1617 | OutPacket(currentPacket, ThrottleOutPacketType.Asset, false); |
1616 | currentPacket = null; | 1618 | currentPacket = null; |
1617 | } | 1619 | } |
1618 | |||
1619 | } | 1620 | } |
1620 | 1621 | ||
1621 | if (currentPacket != null) | 1622 | if (currentPacket != null) |
1623 | { | ||
1624 | // m_log.DebugFormat( | ||
1625 | // "[LLCLIENTVIEW]: Sending inventory folder details packet to {0} for folder {1}", Name, folderID); | ||
1622 | OutPacket(currentPacket, ThrottleOutPacketType.Asset, false); | 1626 | OutPacket(currentPacket, ThrottleOutPacketType.Asset, false); |
1627 | } | ||
1623 | } | 1628 | } |
1624 | 1629 | ||
1625 | private InventoryDescendentsPacket.FolderDataBlock CreateFolderDataBlock(InventoryFolderBase folder) | 1630 | private InventoryDescendentsPacket.FolderDataBlock CreateFolderDataBlock(InventoryFolderBase folder) |