aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-10-25 23:15:00 +0100
committerJustin Clark-Casey (justincc)2012-10-25 23:17:07 +0100
commit0482758e964515f25c7401661ca950df529cb754 (patch)
treecc13e5109a7c53337127dbfdf6afc0c7e1f54f0f /OpenSim
parentIn Scene.Close(), dispose of the physics scene after base.Close() since scrip... (diff)
parentFix for Mantis 0006376: Avatar no longer show Walking animation when any AO h... (diff)
downloadopensim-SC_OLD-0482758e964515f25c7401661ca950df529cb754.zip
opensim-SC_OLD-0482758e964515f25c7401661ca950df529cb754.tar.gz
opensim-SC_OLD-0482758e964515f25c7401661ca950df529cb754.tar.bz2
opensim-SC_OLD-0482758e964515f25c7401661ca950df529cb754.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
index ad421ee..9ed4f47 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/AnimationSet.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
87 { 87 {
88 if (m_defaultAnimation.AnimID == animID) 88 if (m_defaultAnimation.AnimID == animID)
89 { 89 {
90 m_defaultAnimation = new OpenSim.Framework.Animation(UUID.Zero, 1, UUID.Zero); 90 m_defaultAnimation = new OpenSim.Framework.Animation(animID, 1, UUID.Zero);
91 } 91 }
92 else if (HasAnimation(animID)) 92 else if (HasAnimation(animID))
93 { 93 {