From 797ca8d0e787b20fdd0794f2017268f6e5b175e6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 11 Dec 2010 17:06:17 -0800
Subject: Fixes the nudge movements!

---
 OpenSim/Region/Framework/Scenes/Prioritizer.cs | 28 +++++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Prioritizer.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 19f8180..f9599f5 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -218,20 +218,28 @@ namespace OpenSim.Region.Framework.Scenes
 
         private double GetPriorityByBestAvatarResponsiveness(IClientAPI client, ISceneEntity entity)
         {
-            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;
+            // 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;
 
-                // Use group position for child prims
-                Vector3 entityPos = entity.AbsolutePosition;
-                if (entity is SceneObjectPart)
-                    entityPos = m_scene.GetGroupByPrim(entity.LocalId).AbsolutePosition;
+            // Use group position for child prims
+            Vector3 entityPos = entity.AbsolutePosition;
+            if (entity is SceneObjectPart)
+            {
+                SceneObjectGroup group = (entity as SceneObjectPart).ParentGroup;
+                if (group != null)
+                    entityPos = group.AbsolutePosition;
                 else
                     entityPos = entity.AbsolutePosition;
+            }
+            else
+                entityPos = entity.AbsolutePosition;
 
+            ScenePresence presence = m_scene.GetScenePresence(client.AgentId);
+            if (presence != null)
+            {
                 if (!presence.IsChildAgent)
                 {
                     if (entity is ScenePresence)
-- 
cgit v1.1