2 files changed, 45 insertions, 30 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 2ff6ced..cd687aa 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -99,8 +99,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;
         public event AvatarPickerRequest OnAvatarPickerRequest;
-        public event StartAnim OnStartAnim;
-        public event StopAnim OnStopAnim;
         public event ChangeAnim OnChangeAnim;
         public event Action<IClientAPI> OnRequestAvatarsData;
         public event LinkObjects OnLinkObjects;
@@ -131,12 +129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event UpdatePrimTexture OnUpdatePrimTexture;
         public event ClientChangeObject onClientChangeObject;
         public event UpdateVector OnUpdatePrimGroupPosition;
-        public event UpdateVector OnUpdatePrimSinglePosition;
         public event UpdatePrimRotation OnUpdatePrimGroupRotation;
-        public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
-        public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition;
-        public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
-        public event UpdateVector OnUpdatePrimScale;
         public event UpdateVector OnUpdatePrimGroupScale;
         public event RequestMapBlocks OnRequestMapBlocks;
         public event RequestMapName OnMapNameRequest;
@@ -292,7 +285,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
         public event GenericCall2 OnUpdateThrottles;
 
+
 #pragma warning disable 0067
+        // still unused
         public event GenericMessage OnGenericMessage;
         public event TextureRequest OnRequestTexture;
         public event StatusChange OnChildAgentStatus;
@@ -304,6 +299,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public event SetEstateTerrainBaseTexture OnSetEstateTerrainBaseTexture;
         public event TerrainUnacked OnUnackedTerrain;
         public event CachedTextureRequest OnCachedTextureRequest;
+
+        public event UpdateVector OnUpdatePrimSinglePosition;
+        public event StartAnim OnStartAnim;
+        public event StopAnim OnStopAnim;
+        public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;
+        public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition;
+        public event UpdatePrimGroupRotation OnUpdatePrimGroupMouseRotation;
+        public event UpdateVector OnUpdatePrimScale;
+
+
 #pragma warning restore 0067
 
         #endregion Events
@@ -335,16 +340,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private readonly byte[] m_channelVersion = Utils.EmptyBytes;
         private readonly IGroupsModule m_GroupsModule;
 
-        private int m_cachedTextureSerial;
+//        private int m_cachedTextureSerial;
         private PriorityQueue m_entityUpdates;
         private PriorityQueue m_entityProps;
         private Prioritizer m_prioritizer;
-        private bool m_disableFacelights = false;
+        private bool m_disableFacelights;
 
         // needs optimazation
         private HashSet<SceneObjectGroup> GroupsInView = new HashSet<SceneObjectGroup>();
-
-        private bool m_VelocityInterpolate = false;
+#pragma warning disable 0414
+        private bool m_VelocityInterpolate;
+#pragma warning restore 0414
         private const uint MaxTransferBytesPerPacket = 600;
 
         /// <value>
@@ -503,8 +509,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             RegisterInterface<IClientChat>(this);
 
             m_scene = scene;
-            m_entityUpdates = new PriorityQueue(m_scene.Entities.Count);
-            m_entityProps = new PriorityQueue(m_scene.Entities.Count);
+            int pcap = 512;
+            if(pcap > m_scene.Entities.Count)
+                pcap = m_scene.Entities.Count;
+            m_entityUpdates = new PriorityQueue(pcap);
+            m_entityProps = new PriorityQueue(pcap);
             m_killRecord = new List<uint>();
 //            m_attachmentsSent = new HashSet<uint>();
 
@@ -617,6 +626,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             ImageManager.Close();
             ImageManager = null;
 
+//            m_entityUpdates.Close();
+//            m_entityProps.Close();
             m_entityUpdates = new PriorityQueue(1);
             m_entityProps = new PriorityQueue(1);
             m_killRecord.Clear();
@@ -11039,9 +11050,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                  if(muteListRequest.MuteData.MuteCRC == 0)
                     SendEmpytMuteList();
                 else
