diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-08-18 18:51:38 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-08-18 18:51:38 +0300 |
| commit | b3916451c178fe62775b9ba9e5a66da21f5ac2b8 (patch) | |
| tree | 63b838b31f0e2f5a9d8f7ad6e70eee4174288a34 /indra/newview/llnamelistctrl.cpp | |
| parent | fe89d4c5c2f5779d43d41760600e14925e517b3d (diff) | |
| parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) | |
Merge viewer-release and become version 3.8.4
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
| -rwxr-xr-x | indra/newview/llnamelistctrl.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 54e4c6c1da..79988a0800 100755 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -70,7 +70,7 @@ LLNameListCtrl::LLNameListCtrl(const LLNameListCtrl::Params& p) // public LLScrollListItem* LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos, - BOOL enabled, const std::string& suffix) + BOOL enabled, const std::string& suffix, const std::string& prefix) { //LL_INFOS() << "LLNameListCtrl::addNameItem " << agent_id << LL_ENDL; @@ -79,7 +79,7 @@ LLScrollListItem* LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPositi item.enabled = enabled; item.target = INDIVIDUAL; - return addNameItemRow(item, pos, suffix); + return addNameItemRow(item, pos, suffix, prefix); } // virtual, public @@ -291,7 +291,8 @@ LLScrollListItem* LLNameListCtrl::addElement(const LLSD& element, EAddPosition p LLScrollListItem* LLNameListCtrl::addNameItemRow( const LLNameListCtrl::NameItem& name_item, EAddPosition pos, - const std::string& suffix) + const std::string& suffix, + const std::string& prefix) { LLUUID id = name_item.value().asUUID(); LLNameListItem* item = new LLNameListItem(name_item,name_item.target() == GROUP); @@ -365,7 +366,7 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow( LLScrollListCell* cell = item->getColumn(mNameColumnIndex); if (cell) { - cell->setValue(fullname); + cell->setValue(prefix + fullname); } dirtyColumns(); |