aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e55acfe..cd28434 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3060,7 +3060,9 @@ namespace OpenSim.Region.Framework.Scenes
3060 3060
3061 // The Physics Scene will send updates every 500 ms grep: m_physicsActor.SubscribeEvents( 3061 // The Physics Scene will send updates every 500 ms grep: m_physicsActor.SubscribeEvents(
3062 // as of this comment the interval is set in AddToPhysicalScene 3062 // as of this comment the interval is set in AddToPhysicalScene
3063 3063 if (Animator!=null)
3064 Animator.UpdateMovementAnimations();
3065
3064 CollisionEventUpdate collisionData = (CollisionEventUpdate)e; 3066 CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
3065 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList; 3067 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
3066 3068
@@ -3072,7 +3074,7 @@ namespace OpenSim.Region.Framework.Scenes
3072 m_lastColCount = coldata.Count; 3074 m_lastColCount = coldata.Count;
3073 } 3075 }
3074 3076
3075 if (coldata.Count != 0) 3077 if (coldata.Count != 0 && Animator != null)
3076 { 3078 {
3077 switch (Animator.CurrentMovementAnimation) 3079 switch (Animator.CurrentMovementAnimation)
3078 { 3080 {