-                    SendUseCachedMuteList();
+                SendUseCachedMuteList();
             }
-            return true;           
+            return true;
         }
 
         private bool HandleUpdateMuteListEntry(IClientAPI client, Packet Packet)
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index b575ed9..552c51e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.IO;
 using System.Net;
@@ -285,7 +286,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <summary>Incoming packets that are awaiting handling</summary>
         //protected OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>();
 
-        protected OpenSim.Framework.BlockingQueue<IncomingPacket> packetInbox = new OpenSim.Framework.BlockingQueue<IncomingPacket>();
+        protected BlockingCollection<IncomingPacket> packetInbox = new BlockingCollection<IncomingPacket>();
 
         /// <summary>Bandwidth throttle for this UDP server</summary>
         public TokenBucket Throttle { get; protected set; }
@@ -712,7 +713,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     scene.Name,
                     StatType.Pull,
                     MeasuresOfInterest.AverageChangeOverTime,
-                    stat => stat.Value = packetInbox.Count(),
+                    stat => {try{stat.Value = packetInbox.Count;}catch{}},
                     StatVerbosity.Debug));
 
             // XXX: These stats are also pool stats but we register them separately since they are currently not
@@ -898,7 +899,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (packet.Type == PacketType.CoarseLocationUpdate && allowSplitting)
                 allowSplitting = false;
 
-            bool packetQueued = false;
+//            bool packetQueued = false;
 
             if (allowSplitting && packet.HasVariableBlocks)
             {
@@ -911,15 +912,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 for (int i = 0; i < packetCount; i++)
                 {
                     byte[] data = datas[i];
-                    if (!SendPacketData(udpClient, data, packet.Type, category, method))
-                        packetQueued = true;
+//                    if (!SendPacketData(udpClient, data, packet.Type, category, method))
+//                        packetQueued = true;
+                    SendPacketData(udpClient, data, packet.Type, category, method);
                 }
             }
             else
             {
                 byte[] data = packet.ToBytes();
-                if (!SendPacketData(udpClient, data, packet.Type, category, method))
-                    packetQueued = true;
+//                if (!SendPacketData(udpClient, data, packet.Type, category, method))
+//                    packetQueued = true;
+                SendPacketData(udpClient, data, packet.Type, category, method);
             }
 
             PacketPool.Instance.ReturnPacket(packet);
@@ -1544,10 +1547,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
 //            if (incomingPacket.Packet.Type == PacketType.AgentUpdate ||
 //                incomingPacket.Packet.Type == PacketType.ChatFromViewer)
-            if (incomingPacket.Packet.Type == PacketType.ChatFromViewer)
-                packetInbox.PriorityEnqueue(incomingPacket);
-            else
-                packetInbox.Enqueue(incomingPacket);
+//            if (incomingPacket.Packet.Type == PacketType.ChatFromViewer)
+//                packetInbox.PriorityEnqueue(incomingPacket);
+//            else
+//                packetInbox.Enqueue(incomingPacket);
+            packetInbox.Add(incomingPacket);
 
         }
 
@@ -2016,7 +2020,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 Scene.ThreadAlive(1);
                 try
                 {
-                    incomingPacket = packetInbox.Dequeue(250);
+                    packetInbox.TryTake(out incomingPacket, 250);
 
                     if (incomingPacket != null && IsRunningInbound)
                     {
@@ -2038,9 +2042,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 Watchdog.UpdateThread();
             }
 
-            if (packetInbox.Count() > 0)
-                m_log.Warn("[LLUDPSERVER]: IncomingPacketHandler is shutting down, dropping " + packetInbox.Count() + " packets");
-            packetInbox.Clear();
+            if (packetInbox.Count > 0)
+                m_log.Warn("[LLUDPSERVER]: IncomingPacketHandler is shutting down, dropping " + packetInbox.Count + " packets");
+            packetInbox.Dispose();
 
             Watchdog.RemoveThread();
         }