1 files changed, 25 insertions, 7 deletions

diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 8b702e0..2c1d946 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -66,6 +66,12 @@ namespace OpenSim.Services.Connectors
 
         private Thread[] m_fetchThreads;
 
+        public int MaxAssetRequestConcurrency
+        {
+            get { return m_maxAssetRequestConcurrency; }
+            set { m_maxAssetRequestConcurrency = value; }
+        }
+
         public AssetServicesConnector()
         {
         }
@@ -278,9 +284,11 @@ namespace OpenSim.Services.Connectors
                 byte[] ret = new byte[s.Length];
                 s.Read(ret, 0, (int)s.Length);
 
+                s.Close();
                 return ret;
             }
 
+            s.Close();
             return null;
         }
 
@@ -319,15 +327,25 @@ namespace OpenSim.Services.Connectors
                             handlers = m_AssetHandlers[id];
                             m_AssetHandlers.Remove(id);
                         }
-                        foreach (AssetRetrievedEx h in handlers)
-                        {
-                            Util.FireAndForget(x =>
+
+                        Util.FireAndForget(x =>
                             {
-                                h.Invoke(a);
+                                foreach (AssetRetrievedEx h in handlers)
+                                {
+                                    // Util.FireAndForget(x =>
+                                    // {
+                                    try { h.Invoke(a); }
+                                    catch { }
+                                    // });
+                                }
+
+                                if (handlers != null)
+                                    handlers.Clear();
+
                             });
-                        }
-                        if (handlers != null)
-                            handlers.Clear();
+
+//                        if (handlers != null)
+//                            handlers.Clear();
                     
                         success = true;
                     }