diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-25 10:48:25 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-25 10:48:25 -0500 |
| commit | 33450e6f1fc95e3552d2115bf7e4fcf05f3d7916 (patch) | |
| tree | c1eb91a2cf7c6346d5c5d9c72a1ed841643ee52c /indra/newview/llagent.cpp | |
| parent | 41eb231e6a41da13549e5cbd4cfe6f5efeab74b1 (diff) | |
| parent | ccf6cb3f9ba387117720d700b73ac8e05dbf1f75 (diff) | |
Automated merge of ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
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(); |