Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork

Conflicts: OpenSim/Framework/PriorityQueue.cs
2012-03-22 00:19:28 +00:00 · 2012-03-22 00:19:28 +00:00 · b383690b96
parent dc90c53596 8652f277df
commit b383690b96
1 changed files with 1 additions and 1 deletions
--- a/OpenSim/Framework/PriorityQueue.cs
+++ b/OpenSim/Framework/PriorityQueue.cs
@ -151,7 +151,7 @@ namespace OpenSim.Framework
                    return true;
                }
            }
-
+            
            // To get the fair queing, we cycle through each of the
            // queues when finding an element to dequeue. 
            // We pull (NumberOfQueues - QueueIndex) items from each queue in order