Added an overload to AssetManager.RequestAsset() that takes a transactionID

git-svn-id: http://libopenmetaverse.googlecode.com/svn/libopenmetaverse/trunk@3044 52acb1d6-8a22-11de-b505-999d5b087335
2009-07-31 23:23:14 +00:00
parent 6bb96a6e28
commit 79684bd8eb
2 changed files with 16 additions and 4 deletions
--- a/OpenMetaverseTypes/Parallel.cs
+++ b/OpenMetaverseTypes/Parallel.cs
@@ -116,7 +116,6 @@ namespace OpenMetaverse
            int counter = threadCount;
            AutoResetEvent threadFinishEvent = new AutoResetEvent(false);
            IEnumerator<T> enumerator = enumerable.GetEnumerator();
-            object syncRoot = new Object();
            Exception exception = null;

            for (int i = 0; i < threadCount; i++)
@@ -130,7 +129,7 @@ namespace OpenMetaverse
                        {
                            T entry;

-                            lock (syncRoot)
+                            lock (enumerator)
                            {
                                if (!enumerator.MoveNext())
                                    break;