diff options
author | Richard Linden <none@none> | 2010-09-22 19:11:29 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-22 19:11:29 -0700 |
commit | abe758d45fa3dd3524a4c7a9667e4f02c3de8eac (patch) | |
tree | 7ac140c51c22a42c693b0930898e0996a807ecb8 /indra/newview/llagent.h | |
parent | 264b549bcb991f4cdd6889f06b8f7fbe8740e32a (diff) | |
parent | b124d45b4ef714acfe629af554768950dcdd5f2c (diff) |
merge
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: |