1 files changed, 10 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d6aafaf..d8ef772 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6090,6 +6090,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 flags |= ScriptBaseClass.AGENT_AWAY;
             }
 
+            UUID busy = new UUID("efcf670c-2d18-8128-973a-034ebc806b67");
+            UUID[] anims = agent.Animator.GetAnimationArray();
+            if (Array.Exists<UUID>(anims, a => { return a == busy; }))
+            {
+                flags |= ScriptBaseClass.AGENT_BUSY;
+            }
+
             // seems to get unset, even if in mouselook, when avatar is sitting on a prim???
             if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
             {
@@ -7778,10 +7785,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         remaining = SetPrimParams((ScenePresence)part, rules);
                 }
 
-                while((object)remaining != null && remaining.Length > 2)
+                while ((object)remaining != null && remaining.Length > 2)
                 {
                     linknumber = remaining.GetLSLIntegerItem(0);
-                    rules = remaining.GetSublist(1,-1);
+                    rules = remaining.GetSublist(1, -1);
                     parts.Clear();
                     prims = GetLinkParts(linknumber);
                     avatars = GetLinkAvatars(linknumber);
@@ -7790,6 +7797,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     foreach (ScenePresence p in avatars)
                         parts.Add(p);
 
+                    remaining = null;
                     foreach (object part in parts)
                     {
                         if (part is SceneObjectPart)