diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-22 16:49:21 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-22 16:49:21 -0500 |
| commit | 65a66458c2e5ab369f22c5a52b93db6ef7305609 (patch) | |
| tree | d72c0050a1986f2b16a65175421beb732a680849 /indra/llcommon/lleventtimer.h | |
| parent | 9905870465aed76624f61a4e82d21c3db2e7d26f (diff) | |
| parent | 8fb0d4f2d002963fef263826f9cc937ec37e01c7 (diff) | |
Automated merge with https://hg.secondlife.com/mesh-development
Diffstat (limited to 'indra/llcommon/lleventtimer.h')
| -rw-r--r-- | indra/llcommon/lleventtimer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lleventtimer.h b/indra/llcommon/lleventtimer.h index 62586dd92f..7f42623d01 100644 --- a/indra/llcommon/lleventtimer.h +++ b/indra/llcommon/lleventtimer.h @@ -33,7 +33,7 @@ #include "lltimer.h" // class for scheduling a function to be called at a given frequency (approximate, inprecise) -class LL_COMMON_API LLEventTimer : protected LLInstanceTracker<LLEventTimer> +class LL_COMMON_API LLEventTimer : public LLInstanceTracker<LLEventTimer> { public: LLEventTimer(F32 period); // period is the amount of time between each call to tick() in seconds |