aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
diff options
context:
space:
mode:
authorMelanie2011-05-13 12:03:16 +0100
committerMelanie2011-05-13 12:03:16 +0100
commit59d8588ae130065b80028d2168c3e2ea9d70c7cc (patch)
treee42a384c566bf44a4e9b8712fc4a0e76f3e992fc /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
parentFix the cert validation handler so that it will not block other parts of (diff)
parentHopefully this fixes offline messages. The problem was: the server is not set... (diff)
downloadopensim-SC_OLD-59d8588ae130065b80028d2168c3e2ea9d70c7cc.zip
opensim-SC_OLD-59d8588ae130065b80028d2168c3e2ea9d70c7cc.tar.gz
opensim-SC_OLD-59d8588ae130065b80028d2168c3e2ea9d70c7cc.tar.bz2
opensim-SC_OLD-59d8588ae130065b80028d2168c3e2ea9d70c7cc.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-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 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)