aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-05-03 16:44:45 +0100
committerMelanie2011-05-03 16:44:45 +0100
commitaa73f99de6b305b2425746950db8bd562a63b4be (patch)
tree43ad066dadebcaf076c8cde9deae76885ac41ba8
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-aa73f99de6b305b2425746950db8bd562a63b4be.zip
opensim-SC-aa73f99de6b305b2425746950db8bd562a63b4be.tar.gz
opensim-SC-aa73f99de6b305b2425746950db8bd562a63b4be.tar.bz2
opensim-SC-aa73f99de6b305b2425746950db8bd562a63b4be.tar.xz
Revert the CM prioritizer to the core version
-rw-r--r--OpenSim/Region/Framework/Scenes/Prioritizer.cs8
1 files changed, 0 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 0f35894..4595a29 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -158,8 +158,6 @@ namespace OpenSim.Region.Framework.Scenes
158 158
159 private uint GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity) 159 private uint GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity)
160 { 160 {
161 if (entity == null) return 0;
162
163 uint pqueue = ComputeDistancePriority(client,entity,true); 161 uint pqueue = ComputeDistancePriority(client,entity,true);
164 162
165 ScenePresence presence = m_scene.GetScenePresence(client.AgentId); 163 ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
@@ -190,12 +188,6 @@ namespace OpenSim.Region.Framework.Scenes
190 188
191 private uint ComputeDistancePriority(IClientAPI client, ISceneEntity entity, bool useFrontBack) 189 private uint ComputeDistancePriority(IClientAPI client, ISceneEntity entity, bool useFrontBack)
192 { 190 {
193 // If this is an update for our own avatar give it the highest priority
194 if (client.AgentId == entity.UUID)
195 return 0;
196 if (entity == null)
197 return 0;
198
199 // Get this agent's position 191 // Get this agent's position
200 ScenePresence presence = m_scene.GetScenePresence(client.AgentId); 192 ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
201 if (presence == null) 193 if (presence == null)