* Create a new ViewerEffectPacket for each viewer rather than reusing the packet structure

* This would have been a source of out_of_order messages for different sequences, which still appear to be happening

1 files changed, 6 insertions, 4 deletions

diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index e99001b..68c4dea 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -178,10 +178,9 @@ namespace OpenSim.Framework
         }
 
         public void ViewerEffectHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args)
-        {
-            ViewerEffectPacket packet = (ViewerEffectPacket)PacketPool.Instance.GetPacket(PacketType.ViewerEffect);
+        {            
             // TODO: don't create new blocks if recycling an old packet
-            List<ViewerEffectPacket.EffectBlock> effectBlock = new List<ViewerEffectPacket.EffectBlock>();
+            List<ViewerEffectPacket.EffectBlock> effectBlock = new List<ViewerEffectPacket.EffectBlock>();                        
             for (int i = 0; i < args.Count; i++)
             {
                 ViewerEffectPacket.EffectBlock effect = new ViewerEffectPacket.EffectBlock();
@@ -193,7 +192,7 @@ namespace OpenSim.Framework
                 effect.TypeData = args[i].TypeData;
                 effectBlock.Add(effect);
             }
-            packet.Effect = effectBlock.ToArray();
+            ViewerEffectPacket.EffectBlock[] effectBlockArray = effectBlock.ToArray();
 
             IClientAPI[] LocalClients;
             lock (m_clients)
@@ -206,6 +205,9 @@ namespace OpenSim.Framework
             {
                 if (LocalClients[i].AgentId != sender.AgentId)
                 {
+                    ViewerEffectPacket packet = (ViewerEffectPacket)PacketPool.Instance.GetPacket(PacketType.ViewerEffect);
+                    packet.Effect = effectBlockArray;
+                    
                     packet.AgentData.AgentID = LocalClients[i].AgentId;
                     packet.AgentData.SessionID = LocalClients[i].SessionId;
                     packet.Header.Reliable = false;