diff --git a/doc/contributions.txt b/doc/contributions.txt index 38c34bb8639c0e8fd226f9d4d3bd33ae885db39c..852c1c5f921e5d1f63425e7739441064b0b75b8b 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 268d16976f44c530978fcbf8440d22c95fea6e38..981e3df16b25f3c4a9e3fb103eb4d6af0f6169ef 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