Merged 3Di code that provides scene and avatar serialization, and plugin support for region move/split/merge. See ThirdParty/3Di/README.txt. Unless the new modules are used there should be no noticeable changes when running OpenSim.

1 files changed, 11 insertions, 1 deletions

diff --git a/OpenSim/Region/ClientStack/PacketQueue.cs b/OpenSim/Region/ClientStack/PacketQueue.cs
index a04828f..82f96e8 100644
--- a/OpenSim/Region/ClientStack/PacketQueue.cs
+++ b/OpenSim/Region/ClientStack/PacketQueue.cs
@@ -142,8 +142,13 @@ namespace OpenSim.Region.ClientStack
             // We could micro lock, but that will tend to actually
             // probably be worse than just synchronizing on SendQueue
 
-            lock (this)
+            if (item == null)
             {
+                SendQueue.Enqueue(item);
+                return;
+            }
+
+            lock (this) {
                 switch (item.throttleType)
                 {
                     case ThrottleOutPacketType.Resend:
@@ -518,5 +523,10 @@ namespace OpenSim.Region.ClientStack
                                  TextureOutgoingPacketQueue.Count,
                                  AssetOutgoingPacketQueue.Count);                                     
         }
+
+        public QueItem[] GetQueueArray()
+        {
+            return SendQueue.GetQueueArray();
+        }
     }
 }