diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:21:18 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-04 11:21:18 -0400 |
| commit | d65e512fa3a0e7bc7f1c269d2c8d2e1c38c4e970 (patch) | |
| tree | 324168722ec39359f4753aa4acf6ca65c8b72ab3 /indra/newview/llnamelistctrl.cpp | |
| parent | d3e71fdc2c35ab75ebdac573698bbb86bbd0d98f (diff) | |
| parent | d3a9d6a6cef6630995c652b4cc04c8807dbe6d4e (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
| -rw-r--r-- | indra/newview/llnamelistctrl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index e7e60f544c..6521ae3b1e 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -253,7 +253,8 @@ void LLNameListCtrl::addNameItem(LLNameListCtrl::NameItem& item, EAddPosition po LLScrollListItem* LLNameListCtrl::addElement(const LLSD& element, EAddPosition pos, void* userdata) { LLNameListCtrl::NameItem item_params; - LLParamSDParser::instance().readSD(element, item_params); + LLParamSDParser parser; + parser.readSD(element, item_params); item_params.userdata = userdata; return addNameItemRow(item_params, pos); } |