aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs19
1 files changed, 18 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index a701a79..eb70eee 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -80,12 +80,13 @@ namespace OpenSim.Region.Framework.Scenes.Animation
80 m_scenePresence = sp; 80 m_scenePresence = sp;
81 CurrentMovementAnimation = "CROUCH"; 81 CurrentMovementAnimation = "CROUCH";
82 } 82 }
83 83
84 public void AddAnimation(UUID animID, UUID objectID) 84 public void AddAnimation(UUID animID, UUID objectID)
85 { 85 {
86 if (m_scenePresence.IsChildAgent) 86 if (m_scenePresence.IsChildAgent)
87 return; 87 return;
88 88
89 // m_log.DebugFormat("[SCENE PRESENCE ANIMATOR]: Adding animation {0} for {1}", animID, m_scenePresence.Name);
89 if (m_scenePresence.Scene.DebugAnimations) 90 if (m_scenePresence.Scene.DebugAnimations)
90 m_log.DebugFormat( 91 m_log.DebugFormat(
91 "[SCENE PRESENCE ANIMATOR]: Adding animation {0} {1} for {2}", 92 "[SCENE PRESENCE ANIMATOR]: Adding animation {0} {1} for {2}",
@@ -138,6 +139,22 @@ namespace OpenSim.Region.Framework.Scenes.Animation
138 } 139 }
139 } 140 }
140 141
142 public void avnChangeAnim(UUID animID, bool addRemove, bool sendPack)
143 {
144 if (m_scenePresence.IsChildAgent)
145 return;
146
147 if (animID != UUID.Zero)
148 {
149 if (addRemove)
150 m_animations.Add(animID, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, UUID.Zero);
151 else
152 m_animations.Remove(animID, true);
153 }
154 if(sendPack)
155 SendAnimPack();
156 }
157
141 // Called from scripts 158 // Called from scripts
142 public void RemoveAnimation(string name) 159 public void RemoveAnimation(string name)
143 { 160 {