From e9f14e3001afa624e9634b55ae9c687b3cca5351 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 16 Aug 2010 16:39:12 +0100
Subject: [PATCH] VWR-20670 (SNOW-506) FIXED Protection on LLInstanceTracker
base in LLEventTimer needs to be public for gcc >4.1
---
doc/contributions.txt | 1 +
indra/llcommon/lleventtimer.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index c8125c675f..38c34bb863 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 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
--
GitLab