diff options
author | Melanie | 2012-05-04 20:33:48 +0200 |
---|---|---|
committer | Melanie | 2012-05-04 20:33:48 +0200 |
commit | 333d013b5c34d7ed8c016251e50b80b62500aa3f (patch) | |
tree | aa65eb2c104d257cedda579194bcaf6ebde97719 /OpenSim/Region | |
parent | Reverse the order of physics event unsubscription to allow GC. Adapted from U... (diff) | |
download | opensim-SC-333d013b5c34d7ed8c016251e50b80b62500aa3f.zip opensim-SC-333d013b5c34d7ed8c016251e50b80b62500aa3f.tar.gz opensim-SC-333d013b5c34d7ed8c016251e50b80b62500aa3f.tar.bz2 opensim-SC-333d013b5c34d7ed8c016251e50b80b62500aa3f.tar.xz |
Add the default animation to the child agent data update
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index ad6679e..212720e 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3249,6 +3249,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3249 | cAgent.Anims = Animator.Animations.ToArray(); | 3249 | cAgent.Anims = Animator.Animations.ToArray(); |
3250 | } | 3250 | } |
3251 | catch { } | 3251 | catch { } |
3252 | cAgent.DefaultAnim = Animator.Animations.DefaultAnimation; | ||
3252 | 3253 | ||
3253 | // Attachment objects | 3254 | // Attachment objects |
3254 | List<SceneObjectGroup> attachments = GetAttachments(); | 3255 | List<SceneObjectGroup> attachments = GetAttachments(); |
@@ -3343,6 +3344,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3343 | // FIXME: Why is this null check necessary? Where are the cases where we get a null Anims object? | 3344 | // FIXME: Why is this null check necessary? Where are the cases where we get a null Anims object? |
3344 | if (cAgent.Anims != null) | 3345 | if (cAgent.Anims != null) |
3345 | Animator.Animations.FromArray(cAgent.Anims); | 3346 | Animator.Animations.FromArray(cAgent.Anims); |
3347 | if (cAgent.DefaultAnim != null) | ||
3348 | Animator.Animations.SetDefaultAnimation(cAgent.DefaultAnim.AnimID, cAgent.DefaultAnim.SequenceNum, UUID.Zero); | ||
3346 | 3349 | ||
3347 | if (cAgent.AttachmentObjects != null && cAgent.AttachmentObjects.Count > 0) | 3350 | if (cAgent.AttachmentObjects != null && cAgent.AttachmentObjects.Count > 0) |
3348 | { | 3351 | { |