diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 11:29:17 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 11:29:17 -0600 |
| commit | 9f0da75332fcbb1bc97812baf67900702d6ced85 (patch) | |
| tree | 123671904c3b349b3f557483a4a98781ce03943a /indra/newview/llagent.cpp | |
| parent | 2c964e82f5ac42fbb86f551783dfb04fcdfaf460 (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge branch 'master' 6.4.8 into DRTVWR-497
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); |