aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMic Bowman2011-04-20 21:58:49 -0700
committerMic Bowman2011-04-20 21:58:49 -0700
commit7759bda833c03f4c29500dce32b835a7aef8285b (patch)
tree603e524f040dca865e3b67e50a78b4279c12e019 /OpenSim/Region/Framework/Scenes
parentMerge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queu... (diff)
downloadopensim-SC_OLD-7759bda833c03f4c29500dce32b835a7aef8285b.zip
opensim-SC_OLD-7759bda833c03f4c29500dce32b835a7aef8285b.tar.gz
opensim-SC_OLD-7759bda833c03f4c29500dce32b835a7aef8285b.tar.bz2
opensim-SC_OLD-7759bda833c03f4c29500dce32b835a7aef8285b.tar.xz
Added an "immediate" queue to the priority queue. This is
per Melanie's very good suggestion. The immediate queue is serviced completely before all others, making it a very good place to put avatar updates & attachments. Moved the priority queue out of the LLUDP directory and into the framework. It is now a fairly general utility.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Prioritizer.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index e3ed905..2e80156 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Framework.Scenes
88 88
89 // If this is an update for our own avatar give it the highest priority 89 // If this is an update for our own avatar give it the highest priority
90 if (client.AgentId == entity.UUID) 90 if (client.AgentId == entity.UUID)
91 return 0; 91 return PriorityQueue.ImmediateQueue;
92 92
93 uint priority; 93 uint priority;
94 94
@@ -172,7 +172,7 @@ namespace OpenSim.Region.Framework.Scenes
172 172
173 // m_log.WarnFormat("[PRIORITIZER] attempt to use agent {0} not in the scene",client.AgentId); 173 // m_log.WarnFormat("[PRIORITIZER] attempt to use agent {0} not in the scene",client.AgentId);
174 // throw new InvalidOperationException("Prioritization agent not defined"); 174 // throw new InvalidOperationException("Prioritization agent not defined");
175 return Int32.MaxValue; 175 return PriorityQueue.NumberOfQueues - 1;
176 } 176 }
177 177
178 // Use group position for child prims, since we are putting child prims in 178 // Use group position for child prims, since we are putting child prims in