5 files changed, 204 insertions, 138 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 7c9a1c4..9ccfd5d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -30,7 +30,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
-using System.Threading;
+using System.Text;
 using log4net;
 using Nini.Config;
 using Mono.Addins;
@@ -292,8 +292,6 @@ namespace OpenSim.Region.ClientStack.Linden
             Queue<OSD> queue;
             Random rnd = new Random(Environment.TickCount);
             int nrnd = rnd.Next(30000000);
-            if (nrnd < 0)
-                nrnd = -nrnd;
 
             lock (queues)
             {
@@ -307,21 +305,11 @@ namespace OpenSim.Region.ClientStack.Linden
                     queue = new Queue<OSD>();
                     queues[agentID] = queue;
 
-                    // push markers to handle old responses still waiting
-                    // this will cost at most viewer getting two forced noevents
-                    // even being a new queue better be safe
-                    queue.Enqueue(null);
-                    queue.Enqueue(null); // one should be enough
-
                     lock (m_AvatarQueueUUIDMapping)
                     {
                         eventQueueGetUUID = UUID.Random();
-                        if (m_AvatarQueueUUIDMapping.ContainsKey(agentID))
-                        {
-                            // oops this should not happen ?
-                            m_log.DebugFormat("[EVENTQUEUE]: Found Existing UUID without a queue");
-                            eventQueueGetUUID = m_AvatarQueueUUIDMapping[agentID];
-                        }
+                        while(m_AvatarQueueUUIDMapping.ContainsKey(agentID))
+                            eventQueueGetUUID = UUID.Random();
                         m_AvatarQueueUUIDMapping.Add(agentID, eventQueueGetUUID);
                     }
                     lock (m_ids)
@@ -329,18 +317,14 @@ namespace OpenSim.Region.ClientStack.Linden
                         if (!m_ids.ContainsKey(agentID))
                             m_ids.Add(agentID, nrnd);
                         else
-                            m_ids[agentID] = nrnd;
+                            m_ids[agentID]++;
                     }
                 }
                 else
                 {
-                    // push markers to handle old responses still waiting
-                    // this will cost at most viewer getting two forced noevents
-                    // even being a new queue better be safe
                     queue.Enqueue(null);
                     queue.Enqueue(null); // one should be enough
-
-                    // reuse or not to reuse TODO FIX
+                    // reuse or not to reuse
                     lock (m_AvatarQueueUUIDMapping)
                     {
                         // Reuse open queues.  The client does!
@@ -349,30 +333,39 @@ namespace OpenSim.Region.ClientStack.Linden
                         {
                             m_log.DebugFormat("[EVENTQUEUE]: Found Existing UUID!");
                             eventQueueGetUUID = m_AvatarQueueUUIDMapping[agentID];
+                            lock (m_ids)
+                            {
+                                // change to negative numbers so they are changed at end of sending first marker
+                                // old data on a queue may be sent on a response for a new caps
+                                // but at least will be sent with coerent IDs
+                                if (!m_ids.ContainsKey(agentID))
+                                    m_ids.Add(agentID, -nrnd); // should not happen
+                                else
+                                    m_ids[agentID] = -m_ids[agentID];
+                            }
                         }
                         else
                         {
                             eventQueueGetUUID = UUID.Random();
+                            while(m_AvatarQueueUUIDMapping.ContainsKey(agentID))
+                                eventQueueGetUUID = UUID.Random();
                             m_AvatarQueueUUIDMapping.Add(agentID, eventQueueGetUUID);
                             m_log.DebugFormat("[EVENTQUEUE]: Using random UUID!");
+                            lock (m_ids)
+                            {
+                                if (!m_ids.ContainsKey(agentID))
+                                    m_ids.Add(agentID, nrnd);
+                                else
+                                    m_ids[agentID]++;
+                            }
                         }
                     }
-                    lock (m_ids)
-                    {
-                        // change to negative numbers so they are changed at end of sending first marker
-                        // old data on a queue may be sent on a response for a new caps
-                        // but at least will be sent with coerent IDs
-                        if (!m_ids.ContainsKey(agentID))
-                            m_ids.Add(agentID, -nrnd); // should not happen
-                        else
-                            m_ids[agentID] = -m_ids[agentID];
-                    }
                 }
             }
 
-            caps.RegisterPollHandler(
-                "EventQueueGet",
-                new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, SERVER_EQ_TIME_NO_EVENTS));
+        caps.RegisterPollHandler(
+            "EventQueueGet",
+                new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, Drop, agentID, SERVER_EQ_TIME_NO_EVENTS));
         }
 
         public bool HasEvents(UUID requestID, UUID agentID)
