diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2007-08-02 01:18:34 +0000 |
| commit | 7138fb673ac3df46b9cb5f23d0d74e70fdd2b6b3 (patch) | |
| tree | 3c34a3a180b5275bd4166b0056765c5868f56447 /indra/llcommon | |
| parent | f6a10b3214d79df4e8f5768acaa68edbd2de5620 (diff) | |
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/lltimer.cpp | 6 | ||||
| -rw-r--r-- | indra/llcommon/lltimer.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp index 993574b528..f335458f24 100644 --- a/indra/llcommon/lltimer.cpp +++ b/indra/llcommon/lltimer.cpp @@ -492,7 +492,7 @@ void secondsToTimecodeString(F32 current_time, char *tcstring) std::list<LLEventTimer*> LLEventTimer::sActiveList; LLEventTimer::LLEventTimer(F32 period) -: mTimer() +: mEventTimer() { mPeriod = period; sActiveList.push_back(this); @@ -508,9 +508,9 @@ void LLEventTimer::updateClass() for (std::list<LLEventTimer*>::iterator iter = sActiveList.begin(); iter != sActiveList.end(); ) { LLEventTimer* timer = *iter++; - F32 et = timer->mTimer.getElapsedTimeF32(); + F32 et = timer->mEventTimer.getElapsedTimeF32(); if (et > timer->mPeriod) { - timer->mTimer.reset(); + timer->mEventTimer.reset(); timer->tick(); } } diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h index 69e786c50a..575bf9fc0b 100644 --- a/indra/llcommon/lltimer.h +++ b/indra/llcommon/lltimer.h @@ -131,7 +131,7 @@ public: static void updateClass(); protected: - LLTimer mTimer; + LLTimer mEventTimer; F32 mPeriod; private: |