diff options
| author | Melanie Thielker | 2014-09-09 20:16:43 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-09-09 20:16:43 +0200 |
| commit | 339904bc527abe92c59a9cf9bfa0e1b4d917592b (patch) | |
| tree | 62d1c8d3b419f1470241f4cfbc8518c3e2d4eb83 /OpenSim/Region/Framework/Scenes | |
| parent | Add some case magic and send an anim pack when an override is set (diff) | |
| parent | add full delete if uuid iz zero and state is ALL (diff) | |
| download | opensim-SC-339904bc527abe92c59a9cf9bfa0e1b4d917592b.zip opensim-SC-339904bc527abe92c59a9cf9bfa0e1b4d917592b.tar.gz opensim-SC-339904bc527abe92c59a9cf9bfa0e1b4d917592b.tar.bz2 opensim-SC-339904bc527abe92c59a9cf9bfa0e1b4d917592b.tar.xz | |
Merge branch 'ubitworkmaster'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs b/OpenSim/Region/Framework/Scenes/Animation/MovementAnimationOverrides.cs index f77d29a..db4003e 100644 --- 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 | |||
| 57 | { | 57 | { |
| 58 | if (animID == UUID.Zero) | 58 | if (animID == UUID.Zero) |
| 59 | { | 59 | { |
| 60 | m_overrides.Remove(state); | 60 | if (state == "ALL") |
| 61 | m_overrides.Clear(); | ||
| 62 | else | ||
| 63 | m_overrides.Remove(state); | ||
| 61 | return; | 64 | return; |
| 62 | } | 65 | } |
| 63 | 66 | ||