diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:58:49 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:58:49 +0000 |
| commit | 5da967dc744f35d5270c7cb0b8b23b993ecda3e1 (patch) | |
| tree | e345385b5bd2b84d94c59650c3637fb1b347394c /indra/newview/llnamelistctrl.cpp | |
| parent | 65d90e0e8b6a3702f799910eee11a9421e269d3a (diff) | |
merge skinning-7 -r 119501-119577 -> viewer-2.0.0-1 *NOTE: This overlaps a little with the skinning-7 -> skinning-8 merge of 119500-119692 -- James
ignore-dead-branch
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
| -rw-r--r-- | indra/newview/llnamelistctrl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index eee64b5651..95d787840f 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -54,7 +54,7 @@ void LLNameListCtrl::NameTypeNames::declareValues() } LLNameListCtrl::Params::Params() -: name_column("name_column"), +: name_column(""), allow_calling_card_drop("allow_calling_card_drop", false) { name = "name_list"; @@ -63,8 +63,8 @@ LLNameListCtrl::Params::Params() LLNameListCtrl::LLNameListCtrl(const LLNameListCtrl::Params& p) : LLScrollListCtrl(p), mAllowCallingCardDrop(p.allow_calling_card_drop), - mNameColumn(p.name_column), - mNameColumnIndex(0) + mNameColumn(p.name_column.column_name), + mNameColumnIndex(p.name_column.column_index) {} // public |