From 6981353b1a24d07512ca7aca74fadf50dbaf6732 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 16 Aug 2010 16:40:13 +0100
Subject: [PATCH] VWR-20671 (SNOW-514) FIXED Protection on LLInstanceTracker
base in LLNameListCtrl needs to be public for gcc >4.1
---
doc/contributions.txt | 1 +
indra/newview/llnamelistctrl.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 38c34bb8639..852c1c5f921 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -519,6 +519,7 @@ Robin Cornelius
SNOW-204
SNOW-484
SNOW-506
+ SNOW-514
VWR-2488
VWR-9557
VWR-11128
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 268d16976f4..981e3df16b2 100644
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -33,7 +33,7 @@
class LLNameListCtrl
-: public LLScrollListCtrl, protected LLInstanceTracker<LLNameListCtrl>
+: public LLScrollListCtrl, public LLInstanceTracker<LLNameListCtrl>
{
public:
typedef enum e_name_type
--
GitLab