aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorDan Lake2011-12-12 02:43:38 -0800
committerDan Lake2011-12-12 02:43:38 -0800
commitc34ab0ee669f674b29d863267e64104b1a3437ef (patch)
tree3ec315180616a056578f735f61d6311414603aeb /OpenSim/Region/ScriptEngine/Shared
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-c34ab0ee669f674b29d863267e64104b1a3437ef.zip
opensim-SC_OLD-c34ab0ee669f674b29d863267e64104b1a3437ef.tar.gz
opensim-SC_OLD-c34ab0ee669f674b29d863267e64104b1a3437ef.tar.bz2
opensim-SC_OLD-c34ab0ee669f674b29d863267e64104b1a3437ef.tar.xz
Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsColliding
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6d067b0..443e7a5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5573,9 +5573,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5573 // note: this may need some tweaking when walking downhill. you "fall down" for a brief instant 5573 // note: this may need some tweaking when walking downhill. you "fall down" for a brief instant
5574 // and don't collide when walking downhill, which instantly registers as in-air, briefly. should 5574 // and don't collide when walking downhill, which instantly registers as in-air, briefly. should
5575 // there be some minimum non-collision threshold time before claiming the avatar is in-air? 5575 // there be some minimum non-collision threshold time before claiming the avatar is in-air?
5576 if ((flags & ScriptBaseClass.AGENT_WALKING) == 0 && 5576 if ((flags & ScriptBaseClass.AGENT_WALKING) == 0 && !agent.IsColliding )
5577 agent.PhysicsActor != null &&
5578 !agent.PhysicsActor.IsColliding)
5579 { 5577 {
5580 flags |= ScriptBaseClass.AGENT_IN_AIR; 5578 flags |= ScriptBaseClass.AGENT_IN_AIR;
5581 } 5579 }