aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
diff options
context:
space:
mode:
authorMelanie2009-12-12 12:54:43 +0000
committerMelanie2009-12-12 12:54:43 +0000
commitb310efc50f92d474f4b498fdb2d3a9a4144efae8 (patch)
tree2475da320221330f9f44f156e3c7b12bcd0decb7 /OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
parentMerge branch 'master' into careminster (diff)
parent* Bugfix mantis 4441, "Use of Autopilot isn't playing any animations." (diff)
downloadopensim-SC_OLD-b310efc50f92d474f4b498fdb2d3a9a4144efae8.zip
opensim-SC_OLD-b310efc50f92d474f4b498fdb2d3a9a4144efae8.tar.gz
opensim-SC_OLD-b310efc50f92d474f4b498fdb2d3a9a4144efae8.tar.bz2
opensim-SC_OLD-b310efc50f92d474f4b498fdb2d3a9a4144efae8.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 50624a1..e98f0e7 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
128 if (!m_scenePresence.IsChildAgent) 128 if (!m_scenePresence.IsChildAgent)
129 { 129 {
130 if (m_animations.TrySetDefaultAnimation( 130 if (m_animations.TrySetDefaultAnimation(
131 anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, UUID.Zero)) 131 anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID))
132 { 132 {
133//Console.WriteLine("TSMA {0} success.", anim); 133//Console.WriteLine("TSMA {0} success.", anim);
134 // 16384 is CHANGED_ANIMATION 134 // 16384 is CHANGED_ANIMATION