diff options
author | Justin Clark-Casey (justincc) | 2010-02-16 19:08:06 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-02-16 19:08:06 +0000 |
commit | 4c90ee29432539efbf5942010dd574822235ed57 (patch) | |
tree | d159f72df97dfef5719221301009e90f375f2ef2 /OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |
parent | minor: Make SOG.DelinkFromGroup() return the newly delinked scene object inst... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.zip opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.gz opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.bz2 opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
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 fd526eb..712dcc7 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -418,15 +418,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
418 | { | 418 | { |
419 | if (m_scenePresence.IsChildAgent) | 419 | if (m_scenePresence.IsChildAgent) |
420 | return; | 420 | return; |
421 | |||
422 | UUID[] animIDs; | ||
423 | int[] sequenceNums; | ||
424 | UUID[] objectIDs; | ||
425 | 421 | ||
426 | m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs); | 422 | m_scenePresence.Scene.ForEachScenePresence( |
427 | 423 | delegate(ScenePresence SP) | |
428 | m_scenePresence.ControllingClient.SendAnimations( | 424 | { |
429 | animIDs, sequenceNums, m_scenePresence.ControllingClient.AgentId, objectIDs); | 425 | SP.Animator.SendAnimPack(); |
426 | }); | ||
430 | } | 427 | } |
431 | 428 | ||
432 | /// <summary> | 429 | /// <summary> |