diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
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 fcb1278..5f5d3cb 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -5984,9 +5984,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 5984 | // note: this may need some tweaking when walking downhill. you "fall down" for a brief instant | 5984 | // note: this may need some tweaking when walking downhill. you "fall down" for a brief instant |
| 5985 | // and don't collide when walking downhill, which instantly registers as in-air, briefly. should | 5985 | // and don't collide when walking downhill, which instantly registers as in-air, briefly. should |
| 5986 | // there be some minimum non-collision threshold time before claiming the avatar is in-air? | 5986 | // there be some minimum non-collision threshold time before claiming the avatar is in-air? |
| 5987 | if ((flags & ScriptBaseClass.AGENT_WALKING) == 0 && | 5987 | if ((flags & ScriptBaseClass.AGENT_WALKING) == 0 && !agent.IsColliding ) |
| 5988 | agent.PhysicsActor != null && | ||
| 5989 | !agent.PhysicsActor.IsColliding) | ||
| 5990 | { | 5988 | { |
| 5991 | flags |= ScriptBaseClass.AGENT_IN_AIR; | 5989 | flags |= ScriptBaseClass.AGENT_IN_AIR; |
| 5992 | } | 5990 | } |