diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-18 19:17:01 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-18 19:17:01 +0300 |
| commit | b0274e1bdd2b140d3c699d096deceefe73e71ec2 (patch) | |
| tree | 08bdc2eed6d2c22045d9300e666b3f421041eb9e /indra/newview/llagent.cpp | |
| parent | 1f2ceb97ec4941a43ef3551a9fb41108cb65e1b2 (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge branch 'master' into DRTVWR-482
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index f6d6f7c897..f3df79fb6b 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -830,6 +830,17 @@ bool LLAgent::enableFlying() return !sitting; } +// static +bool LLAgent::isSitting() +{ + BOOL sitting = FALSE; + if (isAgentAvatarValid()) + { + sitting = gAgentAvatarp->isSitting(); + } + return sitting; +} + void LLAgent::standUp() { setControlFlags(AGENT_CONTROL_STAND_UP); |