1 files changed, 25 insertions, 4 deletions

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 38729c6..d5ae3b7 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -44,6 +44,7 @@ using System.Xml;
 using log4net;
 using Nini.Config;
 using Nwc.XmlRpc;
+using BclExtras;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 
@@ -1269,17 +1270,37 @@ namespace OpenSim.Framework
 
         #region FireAndForget Threading Pattern
 
+        /// <summary>
+        /// Created to work around a limitation in Mono with nested delegates
+        /// </summary>
+        /*private class FireAndForgetWrapper
+        {
+            public void FireAndForget(System.Threading.WaitCallback callback)
+            {
+                callback.BeginInvoke(null, EndFireAndForget, callback);
+            }
+
+            public void FireAndForget(System.Threading.WaitCallback callback, object obj)
+            {
+                callback.BeginInvoke(obj, EndFireAndForget, callback);
+            }
+        }*/
+
         public static void FireAndForget(System.Threading.WaitCallback callback)
         {
-            callback.BeginInvoke(null, EndFireAndForget, callback);
+            //FireAndForgetWrapper wrapper = Singleton.GetInstance<FireAndForgetWrapper>();
+            //wrapper.FireAndForget(callback);
+            System.Threading.ThreadPool.UnsafeQueueUserWorkItem(callback, null);
         }
 
         public static void FireAndForget(System.Threading.WaitCallback callback, object obj)
         {
-            callback.BeginInvoke(obj, EndFireAndForget, callback);
+            //FireAndForgetWrapper wrapper = Singleton.GetInstance<FireAndForgetWrapper>();
+            //wrapper.FireAndForget(callback, obj);
+            System.Threading.ThreadPool.UnsafeQueueUserWorkItem(callback, obj);
         }
 
-        private static void EndFireAndForget(IAsyncResult ar)
+        /*private static void EndFireAndForget(IAsyncResult ar)
         {
             System.Threading.WaitCallback callback = (System.Threading.WaitCallback)ar.AsyncState;
 
@@ -1287,7 +1308,7 @@ namespace OpenSim.Framework
             catch (Exception ex) { m_log.Error("[UTIL]: Asynchronous method threw an exception: " + ex.Message, ex); }
 
             ar.AsyncWaitHandle.Close();
-        }
+        }*/
 
         #endregion FireAndForget Threading Pattern
     }