Apply the useful part of diva's patch that was skipped

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
 
         private double GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity)
         {
+            // If this is an update for our own avatar give it the highest priority
+            if (client.AgentId == entity.UUID)
+                return 0.0;
+            if (entity == null)
+                return double.NaN;
+
             ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
             if (presence != null)
             {
-                // If this is an update for our own avatar give it the highest priority
-                if (presence == entity)
-                    return 0.0;
-
                 // Use group position for child prims
                 Vector3 entityPos;
                 if (entity is SceneObjectPart)