aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index fdadd32..3cb8f59 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -196,7 +196,13 @@ namespace OpenSim.Region.Framework.Scenes.Animation
196// "[SCENE PRESENCE ANIMATOR]: Setting movement animation {0} for {1}", 196// "[SCENE PRESENCE ANIMATOR]: Setting movement animation {0} for {1}",
197// anim, m_scenePresence.Name); 197// anim, m_scenePresence.Name);
198 198
199 if (m_animations.TrySetDefaultAnimation( 199 UUID overridenAnim = m_scenePresence.Overrides.GetOverriddenAnimation(anim);
200 if (overridenAnim != UUID.Zero)
201 {
202 m_animations.SetDefaultAnimation(overridenAnim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID);
203 ret = true;
204 }
205 else if (m_animations.TrySetDefaultAnimation(
200 anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID)) 206 anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID))
201 { 207 {
202// m_log.DebugFormat( 208// m_log.DebugFormat(