diff options
| author | Kitto Flora | 2010-03-12 13:48:31 -0500 |
|---|---|---|
| committer | Kitto Flora | 2010-03-12 13:48:31 -0500 |
| commit | 7bd48d383d3383c1e633f76f76a5291f4224d48a (patch) | |
| tree | 18997a5b1a123091af18a1a7984d7dd7873930ac /OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |
| parent | Dynamics Integration Part 1 (diff) | |
| parent | Small consistency change (diff) | |
| download | opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.zip opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.gz opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.bz2 opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.xz | |
Resolved merge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index e98f0e7..be0e985 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
| @@ -419,15 +419,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
| 419 | { | 419 | { |
| 420 | if (m_scenePresence.IsChildAgent) | 420 | if (m_scenePresence.IsChildAgent) |
| 421 | return; | 421 | return; |
| 422 | |||
| 423 | UUID[] animIDs; | ||
| 424 | int[] sequenceNums; | ||
| 425 | UUID[] objectIDs; | ||
| 426 | 422 | ||
| 427 | m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs); | 423 | m_scenePresence.Scene.ForEachScenePresence( |
| 428 | 424 | delegate(ScenePresence SP) | |
| 429 | m_scenePresence.ControllingClient.SendAnimations( | 425 | { |
| 430 | animIDs, sequenceNums, m_scenePresence.ControllingClient.AgentId, objectIDs); | 426 | SP.Animator.SendAnimPack(); |
| 427 | }); | ||
| 431 | } | 428 | } |
| 432 | 429 | ||
| 433 | /// <summary> | 430 | /// <summary> |