From 24a977323b526f154fa5cb5e733b967d8fb1370f Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Wed, 18 Sep 2019 05:27:25 +0100
Subject: [PATCH] avoid a null ref ( this should not be needed)

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 9db7633172..22ad3c0712 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -5072,7 +5072,11 @@ namespace OpenSim.Region.Framework.Scenes
             }
             catch { }
 
-            Animator.ResetAnimations();
+            // we are losing animator somewhere
+            if (Animator == null)
+                Animator = new ScenePresenceAnimator(this);
+            else
+                Animator.ResetAnimations();
 
             Overrides.CopyAOPairsFrom(cAgent.MovementAnimationOverRides);
             int nanim = ControllingClient.NextAnimationSequenceNumber;