diff options
| author | UbitUmarov | 2012-03-22 00:19:28 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-03-22 00:19:28 +0000 |
| commit | b383690b96e7d80e577f04c63d4b8fffb9bf596d (patch) | |
| tree | 283f22de851a3eee3943e417a05ac86f3c396e5d | |
| parent | reverted priorityQueue changes (diff) | |
| parent | Revert "Stop messing order of updates, destroing the defined order of the sel... (diff) | |
| download | opensim-SC-b383690b96e7d80e577f04c63d4b8fffb9bf596d.zip opensim-SC-b383690b96e7d80e577f04c63d4b8fffb9bf596d.tar.gz opensim-SC-b383690b96e7d80e577f04c63d4b8fffb9bf596d.tar.bz2 opensim-SC-b383690b96e7d80e577f04c63d4b8fffb9bf596d.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
OpenSim/Framework/PriorityQueue.cs
| -rw-r--r-- | OpenSim/Framework/PriorityQueue.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/PriorityQueue.cs b/OpenSim/Framework/PriorityQueue.cs index 7fa1981..e7a7f7f 100644 --- a/OpenSim/Framework/PriorityQueue.cs +++ b/OpenSim/Framework/PriorityQueue.cs | |||
| @@ -151,7 +151,7 @@ namespace OpenSim.Framework | |||
| 151 | return true; | 151 | return true; |
| 152 | } | 152 | } |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | // To get the fair queing, we cycle through each of the | 155 | // To get the fair queing, we cycle through each of the |
| 156 | // queues when finding an element to dequeue. | 156 | // queues when finding an element to dequeue. |
| 157 | // We pull (NumberOfQueues - QueueIndex) items from each queue in order | 157 | // We pull (NumberOfQueues - QueueIndex) items from each queue in order |