Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts: OpenSim/Framework/PriorityQueue.csavinationmerge
commit
b383690b96
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue