diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 285d1ae..f9c7935 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3276,7 +3276,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3276 | cAgent.Anims = Animator.Animations.ToArray(); | 3276 | cAgent.Anims = Animator.Animations.ToArray(); |
3277 | } | 3277 | } |
3278 | catch { } | 3278 | catch { } |
3279 | cAgent.DefaultAnim = Animator.Animations.ImplicitDefaultAnimation; | 3279 | cAgent.DefaultAnim = Animator.Animations.DefaultAnimation; |
3280 | cAgent.AnimState = Animator.Animations.ImplicitDefaultAnimation; | ||
3280 | 3281 | ||
3281 | if (Scene.AttachmentsModule != null) | 3282 | if (Scene.AttachmentsModule != null) |
3282 | Scene.AttachmentsModule.CopyAttachments(this, cAgent); | 3283 | Scene.AttachmentsModule.CopyAttachments(this, cAgent); |
@@ -3353,6 +3354,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3353 | Animator.Animations.FromArray(cAgent.Anims); | 3354 | Animator.Animations.FromArray(cAgent.Anims); |
3354 | if (cAgent.DefaultAnim != null) | 3355 | if (cAgent.DefaultAnim != null) |
3355 | Animator.Animations.SetDefaultAnimation(cAgent.DefaultAnim.AnimID, cAgent.DefaultAnim.SequenceNum, UUID.Zero); | 3356 | Animator.Animations.SetDefaultAnimation(cAgent.DefaultAnim.AnimID, cAgent.DefaultAnim.SequenceNum, UUID.Zero); |
3357 | if (cAgent.AnimState != null) | ||
3358 | Animator.Animations.SetImplicitDefaultAnimation(cAgent.AnimState.AnimID, cAgent.AnimState.SequenceNum, UUID.Zero); | ||
3356 | 3359 | ||
3357 | if (Scene.AttachmentsModule != null) | 3360 | if (Scene.AttachmentsModule != null) |
3358 | Scene.AttachmentsModule.CopyAttachments(cAgent, this); | 3361 | Scene.AttachmentsModule.CopyAttachments(cAgent, this); |