diff options
-rw-r--r-- | OpenSim/Framework/TerrainData.cs | 1 | ||||
-rw-r--r-- | OpenSim/Framework/Util.cs | 28 |
2 files changed, 0 insertions, 29 deletions
diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs index 5604628..1a2d5d1 100644 --- a/OpenSim/Framework/TerrainData.cs +++ b/OpenSim/Framework/TerrainData.cs | |||
@@ -212,7 +212,6 @@ namespace OpenSim.Framework | |||
212 | return heights; | 212 | return heights; |
213 | } | 213 | } |
214 | 214 | ||
215 | // TerrainData.GetDoubles | ||
216 | public double[,] GetDoubles() | 215 | public double[,] GetDoubles() |
217 | { | 216 | { |
218 | double[,] ret = new double[SizeX, SizeY]; | 217 | double[,] ret = new double[SizeX, SizeY]; |
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 52f9aea..f66a987 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -2437,34 +2437,6 @@ namespace OpenSim.Framework | |||
2437 | 2437 | ||
2438 | #region FireAndForget Threading Pattern | 2438 | #region FireAndForget Threading Pattern |
2439 | 2439 | ||
2440 | /// <summary> | ||
2441 | /// Created to work around a limitation in Mono with nested delegates | ||
2442 | /// </summary> | ||
2443 | private sealed class FireAndForgetWrapper | ||
2444 | { | ||
2445 | private static object syncRoot = new Object(); | ||
2446 | |||
2447 | public void FireAndForget(System.Threading.WaitCallback callback) | ||
2448 | { | ||
2449 | callback.BeginInvoke(null, EndFireAndForget, callback); | ||
2450 | } | ||
2451 | |||
2452 | public void FireAndForget(System.Threading.WaitCallback callback, object obj) | ||
2453 | { | ||
2454 | callback.BeginInvoke(obj, EndFireAndForget, callback); | ||
2455 | } | ||
2456 | |||
2457 | private static void EndFireAndForget(IAsyncResult ar) | ||
2458 | { | ||
2459 | System.Threading.WaitCallback callback = (System.Threading.WaitCallback)ar.AsyncState; | ||
2460 | |||
2461 | try { callback.EndInvoke(ar); } | ||
2462 | catch (Exception ex) { m_log.Error("[UTIL]: Asynchronous method threw an exception: " + ex.Message, ex); } | ||
2463 | |||
2464 | ar.AsyncWaitHandle.Close(); | ||
2465 | } | ||
2466 | } | ||
2467 | |||
2468 | public static void InitThreadPool(int minThreads, int maxThreads) | 2440 | public static void InitThreadPool(int minThreads, int maxThreads) |
2469 | { | 2441 | { |
2470 | if (maxThreads < 2) | 2442 | if (maxThreads < 2) |