diff options
| author | Justin Clark-Casey (justincc) | 2012-02-17 04:04:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-17 04:04:38 +0000 |
| commit | 73a5abf4d981bf53fc225f922ae5649076d1309a (patch) | |
| tree | e419ed28efb08fe5aeedd9ca0cdda7046beb9b29 | |
| parent | switch version flavour to rc2 (diff) | |
| parent | Make osNpcStopAnimation() call AvatarStopAnimation() rather than AvatarPlayAn... (diff) | |
| download | opensim-SC_OLD-73a5abf4d981bf53fc225f922ae5649076d1309a.zip opensim-SC_OLD-73a5abf4d981bf53fc225f922ae5649076d1309a.tar.gz opensim-SC_OLD-73a5abf4d981bf53fc225f922ae5649076d1309a.tar.bz2 opensim-SC_OLD-73a5abf4d981bf53fc225f922ae5649076d1309a.tar.xz | |
Merge branch 'master' into 0.7.3-post-fixes
| -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 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 | ||