diff options
author | Melanie | 2011-04-21 16:51:39 +0100 |
---|---|---|
committer | Melanie | 2011-04-21 16:51:39 +0100 |
commit | 204b8b7b7e5d879a25b576fb6bca2a189b457ed0 (patch) | |
tree | e2a6ab15ec17957dd16320c07e530d1d527410be /OpenSim/Region/Framework/Scenes | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | bug fix. Now when an unacked update packet is handled through ResendPrimUpdat... (diff) | |
download | opensim-SC-204b8b7b7e5d879a25b576fb6bca2a189b457ed0.zip opensim-SC-204b8b7b7e5d879a25b576fb6bca2a189b457ed0.tar.gz opensim-SC-204b8b7b7e5d879a25b576fb6bca2a189b457ed0.tar.bz2 opensim-SC-204b8b7b7e5d879a25b576fb6bca2a189b457ed0.tar.xz |
Merge branch 'queuetest' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Prioritizer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs index e4b0323..17b2da1 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 | ||
@@ -180,7 +180,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
180 | 180 | ||
181 | // m_log.WarnFormat("[PRIORITIZER] attempt to use agent {0} not in the scene",client.AgentId); | 181 | // m_log.WarnFormat("[PRIORITIZER] attempt to use agent {0} not in the scene",client.AgentId); |
182 | // throw new InvalidOperationException("Prioritization agent not defined"); | 182 | // throw new InvalidOperationException("Prioritization agent not defined"); |
183 | return Int32.MaxValue; | 183 | return PriorityQueue.NumberOfQueues - 1; |
184 | } | 184 | } |
185 | 185 | ||
186 | // Use group position for child prims, since we are putting child prims in | 186 | // Use group position for child prims, since we are putting child prims in |