1 files changed, 50 insertions, 67 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 88ace6a..3b43771 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -81,8 +81,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         private List<ObjectUpdatePacket.ObjectDataBlock> m_primFullUpdates =
                 new List<ObjectUpdatePacket.ObjectDataBlock>();
 
-        private Timer m_textureRequestTimer;
-
         private bool m_clientBlocked;
 
         private int m_probesWithNoIngressPackets;
@@ -143,9 +141,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         protected int m_primTerseUpdateRate = 10;
         protected int m_primFullUpdateRate = 14;
 
-        protected int m_textureRequestRate  = 100;
-        protected int m_textureSendLimit   = 10;
-        protected int m_textureDataLimit   = 5;
+        protected int m_textureSendLimit   = 20;
+        protected int m_textureDataLimit   = 10;
 
         protected int m_packetMTU = 1400;
 
@@ -534,6 +531,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_PacketHandler = new LLPacketHandler(this, m_networkServer, userSettings);
             m_PacketHandler.SynchronizeClient = SynchronizeClient;
             m_PacketHandler.OnPacketStats += PopulateStats;
+            m_PacketHandler.OnQueueEmpty += HandleQueueEmpty;
 
             if (scene.Config != null)
             {
@@ -555,9 +553,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     m_primFullUpdateRate = clientConfig.GetInt("FullUpdateRate",
                                                                m_primFullUpdateRate);
 
-                    m_textureRequestRate = clientConfig.GetInt("TextureRequestRate",
-                                                               m_textureRequestRate);
-
                     m_textureSendLimit = clientConfig.GetInt("TextureSendLimit",
                                                                m_textureSendLimit);
 
@@ -607,9 +602,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (m_primFullUpdateTimer.Enabled)
                 lock (m_primFullUpdateTimer)
                     m_primFullUpdateTimer.Stop();
-            if (m_textureRequestTimer.Enabled)
-                lock (m_textureRequestTimer)
-                    m_textureRequestTimer.Stop();
 
             // This is just to give the client a reasonable chance of
             // flushing out all it's packets.  There should probably
@@ -633,6 +625,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 // of the client thread regardless of where Close() is called.
                 KillEndDone();
             }
+                        
+                        Terminate();
         }
 
         /// <summary>
@@ -704,10 +698,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (m_primFullUpdateTimer.Enabled)
                 lock (m_primFullUpdateTimer)
                     m_primFullUpdateTimer.Stop();
-
-            if (m_textureRequestTimer.Enabled)
-                lock (m_textureRequestTimer)
-                    m_textureRequestTimer.Stop();
         }
 
         public void Restart()
@@ -730,23 +720,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_primFullUpdateTimer = new Timer(m_primFullUpdateRate);
             m_primFullUpdateTimer.Elapsed += new ElapsedEventHandler(ProcessPrimFullUpdates);
             m_primFullUpdateTimer.AutoReset = false;
-
-            m_textureRequestTimer = new Timer(m_textureRequestRate);
-            m_textureRequestTimer.Elapsed += new ElapsedEventHandler(ProcessTextureRequests);
-            m_textureRequestTimer.AutoReset = false;
-
         }
 
-        public void Terminate()
+        private void Terminate()
         {
+                        IsActive = false;
+                        
+                        m_clientPingTimer.Close();
+                        m_avatarTerseUpdateTimer.Close();
+                        m_primTerseUpdateTimer.Close();
+                        m_primFullUpdateTimer.Close();
+                        
             m_PacketHandler.OnPacketStats -= PopulateStats;
-            m_PacketHandler.Stop();
+                        m_PacketHandler.Dispose();
 
             // wait for thread stoped
-            m_clientThread.Join();
+            // m_clientThread.Join();
 
             // delete circuit code
-            m_networkServer.CloseClient(this);
+            //m_networkServer.CloseClient(this);
         }
 
         #endregion
@@ -876,6 +868,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             while (IsActive)
             {
                 LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue();
+                                
+                                if (nextPacket == null) {
+                                        m_log.DebugFormat("[CLIENT]: PacketQueue return null LLQueItem");
+                                        continue;
+                                }
 
                 if (nextPacket.Incoming)
                 {
@@ -967,10 +964,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_primFullUpdateTimer.Elapsed += new ElapsedEventHandler(ProcessPrimFullUpdates);
             m_primFullUpdateTimer.AutoReset = false;
 
-            m_textureRequestTimer = new Timer(m_textureRequestRate);
-            m_textureRequestTimer.Elapsed += new ElapsedEventHandler(ProcessTextureRequests);
-            m_textureRequestTimer.AutoReset = false;
-
             m_scene.AddNewClient(this);
 
             RefreshGroupMembership();
@@ -1042,26 +1035,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        protected virtual void TextureRequestHandler()
-        {
-            m_log.DebugFormat("[TRH] Thread started");
-           while (m_imageManager != null)
-            {
-                try
-                {
-                   while (m_imageManager != null)
-                    {
-                    }
-                }
-               catch (Exception e)
-                {
-                    m_log.WarnFormat("[TRH] Exception in handler loop: {0}", e.Message);
-                    m_log.Debug(e);
-                }
-            }
-            m_log.DebugFormat("[TRH] Thread terminated");
-        }
-
         # endregion
 
         // Previously ClientView.API partial class
@@ -3161,22 +3134,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             }
         }
 
-        // Unlike the other timers, this one is only started after
-        // the first request is seen.
-
-        void ProcessTextureRequests(object sender, ElapsedEventArgs e)
+        void HandleQueueEmpty(ThrottleOutPacketType queue)
         {
-            if (m_imageManager != null)
+            switch (queue)
             {
-                if (m_imageManager.ProcessImageQueue(m_textureSendLimit, 
-                                                     m_textureDataLimit))
-                {
-                    lock (m_textureRequestTimer)
-                        m_textureRequestTimer.Start();
-                }
+                case ThrottleOutPacketType.Texture:
+                    ProcessTextureRequests();
+                    break;
             }
         }
 
+        void ProcessTextureRequests()
+        {
+            if (m_imageManager != null)
+                m_imageManager.ProcessImageQueue(m_textureSendLimit, m_textureDataLimit);
+        }
+
         void ProcessPrimFullUpdates(object sender, ElapsedEventArgs e)
         {
             lock (m_primFullUpdates)
@@ -5275,13 +5248,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         // for the client session anyway, in order to protect ourselves against bad code in plugins
                         try
                         {
-                            List<byte> visualparams = new List<byte>();
-                            foreach (AgentSetAppearancePacket.VisualParamBlock x in appear.VisualParam)
-                            {
-                                visualparams.Add(x.ParamValue);
-                            }
+                            byte[] visualparams = new byte[appear.VisualParam.Length];
+                            for (int i = 0; i < appear.VisualParam.Length; i++)
+                                visualparams[i] = appear.VisualParam[i].ParamValue;
 
-                            handlerSetAppearance(appear.ObjectData.TextureEntry, visualparams);
+                            Primitive.TextureEntry te = null;
+                            if (appear.ObjectData.TextureEntry.Length > 1)
+                                te = new Primitive.TextureEntry(appear.ObjectData.TextureEntry, 0, appear.ObjectData.TextureEntry.Length);
+
+                            handlerSetAppearance(te, visualparams);
                         }
                         catch (Exception e)
                         {
@@ -6624,8 +6599,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                             if (m_imageManager != null)
                             {
                                 m_imageManager.EnqueueReq(args);
-                                lock (m_textureRequestTimer)
-                                    m_textureRequestTimer.Start();
                             }
                         }
                     }
@@ -11026,5 +10999,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         }
 
         #endregion
+
+        public void SendRebakeAvatarTextures(UUID textureID)
+        {
+            RebakeAvatarTexturesPacket pack =
+                (RebakeAvatarTexturesPacket)PacketPool.Instance.GetPacket(PacketType.RebakeAvatarTextures);
+
+            pack.TextureData = new RebakeAvatarTexturesPacket.TextureDataBlock();
+            pack.TextureData.TextureID = textureID;
+            OutPacket(pack, ThrottleOutPacketType.Task);
+        }
     }
 }