aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/PriorityQueue.cs
diff options
context:
space:
mode:
authorMic Bowman2011-04-12 15:40:57 -0700
committerMic Bowman2011-04-12 15:40:57 -0700
commit80ba3de90240d190bad1bd15ff89dfdb390c5e24 (patch)
treeeeabff0c3e50fdf7e8137b9370d8710062bdbb7b /OpenSim/Region/ClientStack/LindenUDP/PriorityQueue.cs
parentfixed a couple bugs with the property queues (diff)
downloadopensim-SC-80ba3de90240d190bad1bd15ff89dfdb390c5e24.zip
opensim-SC-80ba3de90240d190bad1bd15ff89dfdb390c5e24.tar.gz
opensim-SC-80ba3de90240d190bad1bd15ff89dfdb390c5e24.tar.bz2
opensim-SC-80ba3de90240d190bad1bd15ff89dfdb390c5e24.tar.xz
Fixed the update of items in the priority queue to enable both
types of property updates to be specified. Not sure if one form of property update should supercede another. But for now the old OpenSim behavior is preserved by sending both.
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/PriorityQueue.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/PriorityQueue.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/PriorityQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/PriorityQueue.cs
index 6521a00..b62ec07 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/PriorityQueue.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/PriorityQueue.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
87 if (m_lookupTable.TryGetValue(localid, out lookup)) 87 if (m_lookupTable.TryGetValue(localid, out lookup))
88 { 88 {
89 entry = lookup.Heap[lookup.Handle].EntryOrder; 89 entry = lookup.Heap[lookup.Handle].EntryOrder;
90 value.Flags |= lookup.Heap[lookup.Handle].Value.Flags; 90 value.Update(lookup.Heap[lookup.Handle].Value);
91 lookup.Heap.Remove(lookup.Handle); 91 lookup.Heap.Remove(lookup.Handle);
92 } 92 }
93 93