Patch from Johan: LibSL updated to the latest revision (1568) and all packets are now

recycled to improve performance and memory usage. 

1 files changed, 13 insertions, 13 deletions

diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index da60ed7..181000c 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -26,11 +26,9 @@
 * 
 */
 
-using System;
 using System.Collections.Generic;
 using libsecondlife;
 using libsecondlife.Packets;
-using OpenSim.Framework.Console;
 
 namespace OpenSim.Framework
 {
@@ -42,6 +40,7 @@ namespace OpenSim.Framework
 
         public void ForEachClient(ForEachClientDelegate whatToDo)
         {
+
             // Wasteful, I know
             IClientAPI[] LocalClients = new IClientAPI[0];
             lock (m_clients)
@@ -56,11 +55,9 @@ namespace OpenSim.Framework
                 {
                     whatToDo(LocalClients[i]);
                 }
-                catch (Exception e)
+                catch (System.Exception e)
                 {
-                    MainLog.Instance.Warn("CLIENT",
-                                          "Unable to do ForEachClient for one of the clients" + "\n Reason: " +
-                                          e.ToString());
+                    OpenSim.Framework.Console.MainLog.Instance.Warn("CLIENT", "Unable to do ForEachClient for one of the clients" + "\n Reason: " + e.ToString());
                 }
             }
         }
@@ -110,19 +107,20 @@ namespace OpenSim.Framework
                 IClientAPI client;
                 try
                 {
+
                     if (m_clients.TryGetValue(circuits[i], out client))
                     {
                         Remove(client.CircuitCode);
                         client.Close(false);
                     }
                 }
-                catch (Exception e)
+                catch (System.Exception e)
                 {
-                    MainLog.Instance.Error("CLIENT",
-                                           "Unable to shutdown circuit for: " + agentId.ToString() + "\n Reason: " +
-                                           e.ToString());
+                    OpenSim.Framework.Console.MainLog.Instance.Error("CLIENT", "Unable to shutdown circuit for: " + agentId.ToString() + "\n Reason: " + e.ToString());
                 }
             }
+
+            
         }
 
         private uint[] GetAllCircuits(LLUUID agentId)
@@ -137,7 +135,7 @@ namespace OpenSim.Framework
             }
 
 
-            for (int i = 0; i < LocalClients.Length; i++)
+            for (int i = 0; i < LocalClients.Length; i++ )
             {
                 if (LocalClients[i].AgentId == agentId)
                 {
@@ -150,7 +148,8 @@ namespace OpenSim.Framework
 
         public void ViewerEffectHandler(IClientAPI sender, ViewerEffectPacket.EffectBlock[] effectBlock)
         {
-            ViewerEffectPacket packet = new ViewerEffectPacket();
+            ViewerEffectPacket packet = (ViewerEffectPacket)  PacketPool.Instance.GetPacket(PacketType.ViewerEffect);
+            // TODO: don't create new blocks if recycling an old packet
             packet.Effect = effectBlock;
 
             // Wasteful, I know
@@ -170,6 +169,7 @@ namespace OpenSim.Framework
                     packet.AgentData.SessionID = LocalClients[i].SessionId;
                     LocalClients[i].OutPacket(packet, ThrottleOutPacketType.Task);
                 }
+
             }
         }
 
@@ -178,4 +178,4 @@ namespace OpenSim.Framework
             return m_clients.TryGetValue(circuitId, out user);
         }
     }
-}
\ No newline at end of file
+}