diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-18 17:27:36 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-18 17:27:36 +0100 |
| commit | 8d1aa99e80f7354af4810e563649ca1ee31f2e1a (patch) | |
| tree | 5ce8a88442e40be9ad582000b8d2bf2cab59b18f /indra/newview/llagent.cpp | |
| parent | cef702d0c57e5bb4f0debfba677d1fd5a9694364 (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge remote-tracking branch 'origin/master' into SL-13705
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); |