Add an overload to OutPacket as per jhurliman. Switch hacky workaround

for InventoryDescendents to the proper way

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
                     currentPacket.ItemData[itemsSent % MAX_ITEMS_PER_PACKET] = CreateItemDataBlock(items[itemsSent++]);
                 else
                 {
-                    OutPacket(currentPacket, ThrottleOutPacketType.Asset);
+                    OutPacket(currentPacket, ThrottleOutPacketType.Asset, false);
                     currentPacket = null;
                 }
 
             }
 
             if (currentPacket != null)
-                OutPacket(currentPacket, ThrottleOutPacketType.Asset);
+                OutPacket(currentPacket, ThrottleOutPacketType.Asset, false);
         }
 
         private InventoryDescendentsPacket.FolderDataBlock CreateFolderDataBlock(InventoryFolderBase folder)
@@ -1415,9 +1415,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             descend.AgentData.Version = version;
             descend.AgentData.Descendents = descendents;
 
-            // Disable multiple packets
-            descend.HasVariableBlocks = false;
-
             if (folders > 0)
                 descend.FolderData = new InventoryDescendentsPacket.FolderDataBlock[folders];
             else
@@ -4909,6 +4906,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, true);
         }
 
+        /// <summary>
+        /// This is the starting point for sending a simulator packet out to the client
+        /// </summary>
+        /// <param name="packet">Packet to send</param>
+        /// <param name="throttlePacketType">Throttling category for the packet</param>
+        /// <param name="doAutomaticSplitting">True to automatically split oversized
+        /// packets (the default), or false to disable splitting if the calling code
+        /// handles splitting manually</param>
+        protected void OutPacket(Packet packet, ThrottleOutPacketType throttlePacketType, bool doAutomaticSplitting)
+        {
+            m_udpServer.SendPacket(m_udpClient, packet, throttlePacketType, doAutomaticSplitting);
+        }
+
         public bool AddMoney(int debit)
         {
             if (m_moneyBalance + debit >= 0)