aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
diff options
context:
space:
mode:
authorMelanie2012-08-23 00:12:12 +0100
committerMelanie2012-08-23 00:12:12 +0100
commit97c37c370be9ad01433722f3305f8dce02488782 (patch)
tree4a9b5eea1ebd13bb044959723dc3bac82d97c22e /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
parentMerge branch 'avination' into careminster (diff)
parentMake terrain save every 1000 frames instead of every 50. Database load is a s... (diff)
downloadopensim-SC-97c37c370be9ad01433722f3305f8dce02488782.zip
opensim-SC-97c37c370be9ad01433722f3305f8dce02488782.tar.gz
opensim-SC-97c37c370be9ad01433722f3305f8dce02488782.tar.bz2
opensim-SC-97c37c370be9ad01433722f3305f8dce02488782.tar.xz
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-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 717cc07..434638d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6055,6 +6055,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6055 flags |= ScriptBaseClass.AGENT_AWAY; 6055 flags |= ScriptBaseClass.AGENT_AWAY;
6056 } 6056 }
6057 6057
6058 UUID busy = new UUID("efcf670c-2d18-8128-973a-034ebc806b67");
6059 UUID[] anims = agent.Animator.GetAnimationArray();
6060 if (Array.Exists<UUID>(anims, a => { return a == busy; }))
6061 {
6062 flags |= ScriptBaseClass.AGENT_BUSY;
6063 }
6064
6058 // seems to get unset, even if in mouselook, when avatar is sitting on a prim??? 6065 // seems to get unset, even if in mouselook, when avatar is sitting on a prim???
6059 if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0) 6066 if ((agent.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
6060 { 6067 {