aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs20
1 files changed, 15 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 09c5dfa..2da6d98 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1306,14 +1306,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1306 currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]); 1306 currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]);
1307 else 1307 else
1308 { 1308 {
1309 OutPacket(currentPacket, ThrottleOutPacketType.Asset); 1309 OutPacket(currentPacket, ThrottleOutPacketType.Asset, false);
1310 currentPacket = null; 1310 currentPacket = null;
1311 } 1311 }
1312 1312
1313 } 1313 }
1314 1314
1315 if (currentPacket != null) 1315 if (currentPacket != null)
1316 OutPacket(currentPacket, ThrottleOutPacketType.Asset); 1316 OutPacket(currentPacket, ThrottleOutPacketType.Asset, false);
1317 } 1317 }
1318 1318
1319 private InventoryDescendentsPacket.FolderDataBlock CreateFolderDataBlock(InventoryFolderBase folder) 1319 private InventoryDescendentsPacket.FolderDataBlock CreateFolderDataBlock(InventoryFolderBase folder)
@@ -1415,9 +1415,6 @@ 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
1421 if (folders > 0) 1418 if (folders > 0)
1422 descend.FolderData = new InventoryDescendentsPacket.FolderDataBlock[folders]; 1419 descend.FolderData = new InventoryDescendentsPacket.FolderDataBlock[folders];
1423 else 1420 else
@@ -4909,6 +4906,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4909 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true); 4906 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true);
4910 } 4907 }
4911 4908
4909 /// <summary>
4910 /// This is the starting point for sending a simulator packet out to the client
4911 /// </summary>
4912 /// <param name="packet">Packet to send</param>
4913 /// <param name="throttlePacketType">Throttling category for the packet</param>
4914 /// <param name="doAutomaticSplitting">True to automatically split oversized
4915 /// packets (the default), or false to disable splitting if the calling code
4916 /// handles splitting manually</param>
4917 protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting)
4918 {
4919 m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting);
4920 }
4921
4912 public bool AddMoney(int debit) 4922 public bool AddMoney(int debit)
4913 { 4923 {
4914 if (m_moneyBalance + debit >= 0) 4924 if (m_moneyBalance + debit >= 0)