@@ -448,7 +441,6 @@ namespace OpenSim.Region.ClientStack.Linden
                     if (DebugLevel > 0)
                         LogOutboundDebugMessage(element, pAgentId);
                     array.Add(element);
-                    thisID++;
                 }
             }
 
@@ -465,8 +457,6 @@ namespace OpenSim.Region.ClientStack.Linden
             {
                 Random rnd = new Random(Environment.TickCount);
                 thisID = rnd.Next(30000000);
-                if (thisID < 0)
-                    thisID = -thisID;
             }
 
             lock (m_ids)
@@ -474,16 +464,19 @@ namespace OpenSim.Region.ClientStack.Linden
                 m_ids[pAgentId] = thisID + 1;
             }
 
+            Hashtable responsedata;
             // if there where no elements before a marker send a NoEvents
-            if (array.Count == 0)
-                return NoEvents(requestID, pAgentId);
-
-            Hashtable responsedata = new Hashtable();
-            responsedata["int_response_code"] = 200;
-            responsedata["content_type"] = "application/xml";
-            responsedata["keepalive"] = false;
-            responsedata["reusecontext"] = false;
-            responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(events);
+            if (events == null)
+            {
+               return NoEvents(requestID, pAgentId);
+            }
+            else
+            {
+                responsedata = new Hashtable();
+                responsedata["int_response_code"] = 200;
+                responsedata["content_type"] = "application/xml";
+                responsedata["bin_response_data"] = Encoding.UTF8.GetBytes(OSDParser.SerializeLLSDXmlString(events));
+            }
             //m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", pAgentId, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]);
             return responsedata;
         }
@@ -493,13 +486,13 @@ namespace OpenSim.Region.ClientStack.Linden
             Hashtable responsedata = new Hashtable();
             responsedata["int_response_code"] = 502;
             responsedata["content_type"] = "text/plain";
-            responsedata["keepalive"] = false;
-            responsedata["reusecontext"] = false;
             responsedata["str_response_string"] = "<llsd></llsd>";
             responsedata["error_status_text"] = "<llsd></llsd>";
             responsedata["http_protocol_version"] = "HTTP/1.0";
+            responsedata["keepalive"] = false;
             return responsedata;
         }
