7 files changed, 34 insertions, 6 deletions

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index bbb0ae2..58344f3 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -1169,5 +1169,27 @@ namespace OpenSim.Framework
 
             return found.ToArray();
         }
+
+        #region FireAndForget Threading Pattern
+
+        public static void FireAndForget(System.Threading.WaitCallback callback)
+        {
+            callback.BeginInvoke(null, EndFireAndForget, callback);
+        }
+
+        public static void FireAndForget(System.Threading.WaitCallback callback, object obj)
+        {
+            callback.BeginInvoke(obj, EndFireAndForget, callback);
+        }
+
+        private static void EndFireAndForget(IAsyncResult ar)
+        {
+            System.Threading.WaitCallback callback = (System.Threading.WaitCallback)ar.AsyncState;
+
+            callback.EndInvoke(ar);
+            ar.AsyncWaitHandle.Close();
+        }
+
+        #endregion FireAndForget Threading Pattern
     }
 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 621e9d2..7b4e374 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -272,7 +272,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (asset != null)
             {
-                handler.BeginInvoke(id, sender, asset, null, null);
+                Util.FireAndForget(delegate { handler(id, sender, asset); });
                 return true;
             }
 
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index b13a116..fd3aaf4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -211,7 +211,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (asset != null)
             {
-                handler.BeginInvoke(id, sender, asset, null, null);
+                Util.FireAndForget(delegate { handler(id, sender, asset); });
                 return true;
             }
 
@@ -219,8 +219,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
             {
                 if ((a != null) && (m_Cache != null))
                     m_Cache.Cache(a);
-                
-                handler.BeginInvoke(assetID, s, a, null, null);
+
+                Util.FireAndForget(delegate { handler(assetID, s, a); });
             });
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index 55b100b..fddba86 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -457,6 +457,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         void SendInventoryComplete(IAsyncResult iar)
         {
+            SendInventoryDelegate d = (SendInventoryDelegate)iar.AsyncState;
+            d.EndInvoke(iar);
         }
 
         /// <summary>
@@ -622,6 +624,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         private void PurgeFolderCompleted(IAsyncResult iar)
         {
+            PurgeFolderDelegate d = (PurgeFolderDelegate)iar.AsyncState;
+            d.EndInvoke(iar);
         }
     }
 }
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index d9748d4..ffc8e4c 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -177,7 +177,7 @@ namespace OpenSim.Services.Connectors
             }
             else
             {
-                handler.BeginInvoke(id, sender, asset, null, null);
+                Util.FireAndForget(delegate { handler(id, sender, asset); });
             }
 
             return true;
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index a2261ba..cef678d 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -461,6 +461,8 @@ namespace OpenSim.Services.Connectors
 
         private void MoveItemsCompleted(IAsyncResult iar)
         {
+            MoveItemsDelegate d = (MoveItemsDelegate)iar.AsyncState;
+            d.EndInvoke(iar);
         }
 
         public bool MoveItems(string userID, List<InventoryItemBase> items, UUID sessionID)
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index f04754b..b98e256 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -232,7 +232,7 @@ namespace OpenSim.Services.InventoryService
                 m_log.WarnFormat("[INVENTORY SERVICE]: User {0} inventory not available", userID);
             }
 
-            callback.BeginInvoke(folders, items, null, null);
+            Util.FireAndForget(delegate { callback(folders, items); });
         }
 
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)