diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 7307662..de4c5fb 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -419,11 +419,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
419 | if (m_scenePresence.IsChildAgent) | 419 | if (m_scenePresence.IsChildAgent) |
420 | return; | 420 | return; |
421 | 421 | ||
422 | m_scenePresence.Scene.ForEachScenePresence( | 422 | UUID[] animIDs; |
423 | delegate(ScenePresence SP) | 423 | int[] sequenceNums; |
424 | { | 424 | UUID[] objectIDs; |
425 | SP.Animator.SendAnimPack(); | 425 | |
426 | }); | 426 | m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs); |
427 | client.SendAnimations(animIDs, sequenceNums, m_scenePresence.ControllingClient.AgentId, objectIDs); | ||
427 | } | 428 | } |
428 | 429 | ||
429 | /// <summary> | 430 | /// <summary> |
@@ -451,4 +452,4 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
451 | m_scenePresence = null; | 452 | m_scenePresence = null; |
452 | } | 453 | } |
453 | } | 454 | } |
454 | } \ No newline at end of file | 455 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index b5f6217..3efb45f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -912,6 +912,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
912 | 912 | ||
913 | m_isChildAgent = false; | 913 | m_isChildAgent = false; |
914 | 914 | ||
915 | // send the animations of the other presences to me | ||
915 | m_scene.ForEachScenePresence(delegate(ScenePresence presence) | 916 | m_scene.ForEachScenePresence(delegate(ScenePresence presence) |
916 | { | 917 | { |
917 | if (presence != this) | 918 | if (presence != this) |