1 files changed, 8 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index e3ed905..e4b0323 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -134,6 +134,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         private uint GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity)
         {
+            if (entity == null) return 0;
+
             uint pqueue = ComputeDistancePriority(client,entity,true);
 
             ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
@@ -162,6 +164,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         private uint ComputeDistancePriority(IClientAPI client, ISceneEntity entity, bool useFrontBack)
         {
+            // If this is an update for our own avatar give it the highest priority
+            if (client.AgentId == entity.UUID)
+                return 0;
+            if (entity == null)
+                return 0;
+
             // Get this agent's position
             ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
             if (presence == null)