diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-09-10 12:07:01 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-09-10 12:07:01 -0700 |
| commit | 3609eabe5460023d1460664feb5de10d68457725 (patch) | |
| tree | 533d03aadf36730eb59c2627cfd09e35593dd03c /indra/newview/llagent.h | |
| parent | 3191a5ddc9b3512b79a8505072d13583eb9012c6 (diff) | |
| parent | e241670694959833feaa0e667222b337095eb683 (diff) | |
Merge viewer-release 6.3.2
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index ad35c26dc6..6a8b8a2fe7 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -204,7 +204,7 @@ public: protected: void propagate(const F32 dt); // ! BUG ! Should roll into updateAgentPosition private: - mutable LLVector3d mPositionGlobal; + mutable LLVector3d mPositionGlobal; position_signal_t mOnPositionChanged; LLVector3d mLastTestGlobal; @@ -345,7 +345,7 @@ private: //-------------------------------------------------------------------- public: BOOL getFlying() const; - void setFlying(BOOL fly); + void setFlying(BOOL fly, BOOL fail_sound = FALSE); static void toggleFlying(); static bool enableFlying(); BOOL canFly(); // Does this parcel allow you to fly? |