aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation
diff options
context:
space:
mode:
authorMelanie Thielker2014-08-25 20:33:12 +0200
committerMelanie Thielker2014-08-25 20:33:12 +0200
commit56081dc5e11351032e16cd1f3d9df3c84a7b9243 (patch)
tree1f55bc864af47f541977f4c2b1721e34893e809e /OpenSim/Region/Framework/Scenes/Animation
parentMerge branch 'avination-current' (diff)
parentback to just kills (diff)
downloadopensim-SC-56081dc5e11351032e16cd1f3d9df3c84a7b9243.zip
opensim-SC-56081dc5e11351032e16cd1f3d9df3c84a7b9243.tar.gz
opensim-SC-56081dc5e11351032e16cd1f3d9df3c84a7b9243.tar.bz2
opensim-SC-56081dc5e11351032e16cd1f3d9df3c84a7b9243.tar.xz
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 668087f..fdadd32 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -576,6 +576,16 @@ namespace OpenSim.Region.Framework.Scenes.Animation
576 m_scenePresence.SendAnimPack(animations, seqs, objectIDs); 576 m_scenePresence.SendAnimPack(animations, seqs, objectIDs);
577 } 577 }
578 578
579 public void GetArrays(out UUID[] animIDs, out int[] sequenceNums, out UUID[] objectIDs)
580 {
581 animIDs = null;
582 sequenceNums = null;
583 objectIDs = null;
584
585 if(m_animations != null)
586 m_animations.GetArrays(out animIDs, out sequenceNums, out objectIDs);
587 }
588
579 public void SendAnimPackToClient(IClientAPI client) 589 public void SendAnimPackToClient(IClientAPI client)
580 { 590 {
581 if (m_scenePresence.IsChildAgent) 591 if (m_scenePresence.IsChildAgent)