Skip to content
Snippets Groups Projects
Commit 8fb0d4f2 authored by Nyx (Neal Orman)'s avatar Nyx (Neal Orman)
Browse files

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.
parent aafd7abd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/llcommon/lleventtimer.h
+ 1
− 1
View file @ 8fb0d4f2
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "lltimer.h" #include "lltimer.h"
// class for scheduling a function to be called at a given frequency (approximate, inprecise) // 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: public:
LLEventTimer(F32 period); // period is the amount of time between each call to tick() in seconds LLEventTimer(F32 period); // period is the amount of time between each call to tick() in seconds
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment