aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-17 02:53:12 +0000
committerJustin Clark-Casey (justincc)2012-02-17 02:53:12 +0000
commit972f73ed2bf44d2d1d27dc0e63673dc5690a518a (patch)
tree44adcca9510aae64b452f0916fbda666e5cdab20
parentMerge branch 'master' of /home/opensim/src/opensim (diff)
downloadopensim-SC_OLD-972f73ed2bf44d2d1d27dc0e63673dc5690a518a.zip
opensim-SC_OLD-972f73ed2bf44d2d1d27dc0e63673dc5690a518a.tar.gz
opensim-SC_OLD-972f73ed2bf44d2d1d27dc0e63673dc5690a518a.tar.bz2
opensim-SC_OLD-972f73ed2bf44d2d1d27dc0e63673dc5690a518a.tar.xz
Make osNpcStopAnimation() call AvatarStopAnimation() rather than AvatarPlayAnimation()
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
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 646a97b..c55e2ae 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -2595,7 +2595,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2595 UUID npcID = new UUID(npc.m_string); 2595 UUID npcID = new UUID(npc.m_string);
2596 2596
2597 if (module.CheckPermissions(npcID, m_host.OwnerID)) 2597 if (module.CheckPermissions(npcID, m_host.OwnerID))
2598 AvatarPlayAnimation(npcID.ToString(), animation); 2598 AvatarStopAnimation(npcID.ToString(), animation);
2599 } 2599 }
2600 } 2600 }
2601 2601