Merge branch 'ubitworkmaster'

2014-09-09 20:16:43 +02:00 · 2014-09-09 20:16:43 +02:00 · 339904bc52
parent 2d2823f1de 002a2deaf9
commit 339904bc52
1 changed files with 4 additions and 1 deletions
--- a/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs
@ -57,7 +57,10 @@ namespace OpenSim.Region.Framework.Scenes
        {
            if (animID == UUID.Zero)
            {
-                m_overrides.Remove(state);
+                if (state == "ALL")
+                    m_overrides.Clear();
+                else
+                    m_overrides.Remove(state);
                return;
            }