From 8fb0d4f2d002963fef263826f9cc937ec37e01c7 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Mon, 22 Nov 2010 16:49:14 -0500
Subject: [PATCH] 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.
---
indra/llcommon/lleventtimer.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/llcommon/lleventtimer.h b/indra/llcommon/lleventtimer.h
index 62586dd92f1..7f42623d017 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
--
GitLab