diff options
author | Teravus Ovares (Dan Olivares) | 2009-12-05 13:01:21 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-12-05 13:01:21 -0500 |
commit | c4b6010fb34268c9426f7241a38ba892b93780d1 (patch) | |
tree | 52a5db76018dd820451121d66f8257cf154e1315 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | Allow terrain heightmaps to be loaded directly from URIs via the remote admin... (diff) | |
download | opensim-SC_OLD-c4b6010fb34268c9426f7241a38ba892b93780d1.zip opensim-SC_OLD-c4b6010fb34268c9426f7241a38ba892b93780d1.tar.gz opensim-SC_OLD-c4b6010fb34268c9426f7241a38ba892b93780d1.tar.bz2 opensim-SC_OLD-c4b6010fb34268c9426f7241a38ba892b93780d1.tar.xz |
* Fixes mantis 4416. Animator is dereferenced on logout
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index b2cd249..a3ceecb 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2932,14 +2932,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
2932 | //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) | 2932 | //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) |
2933 | // The Physics Scene will send updates every 500 ms grep: m_physicsActor.SubscribeEvents( | 2933 | // The Physics Scene will send updates every 500 ms grep: m_physicsActor.SubscribeEvents( |
2934 | // as of this comment the interval is set in AddToPhysicalScene | 2934 | // as of this comment the interval is set in AddToPhysicalScene |
2935 | Animator.UpdateMovementAnimations(); | 2935 | if (Animator!=null) |
2936 | Animator.UpdateMovementAnimations(); | ||
2936 | 2937 | ||
2937 | CollisionEventUpdate collisionData = (CollisionEventUpdate)e; | 2938 | CollisionEventUpdate collisionData = (CollisionEventUpdate)e; |
2938 | Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList; | 2939 | Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList; |
2939 | 2940 | ||
2940 | CollisionPlane = Vector4.UnitW; | 2941 | CollisionPlane = Vector4.UnitW; |
2941 | 2942 | ||
2942 | if (coldata.Count != 0) | 2943 | if (coldata.Count != 0 && Animator != null) |
2943 | { | 2944 | { |
2944 | switch (Animator.CurrentMovementAnimation) | 2945 | switch (Animator.CurrentMovementAnimation) |
2945 | { | 2946 | { |