diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-22 16:49:14 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-22 16:49:14 -0500 |
| commit | 8fb0d4f2d002963fef263826f9cc937ec37e01c7 (patch) | |
| tree | f9d6c66ab29265bb5d2bd8b192a7a052d3313afc | |
| parent | aafd7abd70396d33984b20c25d747406dea422ce (diff) | |
SH-466 FIX fix of VWR-20670/SNOW-506 lost in merge
Verified that the fix is no longer in mesh-development.
Verified fix is still in viewer-development.
Fix is simply changing visibility of LLInstanceTracker base in
LLEventTimer from protected to public.
The lack of this fix indicates a bad merge. Re-applying fix.
| -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 |