diff options
author | KittoFlora | 2009-11-19 20:20:03 +0100 |
---|---|---|
committer | KittoFlora | 2009-11-19 20:20:03 +0100 |
commit | 251d1b8fbbc311ea267d0a44d5878df480d69338 (patch) | |
tree | 4ef142946d9b05d42564ddba63a99a67db5659bc /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
parent | Clean up messages in ODE (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-251d1b8fbbc311ea267d0a44d5878df480d69338.zip opensim-SC_OLD-251d1b8fbbc311ea267d0a44d5878df480d69338.tar.gz opensim-SC_OLD-251d1b8fbbc311ea267d0a44d5878df480d69338.tar.bz2 opensim-SC_OLD-251d1b8fbbc311ea267d0a44d5878df480d69338.tar.xz |
Merge branch 'careminster' into tests
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 3ffcff0..7fdbac8 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -741,9 +741,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
741 | } | 741 | } |
742 | } | 742 | } |
743 | if (animID == UUID.Zero) | 743 | if (animID == UUID.Zero) |
744 | target.AddAnimation(animation, m_host.UUID); | 744 | target.Animator.AddAnimation(animation, m_host.UUID); |
745 | else | 745 | else |
746 | target.AddAnimation(animID, m_host.UUID); | 746 | target.Animator.AddAnimation(animID, m_host.UUID); |
747 | } | 747 | } |
748 | } | 748 | } |
749 | } | 749 | } |
@@ -773,10 +773,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
773 | } | 773 | } |
774 | } | 774 | } |
775 | } | 775 | } |
776 | |||
776 | if (animID == UUID.Zero) | 777 | if (animID == UUID.Zero) |
777 | target.RemoveAnimation(animation); | 778 | target.Animator.RemoveAnimation(animation); |
778 | else | 779 | else |
779 | target.RemoveAnimation(animID); | 780 | target.Animator.RemoveAnimation(animID); |
780 | } | 781 | } |
781 | } | 782 | } |
782 | } | 783 | } |