aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2012-10-26 21:16:27 +0100
committerMelanie2012-10-26 21:16:27 +0100
commitde6f147d3c2f178b47c4fffddb85925f75e6d88f (patch)
treec3bb0516abf19ff1e8be3b1a14309983a5c92fb3 /OpenSim/Region/Framework
parentminor: Make the error thrown logged when a simulator in grid mode is trying t... (diff)
downloadopensim-SC_OLD-de6f147d3c2f178b47c4fffddb85925f75e6d88f.zip
opensim-SC_OLD-de6f147d3c2f178b47c4fffddb85925f75e6d88f.tar.gz
opensim-SC_OLD-de6f147d3c2f178b47c4fffddb85925f75e6d88f.tar.bz2
opensim-SC_OLD-de6f147d3c2f178b47c4fffddb85925f75e6d88f.tar.xz
Revert "Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO hud is"
This reverts commit fa484c3494a7190b4d7526094347be74d091e125.
Diffstat (limited to 'OpenSim/Region/Framework')
-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 9ed4f47..ad421ee 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(animID, 1, UUID.Zero); 90 m_defaultAnimation = new OpenSim.Framework.Animation(UUID.Zero, 1, UUID.Zero);
91 } 91 }
92 else if (HasAnimation(animID)) 92 else if (HasAnimation(animID))
93 { 93 {