3 files changed, 39 insertions, 31 deletions

diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
index 73f2770..89d9e80 100644
--- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
+++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
@@ -77,10 +77,7 @@ namespace OpenSim.Capabilities.Handlers
             }
 
             ArrayList foldersrequested = (ArrayList)hash["folders"];
-
-            StringBuilder tmpresponse = new StringBuilder(1024);
-            StringBuilder tmpbadfolders = new StringBuilder(1024);
-
+ 
             List<LLSDFetchInventoryDescendents> folders = new List<LLSDFetchInventoryDescendents>();
             for (int i = 0; i < foldersrequested.Count; i++)
             {
@@ -101,6 +98,8 @@ namespace OpenSim.Capabilities.Handlers
                 folders.Add(llsdRequest);
             }
 
+            StringBuilder lastresponse = new StringBuilder(1024);
+            lastresponse.Append("<llsd>");
             if (folders.Count > 0)
             {
                 List<UUID> bad_folders = new List<UUID>();
@@ -115,43 +114,39 @@ namespace OpenSim.Capabilities.Handlers
 #pragma warning restore 0612
                 }
 
-                string inventoryitemstr = string.Empty;
-                foreach (InventoryCollectionWithDescendents icoll in invcollSet)
+                if(invcollSet.Count > 0)
                 {
-                    LLSDInventoryFolderContents thiscontents = contentsToLLSD(icoll.Collection, icoll.Descendents);
-                    inventoryitemstr = LLSDHelpers.SerialiseLLSDReply(thiscontents);
-                    tmpresponse.Append(inventoryitemstr.Substring(6,inventoryitemstr.Length - 13));
+                    lastresponse.Append("<map><key>folders</key><array>");
+                    foreach (InventoryCollectionWithDescendents icoll in invcollSet)
+                    {
+                        LLSDInventoryFolderContents thiscontents = contentsToLLSD(icoll.Collection, icoll.Descendents);
+                        lastresponse.Append(LLSDHelpers.SerialiseLLSDReplyNoHeader(thiscontents));
+                    }
+                    lastresponse.Append("</array></map>");
                 }
+                else
+                    lastresponse.Append("<map><key>folders</key><array /></map>");
 
                 //m_log.DebugFormat("[WEB FETCH INV DESC HANDLER]: Bad folders {0}", string.Join(", ", bad_folders));
-                foreach (UUID bad in bad_folders)
+                if(bad_folders.Count > 0)
                 {
-                    tmpbadfolders.Append("<map><key>folder_id</key><uuid>");
-                    tmpbadfolders.Append(bad.ToString());
-                    tmpbadfolders.Append("</uuid><key>error</key><string>Unknown</string></map>");
+                    lastresponse.Append("<map><key>bad_folders</key><array>");
+                    foreach (UUID bad in bad_folders)
+                    {
+                        lastresponse.Append("<map><key>folder_id</key><uuid>");
+                        lastresponse.Append(bad.ToString());
+                        lastresponse.Append("</uuid><key>error</key><string>Unknown</string></map>");
+                    }
+                    lastresponse.Append("</array></map>");
                 }
-            }
-
-            StringBuilder lastresponse = new StringBuilder(1024);
-            lastresponse.Append("<llsd>");
-            if(tmpresponse.Length > 0)
-            {
-                lastresponse.Append("<map><key>folders</key><array>");
-                lastresponse.Append(tmpresponse.ToString());
-                lastresponse.Append("</array></map>");
+                lastresponse.Append("</llsd>");
             }
             else
-                lastresponse.Append("<map><key>folders</key><array /></map>");
-
-            if(tmpbadfolders.Length > 0)
             {
-                lastresponse.Append("<map><key>bad_folders</key><array>");
-                lastresponse.Append(tmpbadfolders.ToString());
-                lastresponse.Append("</array></map>");
+                lastresponse.Append("<map><key>folders</key><array /></map></llsd>");
             }
-            lastresponse.Append("</llsd>");
 
-            return lastresponse.ToString();
+            return lastresponse.ToString();;
         }
 
         /// <summary>
diff --git a/OpenSim/Capabilities/LLSDHelpers.cs b/OpenSim/Capabilities/LLSDHelpers.cs
index e331cfb..4a7c6a5 100644
--- a/OpenSim/Capabilities/LLSDHelpers.cs
+++ b/OpenSim/Capabilities/LLSDHelpers.cs
@@ -54,6 +54,19 @@ namespace OpenSim.Framework.Capabilities
             return sw.ToString();
         }
 
+        public static string SerialiseLLSDReplyNoHeader(object obj)
+        {
+            StringWriter sw = new StringWriter();
+            XmlTextWriter writer = new XmlTextWriter(sw);
+            writer.Formatting = Formatting.None;
+            SerializeOSDType(writer, obj);
+            writer.Close();
+
+            //m_log.DebugFormat("[LLSD Helpers]: Generated serialized LLSD reply {0}", sw.ToString());
+
+            return sw.ToString();
+        }
+
         private static void SerializeOSDType(XmlTextWriter writer, object obj)
         {
             Type myType = obj.GetType();
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs
index 4a831e8..6c388b3 100644
--- a/OpenSim/Framework/Monitoring/JobEngine.cs
+++ b/OpenSim/Framework/Monitoring/JobEngine.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Monitoring
         /// </remarks>
         private bool m_warnOverMaxQueue = true;
 
-        private BlockingCollection<Job> m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
+        private BlockingCollection<Job> m_jobQueue = new BlockingCollection<Job>(5000);
 
         private CancellationTokenSource m_cancelSource;