diff options
author | Melanie | 2010-12-12 08:57:26 +0000 |
---|---|---|
committer | Melanie | 2010-12-12 08:57:26 +0000 |
commit | 663a626a6f1b7b7960f086ac4b3401ae9a100c11 (patch) | |
tree | 929bb424eb606103e66d3993a57758739e8303ab /OpenSim/Region/Framework/Scenes/Prioritizer.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC_OLD-663a626a6f1b7b7960f086ac4b3401ae9a100c11.zip opensim-SC_OLD-663a626a6f1b7b7960f086ac4b3401ae9a100c11.tar.gz opensim-SC_OLD-663a626a6f1b7b7960f086ac4b3401ae9a100c11.tar.bz2 opensim-SC_OLD-663a626a6f1b7b7960f086ac4b3401ae9a100c11.tar.xz |
Apply the useful part of diva's patch that was skipped
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Prioritizer.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs index c75f8ba..cde8d3f 100644 --- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs +++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs | |||
@@ -219,13 +219,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
219 | 219 | ||
220 | private double GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity) | 220 | private double GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity) |
221 | { | 221 | { |
222 | // If this is an update for our own avatar give it the highest priority | ||
223 | if (client.AgentId == entity.UUID) | ||
224 | return 0.0; | ||
225 | if (entity == null) | ||
226 | return double.NaN; | ||
227 | |||
222 | ScenePresence presence = m_scene.GetScenePresence(client.AgentId); | 228 | ScenePresence presence = m_scene.GetScenePresence(client.AgentId); |
223 | if (presence != null) | 229 | if (presence != null) |
224 | { | 230 | { |
225 | // If this is an update for our own avatar give it the highest priority | ||
226 | if (presence == entity) | ||
227 | return 0.0; | ||
228 | |||
229 | // Use group position for child prims | 231 | // Use group position for child prims |
230 | Vector3 entityPos; | 232 | Vector3 entityPos; |
231 | if (entity is SceneObjectPart) | 233 | if (entity is SceneObjectPart) |