diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-05 18:15:48 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-05 18:15:48 -0800 |
| commit | d7277171c359ac66f4a75c80fc43c532018baece (patch) | |
| tree | 589f08621cfbe33b11853acbd9c41e0013b43feb /indra/llcommon/lltimer.h | |
| parent | 61b34c61eca35c4a8841942e8bed25f82f9d1f63 (diff) | |
| parent | ec076c97feaa2976520e28fd1c1b23099be656d7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llcommon/lltimer.h')
| -rw-r--r-- | indra/llcommon/lltimer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h index 4d995d5bba..63e8121b58 100644 --- a/indra/llcommon/lltimer.h +++ b/indra/llcommon/lltimer.h @@ -188,7 +188,7 @@ public: protected: LLTimer mEventTimer; F32 mPeriod; - bool mBusy; + static bool sInTickLoop; }; U64 LL_COMMON_API totalTime(); // Returns current system time in microseconds |