diff options
author | UbitUmarov | 2016-08-07 14:30:27 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-07 14:30:27 +0100 |
commit | 8d22b79ba49fd5a53c94f517408adb3a4fa1c100 (patch) | |
tree | 6ecf5c8aa104f55ce29d412c5139c76613d31053 /OpenSim/Framework/PriorityQueue.cs | |
parent | Merge branch 'httptests' of opensimulator.org:/var/git/opensim into httptests (diff) | |
download | opensim-SC-8d22b79ba49fd5a53c94f517408adb3a4fa1c100.zip opensim-SC-8d22b79ba49fd5a53c94f517408adb3a4fa1c100.tar.gz opensim-SC-8d22b79ba49fd5a53c94f517408adb3a4fa1c100.tar.bz2 opensim-SC-8d22b79ba49fd5a53c94f517408adb3a4fa1c100.tar.xz |
several changes related to culling option
Diffstat (limited to 'OpenSim/Framework/PriorityQueue.cs')
-rw-r--r-- | OpenSim/Framework/PriorityQueue.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/PriorityQueue.cs b/OpenSim/Framework/PriorityQueue.cs index 4f05f65..fec01da 100644 --- a/OpenSim/Framework/PriorityQueue.cs +++ b/OpenSim/Framework/PriorityQueue.cs | |||
@@ -113,7 +113,7 @@ namespace OpenSim.Framework | |||
113 | /// <summary> | 113 | /// <summary> |
114 | /// Enqueue an item into the specified priority queue | 114 | /// Enqueue an item into the specified priority queue |
115 | /// </summary> | 115 | /// </summary> |
116 | public bool Enqueue(uint pqueue, IEntityUpdate value) | 116 | public bool Enqueue(uint pqueue, EntityUpdate value) |
117 | { | 117 | { |
118 | LookupItem lookup; | 118 | LookupItem lookup; |
119 | 119 | ||
@@ -154,7 +154,7 @@ namespace OpenSim.Framework | |||
154 | /// oldest item from the next queue in order to provide fair access to | 154 | /// oldest item from the next queue in order to provide fair access to |
155 | /// all of the queues | 155 | /// all of the queues |
156 | /// </summary> | 156 | /// </summary> |
157 | public bool TryDequeue(out IEntityUpdate value, out Int32 timeinqueue) | 157 | public bool TryDequeue(out EntityUpdate value, out Int32 timeinqueue) |
158 | { | 158 | { |
159 | // If there is anything in imediate queues, return it first no | 159 | // If there is anything in imediate queues, return it first no |
160 | // matter what else. Breaks fairness. But very useful. | 160 | // matter what else. Breaks fairness. But very useful. |
@@ -212,7 +212,7 @@ namespace OpenSim.Framework | |||
212 | } | 212 | } |
213 | 213 | ||
214 | timeinqueue = 0; | 214 | timeinqueue = 0; |
215 | value = default(IEntityUpdate); | 215 | value = default(EntityUpdate); |
216 | return false; | 216 | return false; |
217 | } | 217 | } |
218 | 218 | ||
@@ -270,8 +270,8 @@ namespace OpenSim.Framework | |||
270 | #region MinHeapItem | 270 | #region MinHeapItem |
271 | private struct MinHeapItem : IComparable<MinHeapItem> | 271 | private struct MinHeapItem : IComparable<MinHeapItem> |
272 | { | 272 | { |
273 | private IEntityUpdate value; | 273 | private EntityUpdate value; |
274 | internal IEntityUpdate Value { | 274 | internal EntityUpdate Value { |
275 | get { | 275 | get { |
276 | return this.value; | 276 | return this.value; |
277 | } | 277 | } |
@@ -307,7 +307,7 @@ namespace OpenSim.Framework | |||
307 | this.pqueue = pqueue; | 307 | this.pqueue = pqueue; |
308 | } | 308 | } |
309 | 309 | ||
310 | internal MinHeapItem(uint pqueue, UInt64 entryorder, IEntityUpdate value) | 310 | internal MinHeapItem(uint pqueue, UInt64 entryorder, EntityUpdate value) |
311 | { | 311 | { |
312 | this.entrytime = Util.EnvironmentTickCount(); | 312 | this.entrytime = Util.EnvironmentTickCount(); |
313 | this.entryorder = entryorder; | 313 | this.entryorder = entryorder; |