+
 /* this is not a event message
         public void DisableSimulator(ulong handle, UUID avatarID)
         {
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index ee3f4f1..080cef9 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Net;
+using System.Text;
 using log4net.Config;
 using Nini.Config;
 using NUnit.Framework;
@@ -59,13 +60,12 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             base.SetUp();
 
             uint port = 9999;
-            uint sslPort = 9998;
 
             // This is an unfortunate bit of clean up we have to do because MainServer manages things through static
             // variables and the VM is not restarted between tests.
             MainServer.RemoveHttpServer(port);
 
-            BaseHttpServer server = new BaseHttpServer(port, false, sslPort, "");
+            BaseHttpServer server = new BaseHttpServer(port, false, "","","");
             MainServer.AddHttpServer(server);
             MainServer.Instance = server;
 
@@ -126,7 +126,7 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             Hashtable eventsResponse = m_eqgMod.GetEvents(UUID.Zero, sp.UUID);
 
             // initial queue as null events
-            eventsResponse = m_eqgMod.GetEvents(UUID.Zero, sp.UUID);
+//            eventsResponse = m_eqgMod.GetEvents(UUID.Zero, sp.UUID);
             if((int)eventsResponse["int_response_code"] != (int)HttpStatusCode.OK)
             {
                 eventsResponse = m_eqgMod.GetEvents(UUID.Zero, sp.UUID);
@@ -137,8 +137,11 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
             Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.OK));
 
 //            Console.WriteLine("Response [{0}]", (string)eventsResponse["str_response_string"]);
+            string data = String.Empty;
+            if(eventsResponse["bin_response_data"] != null)
+                data = Encoding.UTF8.GetString((byte[])eventsResponse["bin_response_data"]);
 
-            OSDMap rawOsd = (OSDMap)OSDParser.DeserializeLLSDXml((string)eventsResponse["str_response_string"]);
+            OSDMap rawOsd = (OSDMap)OSDParser.DeserializeLLSDXml(data);
             OSDArray eventsOsd = (OSDArray)rawOsd["events"];
 
             bool foundUpdate = false;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index ba917e39..87ded7b 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -76,7 +76,6 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             public Hashtable response;
             public int bytes;
-            public int lod;
         }
 
 
@@ -231,11 +230,12 @@ namespace OpenSim.Region.ClientStack.Linden
                     new List<Hashtable>();
             private Dictionary<UUID, aPollResponse> responses =
                     new Dictionary<UUID, aPollResponse>();
+            private HashSet<UUID> dropedResponses = new HashSet<UUID>();
 
             private Scene m_scene;
             private MeshCapsDataThrottler m_throttler;
             public PollServiceMeshEventArgs(string uri, UUID pId, Scene scene) :
-                base(null, uri, null, null, null, pId, int.MaxValue)
+                base(null, uri, null, null, null, null, pId, int.MaxValue)
             {
                 m_scene = scene;
                 m_throttler = new MeshCapsDataThrottler(100000);
@@ -249,6 +249,17 @@ namespace OpenSim.Region.ClientStack.Linden
 
                     }
                 };
+
+                Drop = (x, y) =>
+                {
+                    lock (responses)
+                    {
+                        responses.Remove(x);
+                        lock(dropedResponses)
+                            dropedResponses.Add(x);
+                    }
+                };
+
                 GetEvents = (x, y) =>
                 {
                     lock (responses)
@@ -307,30 +318,48 @@ namespace OpenSim.Region.ClientStack.Linden
                 if(m_scene.ShuttingDown)
                     return;
 
-                // If the avatar is gone, don't bother to get the texture
-                if (m_scene.GetScenePresence(Id) == null)
+               lock(responses)
                 {
-                    response = new Hashtable();
-
-                    response["int_response_code"] = 500;
-                    response["str_response_string"] = "Script timeout";
-                    response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
-                    response["reusecontext"] = false;
+                    lock(dropedResponses)
+                    {
+                        if(dropedResponses.Contains(requestID))
+                        {
+                            dropedResponses.Remove(requestID);
+                            return;
+                        }
+                    }
+                
+                    // If the avatar is gone, don't bother to get the texture
+                    if (m_scene.GetScenePresence(Id) == null)
+                    {
+                        response = new Hashtable();
 
-                    lock (responses)
-                        responses[requestID] = new aPollResponse() { bytes = 0, response = response, lod = 0 };
+                        response["int_response_code"] = 500;
+                        response["str_response_string"] = "Script timeout";
+                        response["content_type"] = "text/plain";
+                        response["keepalive"] = false;
+                        responses[requestID] = new aPollResponse() { bytes = 0, response = response};
 
-                    return;
+                        return;
+                    }
                 }
 
                 response = m_getMeshHandler.Handle(requestinfo.request);
+
                 lock (responses)
                 {
+                    lock(dropedResponses)
+                    {
+                        if(dropedResponses.Contains(requestID))
+                        {
+                            dropedResponses.Remove(requestID);
+                            return;
+                        }
+                    }
+
                     responses[requestID] = new aPollResponse()
                     {
                         bytes = (int)response["int_bytes"],
-                        lod = (int)response["int_lod"],
                         response = response
                     };
 
@@ -443,7 +472,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     return;
                 int add = (int)(ThrottleBytes * timeElapsed * 0.001);
                 if (add >= 1000)
-                {
+            {
                     lastTimeElapsed = currenttime;
                     BytesSent -= add;
                     if (BytesSent < 0) BytesSent = 0;
@@ -451,6 +480,6 @@ namespace OpenSim.Region.ClientStack.Linden
             }
 
             public int ThrottleBytes;
-        }
-    }
+            }
+                }
 }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index b01c7dc..9a561ea 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -146,39 +146,13 @@ namespace OpenSim.Region.ClientStack.Linden
                 }
             }
         }
-        private int ExtractImageThrottle(byte[] pthrottles)
-        {
-
-            byte[] adjData;
-            int pos = 0;
-
-            if (!BitConverter.IsLittleEndian)
-            {
-                byte[] newData = new byte[7 * 4];
-                Buffer.BlockCopy(pthrottles, 0, newData, 0, 7 * 4);
-
-                for (int i = 0; i < 7; i++)
-                    Array.Reverse(newData, i * 4, 4);
-
-                adjData = newData;
-            }
-            else
-            {
-                adjData = pthrottles;
-            }
-
-            pos = pos + 20;
-            int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); //pos += 4;
-            //int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
-            return texture;
-        }
-
+ 
         // Now we know when the throttle is changed by the client in the case of a root agent or by a neighbor region in the case of a child agent.
         public void ThrottleUpdate(ScenePresence p)
         {
             byte[] throttles = p.ControllingClient.GetThrottlesPacked(1);
             UUID user = p.UUID;
-            int imagethrottle = ExtractImageThrottle(throttles);
+            int imagethrottle = p.ControllingClient.GetAgentThrottleSilent((int)ThrottleOutPacketType.Texture);
             PollServiceTextureEventArgs args;
             if (m_pollservices.TryGetValue(user,out args))
             {
@@ -218,13 +192,15 @@ namespace OpenSim.Region.ClientStack.Linden
                     new List<Hashtable>();
             private Dictionary<UUID, aPollResponse> responses =
                     new Dictionary<UUID, aPollResponse>();
+            private HashSet<UUID> dropedResponses = new HashSet<UUID>();
 
             private Scene m_scene;
-            private CapsDataThrottler m_throttler = new CapsDataThrottler(100000);
+            private CapsDataThrottler m_throttler;
             public PollServiceTextureEventArgs(UUID pId, Scene scene) :
-                    base(null, "", null, null, null, pId, int.MaxValue)
+                    base(null, "", null, null, null, null, pId, int.MaxValue)              
             {
                 m_scene = scene;
+                m_throttler = new CapsDataThrottler(100000);
                 // x is request id, y is userid
                 HasEvents = (x, y) =>
                 {
@@ -235,6 +211,16 @@ namespace OpenSim.Region.ClientStack.Linden
 
                     }
                 };
+
+                Drop = (x, y) =>
+                {
+                    lock (responses)
+                    {
+                        responses.Remove(x);
+                        dropedResponses.Add(x);
+                    }
+               };
+
                 GetEvents = (x, y) =>
                 {
                     lock (responses)
@@ -305,53 +291,72 @@ namespace OpenSim.Region.ClientStack.Linden
                 if(m_scene.ShuttingDown)
                     return;
 
-                if (requestinfo.send503)
+                lock (responses)
                 {
-                    response = new Hashtable();
+                    lock(dropedResponses)
+                    {
+                        if(dropedResponses.Contains(requestID))
+                        {
+                            dropedResponses.Remove(requestID);
+                            return;
+                        }
+                    }
 
-                    response["int_response_code"] = 503;
-                    response["str_response_string"] = "Throttled";
-                    response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
-                    response["reusecontext"] = false;
+                    if (requestinfo.send503)
+                    {
+                        response = new Hashtable();
 
-                    Hashtable headers = new Hashtable();
-                    headers["Retry-After"] = 30;
-                    response["headers"] = headers;
+                        response["int_response_code"] = 503;
+                        response["str_response_string"] = "Throttled";
+                        response["content_type"] = "text/plain";
+                        response["keepalive"] = false;
+                        response["reusecontext"] = false;
+
+                        Hashtable headers = new Hashtable();
+                        headers["Retry-After"] = 30;
+                        response["headers"] = headers;
 
-                    lock (responses)
                         responses[requestID] = new aPollResponse() {bytes = 0, response = response};
 
-                    return;
-                }
+                        return;
+                    }
 
                 // If the avatar is gone, don't bother to get the texture
-                if (m_scene.GetScenePresence(Id) == null)
-                {
-                    response = new Hashtable();
+                    if (m_scene.GetScenePresence(Id) == null)
+                    {
+                        response = new Hashtable();
 
-                    response["int_response_code"] = 500;
-                    response["str_response_string"] = "Script timeout";
-                    response["content_type"] = "text/plain";
-                    response["keepalive"] = false;
-                    response["reusecontext"] = false;
+                        response["int_response_code"] = 500;
+                        response["str_response_string"] = "Script timeout";
+                        response["content_type"] = "text/plain";
+                        response["keepalive"] = false;
+                        response["reusecontext"] = false;
 
-                    lock (responses)
                         responses[requestID] = new aPollResponse() {bytes = 0, response = response};
 
-                    return;
+                        return;
+                    }
                 }
 
                 response = m_getTextureHandler.Handle(requestinfo.request);
+
                 lock (responses)
                 {
+                    lock(dropedResponses)
+                    {
+                        if(dropedResponses.Contains(requestID))
+                        {
+                            dropedResponses.Remove(requestID);
+                            m_throttler.PassTime();
+                            return;
+                        }
+                    }
                     responses[requestID] = new aPollResponse()
-                                               {
-                                                   bytes = (int) response["int_bytes"],
-                                                   response = response
-                                               };
-
-                }
+                        {
+                            bytes = (int) response["int_bytes"],
+                            response = response
+                        };
+                } 
                 m_throttler.PassTime();
             }
 
@@ -476,7 +481,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     return;
                 int add = (int)(ThrottleBytes * timeElapsed * 0.001);
                 if (add >= 1000)
-                {
+            {
                     lastTimeElapsed = currenttime;
                     BytesSent -= add;
                     if (BytesSent < 0) BytesSent = 0;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
index 8d4e561..9cfa488 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
@@ -61,7 +61,6 @@ namespace OpenSim.Region.ClientStack.Linden
             public UUID reqID;
             public Hashtable request;
             public ScenePresence presence;
-            public List<UUID> folders;
         }
 
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -250,17 +249,28 @@ namespace OpenSim.Region.ClientStack.Linden
         {
             private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-            private Dictionary<UUID, Hashtable> responses =
-                    new Dictionary<UUID, Hashtable>();
+            private Dictionary<UUID, Hashtable> responses = new Dictionary<UUID, Hashtable>();
+            private HashSet<UUID> dropedResponses = new HashSet<UUID>();
 
             private WebFetchInvDescModule m_module;
 
             public PollServiceInventoryEventArgs(WebFetchInvDescModule module, string url, UUID pId) :
-                base(null, url, null, null, null, pId, int.MaxValue)
+                base(null, url, null, null, null, null, pId, int.MaxValue)
             {
                 m_module = module;
 
                 HasEvents = (x, y) => { lock (responses) return responses.ContainsKey(x); };
+
+                Drop = (x, y) =>
+                {
+                    lock (responses)
+                    {
+                        responses.Remove(x);
+                        lock(dropedResponses)
+                            dropedResponses.Add(x);
+                    }
+                };
+
                 GetEvents = (x, y) =>
                 {
                     lock (responses)
@@ -285,8 +295,10 @@ namespace OpenSim.Region.ClientStack.Linden
                     reqinfo.reqID = x;
                     reqinfo.request = y;
                     reqinfo.presence = sp;
-                    reqinfo.folders = new List<UUID>();
 
+/* why where we doing this? just to get cof ?
+                    List<UUID> folders = new List<UUID>();
+                                        
                     // Decode the request here
                     string request = y["body"].ToString();
 
@@ -322,11 +334,11 @@ namespace OpenSim.Region.ClientStack.Linden
                         UUID folderID;
                         if (UUID.TryParse(folder, out folderID))
                         {
-                            if (!reqinfo.folders.Contains(folderID))
+                            if (!folders.Contains(folderID))
                             {
                                 if (sp.COF != UUID.Zero && sp.COF == folderID)
                                     highPriority = true;
-                                reqinfo.folders.Add(folderID);
+                                folders.Add(folderID);
                             }
                         }
                     }
@@ -334,6 +346,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     if (highPriority)
                         m_queue.PriorityEnqueue(reqinfo);
                     else
+*/
                         m_queue.Enqueue(reqinfo);
                 };
 
