* Continued work on the new LLUDP implementation. Appears to be functioning, although not everything is reimplemented yet

* Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing
* Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively
* Fixed formatting for a MySQLAssetData error logging line

1 files changed, 12 insertions, 21 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
index 000f455..2f1face 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs
@@ -76,27 +76,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             if (m_currentPacket <= m_stopPacket)
             {
-                bool SendMore = true;
+                int count = 0;
+                bool sendMore = true;
+
                 if (!m_sentInfo || (m_currentPacket == 0))
                 {
-                    if (SendFirstPacket(client))
-                    {
-                        SendMore = false;
-                    }
+                    sendMore = !SendFirstPacket(client);
+
                     m_sentInfo = true;
-                    m_currentPacket++;
+                    ++m_currentPacket;
+                    ++count;
                 }
                 if (m_currentPacket < 2)
                 {
                     m_currentPacket = 2;
                 }
-
-                int count = 0;
-                while (SendMore && count < maxpack && m_currentPacket <= m_stopPacket)
+                
+                while (sendMore && count < maxpack && m_currentPacket <= m_stopPacket)
                 {
-                    count++;
-                    SendMore = SendPacket(client);
-                    m_currentPacket++;
+                    sendMore = SendPacket(client);
+                    ++m_currentPacket;
+                    ++count;
                 }
 
                 if (m_currentPacket > m_stopPacket)
@@ -196,15 +196,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                         m_currentPacket = StartPacket;
                     }
-
-                    if (m_imageManager != null && m_imageManager.Client != null)
-                    {
-                        if (m_imageManager.Client.IsThrottleEmpty(ThrottleOutPacketType.Texture))
-                        {
-                            //m_log.Debug("No textures queued, sending one packet to kickstart it");
-                            SendPacket(m_imageManager.Client);
-                        }
-                    }
                 }
             }
         }