1 files changed, 123 insertions, 29 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index cda4d49..2884268 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -80,6 +80,8 @@ 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;
@@ -140,6 +142,10 @@ 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_packetMTU = 1400;
 
         protected IAssetService m_assetService;
@@ -344,6 +350,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private readonly IGroupsModule m_GroupsModule;
 
+        private AgentUpdateArgs lastarg = null;
+
         //private TerrainUnacked handlerUnackedTerrain = null;
 
         //**
@@ -544,6 +552,15 @@ 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);
+
+                    m_textureDataLimit = clientConfig.GetInt("TextureDataLimit",
+                                                               m_textureDataLimit);
+
                     m_packetMTU = clientConfig.GetInt("PacketMTU", 1400);
                 }
             }
@@ -577,6 +594,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_avatarTerseUpdateTimer.Stop();
             m_primTerseUpdateTimer.Stop();
             m_primFullUpdateTimer.Stop();
+            m_textureRequestTimer.Stop();
 
             // This is just to give the client a reasonable chance of
             // flushing out all it's packets.  There should probably
@@ -660,6 +678,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             m_avatarTerseUpdateTimer.Stop();
             m_primTerseUpdateTimer.Stop();
             m_primFullUpdateTimer.Stop();
+            m_textureRequestTimer.Stop();
         }
 
         public void Restart()
@@ -682,6 +701,11 @@ 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()
@@ -914,6 +938,11 @@ 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;
+
             m_scene.AddNewClient(this);
 
             RefreshGroupMembership();
@@ -985,6 +1014,26 @@ 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
@@ -3032,6 +3081,21 @@ 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)
+        {
+            if (m_imageManager != null)
+            {
+                if (m_imageManager.ProcessImageQueue(m_textureSendLimit, 
+                                                     m_textureDataLimit))
+                {
+                    m_textureRequestTimer.Start();
+                }
+            }
+        }
+
         void ProcessPrimFullUpdates(object sender, ElapsedEventArgs e)
         {
             lock (m_primFullUpdates)
@@ -3237,7 +3301,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec)
         {
             ImageDataPacket im = new ImageDataPacket();
-            im.Header.Reliable = true;
+            im.Header.Reliable = false;
             im.ImageID.Packets = numParts;
             im.ImageID.ID = ImageUUID;
 
@@ -3253,7 +3317,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData)
         {
             ImagePacketPacket im = new ImagePacketPacket();
-            im.Header.Reliable = true;
+            im.Header.Reliable = false;
             im.ImageID.Packet = partNumber;
             im.ImageID.ID = imageUuid;
             im.ImageData.Data = imageData;
@@ -4727,14 +4791,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="Pack">OpenMetaverse.packet</param>
         public void ProcessInPacket(Packet Pack)
         {
-            // check if we've got a local packet handler for this packet.type.   See RegisterLocalPacketHandlers()
+
             if (ProcessPacketMethod(Pack))
             {
-                //there is a handler registered that handled this packet type
-
-                // in the end, we dereference this, so we have to check if it's null
-                if (m_imageManager != null)
-                    m_imageManager.ProcessImageQueue(5);
                 return;
             }
 
@@ -5303,6 +5362,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 case PacketType.AgentUpdate:
                     if (OnAgentUpdate != null)
                     {
+                        bool update = false;
                         AgentUpdatePacket agenUpdate = (AgentUpdatePacket)Pack;
 
                         #region Packet Session and User Check
@@ -5315,26 +5375,58 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                         #endregion
 
                         AgentUpdatePacket.AgentDataBlock x = agenUpdate.AgentData;
-                        AgentUpdateArgs arg = new AgentUpdateArgs();
-                        arg.AgentID = x.AgentID;
-                        arg.BodyRotation = x.BodyRotation;
-                        arg.CameraAtAxis = x.CameraAtAxis;
-                        arg.CameraCenter = x.CameraCenter;
-                        arg.CameraLeftAxis = x.CameraLeftAxis;
-                        arg.CameraUpAxis = x.CameraUpAxis;
-                        arg.ControlFlags = x.ControlFlags;
-                        arg.Far = x.Far;
-                        arg.Flags = x.Flags;
-                        arg.HeadRotation = x.HeadRotation;
-                        arg.SessionID = x.SessionID;
-                        arg.State = x.State;
 
-                        handlerAgentUpdate = OnAgentUpdate;
-                        if (handlerAgentUpdate != null)
-                            OnAgentUpdate(this, arg);
+                        // We can only check when we have something to check
+                        // against.
+
+                        if (lastarg != null)
+                        {
+                            update = 
+                               (
+                                (x.BodyRotation != lastarg.BodyRotation) ||
+                                (x.CameraAtAxis != lastarg.CameraAtAxis) ||
+                                (x.CameraCenter != lastarg.CameraCenter) ||
+                                (x.CameraLeftAxis != lastarg.CameraLeftAxis) ||
+                                (x.CameraUpAxis != lastarg.CameraUpAxis) ||
+                                (x.ControlFlags != lastarg.ControlFlags) ||
+                                (x.Far != lastarg.Far) ||
+                                (x.Flags != lastarg.Flags) ||
+                                (x.State != lastarg.State) ||
+                                (x.HeadRotation != lastarg.HeadRotation) ||
+                                (x.SessionID != lastarg.SessionID) ||
+                                (x.AgentID != lastarg.AgentID)
+                               );
+                        }
+                        else
+                            update = true;
+
+                        // These should be ordered from most-likely to
+                        // least likely to change. I've made an initial
+                        // guess at that.
+
+                        if (update)
+                        {
+                            AgentUpdateArgs arg = new AgentUpdateArgs();
+                            arg.AgentID = x.AgentID;
+                            arg.BodyRotation = x.BodyRotation;
+                            arg.CameraAtAxis = x.CameraAtAxis;
+                            arg.CameraCenter = x.CameraCenter;
+                            arg.CameraLeftAxis = x.CameraLeftAxis;
+                            arg.CameraUpAxis = x.CameraUpAxis;
+                            arg.ControlFlags = x.ControlFlags;
+                            arg.Far = x.Far;
+                            arg.Flags = x.Flags;
+                            arg.HeadRotation = x.HeadRotation;
+                            arg.SessionID = x.SessionID;
+                            arg.State = x.State;
+                            handlerAgentUpdate = OnAgentUpdate;
+                            lastarg = arg; // save this set of arguments for nexttime
+                            if (handlerAgentUpdate != null)
+                                OnAgentUpdate(this, arg);
+
+                            handlerAgentUpdate = null;
+                        }
 
-                        handlerAgentUpdate = null;
-                        //agenUpdate.AgentData.ControlFlags, agenUpdate.AgentData.BodyRotationa);
                     }
                     break;
 
@@ -6392,10 +6484,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                             // in the end, we null this, so we have to check if it's null
                             if (m_imageManager != null)
+                            {
                                 m_imageManager.EnqueueReq(args);
+                                m_textureRequestTimer.Start();
+                            }
                         }
                     }
                     break;
+
                 case PacketType.TransferRequest:
                     //m_log.Debug("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
 
@@ -9502,10 +9598,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     #endregion
             }
 
-            // in the end, we dereference this, so we have to check if it's null
-            if (m_imageManager != null)
-                m_imageManager.ProcessImageQueue(10);
             PacketPool.Instance.ReturnPacket(Pack);
+
         }
 
         private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket)