aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorUbitUmarov2012-08-25 15:21:51 +0100
committerUbitUmarov2012-08-25 15:21:51 +0100
commit9a803308755200c0449e409fd3c22d45bca9e95c (patch)
tree2100bd63e85a37948dfc74a07f1d70a82a665048 /OpenSim/Region/ScriptEngine/Shared
parentMerge branch 'avination' into ubitwork (diff)
parentMerge branch 'ubitwork' into avination (diff)
downloadopensim-SC-9a803308755200c0449e409fd3c22d45bca9e95c.zip
opensim-SC-9a803308755200c0449e409fd3c22d45bca9e95c.tar.gz
opensim-SC-9a803308755200c0449e409fd3c22d45bca9e95c.tar.bz2
opensim-SC-9a803308755200c0449e409fd3c22d45bca9e95c.tar.xz
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 1433cc9..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
6090 flags |= ScriptBaseClass.AGENT_AWAY; 6090 flags |= ScriptBaseClass.AGENT_AWAY;
6091 } 6091 }
6092 6092
6093 UUID busy = new UUID("efcf670c-2d18-8128-973a-034ebc806b67");
6094 UUID[] anims = agent.Animator.GetAnimationArray();
6095 if (Array.Exists<UUID>(anims, a => { return a == busy; }))
6096 {
6097 flags |= ScriptBaseClass.AGENT_BUSY;
6098 }
6099
6093 // seems to get unset, even if in mouselook, when avatar is sitting on a prim??? 6100 // seems to get unset, even if in mouselook, when avatar is sitting on a prim???
6094 if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0) 6101 if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
6095 { 6102 {