diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-25 17:09:53 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-25 17:09:53 +0000 |
commit | 5467853d8dee218a60268d056995bf4819684cfd (patch) | |
tree | c7a6ee02b8b66695cc1bca619b6c756ebbaeffd6 /indra/newview/llagent.cpp | |
parent | e71fdf32da50e3f5cb481c040add27a8a4f3777e (diff) | |
parent | 6631e4d872fd4bd0208e44320e0b189b624cda86 (diff) |
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r-- | indra/newview/llagent.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index eb5d172ff7..2644235114 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -734,6 +734,10 @@ BOOL LLAgent::canFly() return parcel->getAllowFly(); } +BOOL LLAgent::getFlying() const +{ + return mControlFlags & AGENT_CONTROL_FLY; +} //----------------------------------------------------------------------------- // setFlying() @@ -791,7 +795,7 @@ void LLAgent::setFlying(BOOL fly) // static void LLAgent::toggleFlying() { - BOOL fly = !(gAgent.mControlFlags & AGENT_CONTROL_FLY); + BOOL fly = !gAgent.getFlying(); gAgent.setFlying( fly ); gAgent.resetView(); |