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

Conflicts:
	OpenSim/Framework/PriorityQueue.cs
avinationmerge
UbitUmarov 2012-03-22 00:19:28 +00:00
commit b383690b96
1 changed files with 1 additions and 1 deletions

View File

@ -151,7 +151,7 @@ namespace OpenSim.Framework
return true; return true;
} }
} }
// To get the fair queing, we cycle through each of the // To get the fair queing, we cycle through each of the
// queues when finding an element to dequeue. // queues when finding an element to dequeue.
// We pull (NumberOfQueues - QueueIndex) items from each queue in order // We pull (NumberOfQueues - QueueIndex) items from each queue in order