diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-08-18 09:14:17 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-08-18 09:14:17 +0100 |
| commit | 302b3a07705730569c1eb692807c1050146d7941 (patch) | |
| tree | 3bb7b449d975562dd21d9045b92191460a87edc6 /indra/llcommon | |
| parent | ba64912c20ec1ff14bdbdec0ac1dabe81f306124 (diff) | |
| parent | b53ac25d5c9e04e8e1cabaa4fdf817248431fc72 (diff) | |
Merge http://bitbucket.org/aimee_linden/viewer-development-import
Diffstat (limited to 'indra/llcommon')
| -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 |