summaryrefslogtreecommitdiff
path: root/indra/newview/llnamelistctrl.h
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-09-26 11:44:40 -0700
committerGraham Linden <graham@lindenlab.com>2013-09-26 11:44:40 -0700
commit0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (patch)
treea485d28fd9861c41bf9b7117c085bd84617f43de /indra/newview/llnamelistctrl.h
parentdd4beb695a9c800b37b7c9a19d3ac3f4456012f5 (diff)
parentbadb8a945d31aed6f396e7efb521e76083870069 (diff)
Merge viewer-bear maint RC changes to get this build closer to the RC it will follow
Diffstat (limited to 'indra/newview/llnamelistctrl.h')
-rwxr-xr-xindra/newview/llnamelistctrl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 5aa1e1c458..92e82b672d 100755
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -67,6 +67,7 @@ class LLNameListCtrl
: public LLScrollListCtrl, public LLInstanceTracker<LLNameListCtrl>
{
public:
+
typedef enum e_name_type
{
INDIVIDUAL,