From 1e7ce6dbced67350214f921566f39a3d1413e9bb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 19 Jun 2010 09:44:02 -0700
Subject: Hunting for the problem in #4777

---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 38b2dc2..59fd805 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1487,6 +1487,10 @@ namespace OpenSim.Region.Framework.Scenes
                         DoPhysicsPropertyUpdate(RigidBody, true);
                         PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0);
                     }
+                    else
+                    {
+                        m_log.DebugFormat("[SPEW]: physics actor is null for {0} with parent {1}", UUID, this.ParentGroup.UUID);
+                    }
                 }
             }
         }
-- 
cgit v1.1


From 13a0b65a804349e41b8e692727068ac6580c0d35 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sun, 20 Jun 2010 21:38:06 +0200
Subject: Modify avatar responsiveness policy to send roots before children

---
 OpenSim/Region/Framework/Scenes/Prioritizer.cs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index 7b7677b..b95b5f2 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -208,12 +208,19 @@ namespace OpenSim.Region.Framework.Scenes
 
                     if (entity is SceneObjectPart)
                     {
-                        PhysicsActor physActor = ((SceneObjectPart)entity).ParentGroup.RootPart.PhysActor;
-                        if (physActor == null || !physActor.IsPhysical)
-                            priority += 100;
-
                         if (((SceneObjectPart)entity).ParentGroup.RootPart.IsAttachment)
+                        {
                             priority = 1.0;
+                        }
+                        else
+                        {
+                            PhysicsActor physActor = ((SceneObjectPart)entity).ParentGroup.RootPart.PhysActor;
+                            if (physActor == null || !physActor.IsPhysical)
+                                priority += 100;
+                        }
+
+                        if (((SceneObjectPart)entity).ParentGroup.RootPart != (SceneObjectPart)entity)
+                            priority +=1;
                     }
                     return priority;
                 }
-- 
cgit v1.1