diff options
author | Merov Linden <merov@lindenlab.com> | 2010-09-24 11:23:07 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-09-24 11:23:07 -0700 |
commit | b85cf7b12562a3359e52147d26eb1051ce388559 (patch) | |
tree | 3f656bb586e7cd2a25763d8053365e106365a063 /indra/newview/llagent.h | |
parent | 24473fc0d619beaafab029170a7aacde5855be1a (diff) | |
parent | b34856d66dfa1a725cb85d813982709566b6db7a (diff) |
Pull update from viewer-development
Diffstat (limited to 'indra/newview/llagent.h')
-rw-r--r-- | indra/newview/llagent.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 30685461b9..6c598d5d71 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -264,6 +264,7 @@ public: private: LLFrameTimer mFidgetTimer; LLFrameTimer mFocusObjectFadeTimer; + LLFrameTimer mMoveTimer; F32 mNextFidgetTime; S32 mCurrentFidget; @@ -360,14 +361,6 @@ private: BOOL mIsBusy; //-------------------------------------------------------------------- - // Jump - //-------------------------------------------------------------------- -public: - BOOL getJump() const { return mbJump; } -private: - BOOL mbJump; - - //-------------------------------------------------------------------- // Grab //-------------------------------------------------------------------- public: |