diff options
| author | UbitUmarov | 2019-09-18 05:27:25 +0100 |
|---|---|---|
| committer | UbitUmarov | 2019-09-18 05:27:25 +0100 |
| commit | 24a977323b526f154fa5cb5e733b967d8fb1370f (patch) | |
| tree | 77ef351563439b71adc7996a473f7a508b66066a | |
| parent | Update the Newtonsoft JSON manipulation DLL to latest version (v12.0.3-beta1). (diff) | |
| download | opensim-SC-24a977323b526f154fa5cb5e733b967d8fb1370f.zip opensim-SC-24a977323b526f154fa5cb5e733b967d8fb1370f.tar.gz opensim-SC-24a977323b526f154fa5cb5e733b967d8fb1370f.tar.bz2 opensim-SC-24a977323b526f154fa5cb5e733b967d8fb1370f.tar.xz | |
avoid a null ref ( this should not be needed)
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9db7633..22ad3c0 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -5072,7 +5072,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 5072 | } | 5072 | } |
| 5073 | catch { } | 5073 | catch { } |
| 5074 | 5074 | ||
| 5075 | Animator.ResetAnimations(); | 5075 | // we are losing animator somewhere |
| 5076 | if (Animator == null) | ||
| 5077 | Animator = new ScenePresenceAnimator(this); | ||
| 5078 | else | ||
| 5079 | Animator.ResetAnimations(); | ||
| 5076 | 5080 | ||
| 5077 | Overrides.CopyAOPairsFrom(cAgent.MovementAnimationOverRides); | 5081 | Overrides.CopyAOPairsFrom(cAgent.MovementAnimationOverRides); |
| 5078 | int nanim = ControllingClient.NextAnimationSequenceNumber; | 5082 | int nanim = ControllingClient.NextAnimationSequenceNumber; |