Merge branch 'master' of /home/opensim/var/repo/opensim

1 files changed, 10 insertions, 5 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b93b67d..7156137 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1293,11 +1293,11 @@ namespace OpenSim.Region.Framework.Scenes
 //                "[SCENE PRESENCE]: In {0} received agent update from {1}",
 //                Scene.RegionInfo.RegionName, remoteClient.Name);
 
-            //if (IsChildAgent)
-            //{
+            if (IsChildAgent)
+            {
             //    // m_log.Debug("DEBUG: HandleAgentUpdate: child agent");
-            //    return;
-            //}
+                return;
+            }
 
             ++m_movementUpdateCount;
             if (m_movementUpdateCount < 1)
@@ -3195,7 +3195,9 @@ namespace OpenSim.Region.Framework.Scenes
             }
             catch { }
 
-            Animator.Animations.FromArray(cAgent.Anims);
+            // FIXME: Why is this null check necessary?  Where are the cases where we get a null Anims object?
+            if (cAgent.Anims != null)
+                Animator.Animations.FromArray(cAgent.Anims);
 
             if (cAgent.AttachmentObjects != null && cAgent.AttachmentObjects.Count > 0)
             {
@@ -3280,6 +3282,9 @@ namespace OpenSim.Region.Framework.Scenes
         // Event called by the physics plugin to tell the avatar about a collision.
         private void PhysicsCollisionUpdate(EventArgs e)
         {
+            if (IsChildAgent)
+                return;
+            
             //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
             // The Physics Scene will send updates every 500 ms grep: PhysicsActor.SubscribeEvents(
             // as of this comment the interval is set in AddToPhysicalScene