diff options
| author | Justin Clark-Casey (justincc) | 2013-01-24 00:03:44 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-24 00:03:44 +0000 |
| commit | 55c6753b13d4c8cd69cc986db5f6e321b8e65bb7 (patch) | |
| tree | 70ae7a976ba9be4e7e8d1cb98d3a6e61e4dfb7d4 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
| parent | Add information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini and... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.zip opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.gz opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.bz2 opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.xz | |
Merge branch 'master' into cooptermination
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index f2f8fd6..1426070 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -986,7 +986,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 986 | if (animID == UUID.Zero) | 986 | if (animID == UUID.Zero) |
| 987 | target.Animator.RemoveAnimation(animation); | 987 | target.Animator.RemoveAnimation(animation); |
| 988 | else | 988 | else |
| 989 | target.Animator.RemoveAnimation(animID); | 989 | target.Animator.RemoveAnimation(animID, true); |
| 990 | } | 990 | } |
| 991 | } | 991 | } |
| 992 | } | 992 | } |