livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Nyx (Neal Orman) 2010-11-22 16:49:14 -05:00
parent aafd7abd70
commit 8fb0d4f2d0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/lleventtimer.h
View File

@ -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