diff --git a/doc/contributions.txt b/doc/contributions.txt index c8125c675fbfa6e1448b8005b23668d019c7bb7a..38c34bb8639c0e8fd226f9d4d3bd33ae885db39c 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -518,6 +518,7 @@ Robin Cornelius SNOW-108 SNOW-204 SNOW-484 + SNOW-506 VWR-2488 VWR-9557 VWR-11128 diff --git a/indra/llcommon/lleventtimer.h b/indra/llcommon/lleventtimer.h index 62586dd92f105be9821c74174f9ca2d4b1d49e4b..7f42623d017eff2dfc54487f3457f0c38b5d8566 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