@@ -365,6 +378,19 @@ namespace OpenSim.Region.ClientStack.Linden
 
                 UUID requestID = requestinfo.reqID;
 
+
+                lock(responses)
+                {
+                    lock(dropedResponses)
+                    {
+                        if(dropedResponses.Contains(requestID))
+                        {
+                            dropedResponses.Remove(requestID);
+                            return;
+                        }
+                    }
+                }
+
                 Hashtable response = new Hashtable();
 
                 response["int_response_code"] = 200;
@@ -377,11 +403,21 @@ namespace OpenSim.Region.ClientStack.Linden
 
                 lock (responses)
                 {
+                    lock(dropedResponses)
+                    {
+                        if(dropedResponses.Contains(requestID))
+                        {
+                            dropedResponses.Remove(requestID);
+                            requestinfo.request.Clear();
+                            WebFetchInvDescModule.ProcessedRequestsCount++;
+                            return;
+                        }
+                    }
+
                     if (responses.ContainsKey(requestID))
                         m_log.WarnFormat("[FETCH INVENTORY DESCENDENTS2 MODULE]: Caught in the act of loosing responses! Please report this on mantis #7054");
                     responses[requestID] = response;
                 }
-                requestinfo.folders.Clear();
                 requestinfo.request.Clear();
                 WebFetchInvDescModule.ProcessedRequestsCount++;
             }