diff options
| author | Richard Nelson <none@none> | 2010-06-04 14:26:14 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-06-04 14:26:14 -0700 |
| commit | 9dd68124d18ca9b2d9a252f392cc71cc24928cd5 (patch) | |
| tree | 69c35919ff281e7a08bd0a8dc48a040b892f5c55 /indra/newview/llnamelistctrl.cpp | |
| parent | ceb6647ac1d61b43f6beb130466a7cf7c4fa15ac (diff) | |
| parent | 1be76eccdfed4d02f7ff8e34a29528887dd8d26c (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
| -rw-r--r-- | indra/newview/llnamelistctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index d605d4430e..d09f729943 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -72,7 +72,7 @@ LLNameListCtrl::LLNameListCtrl(const LLNameListCtrl::Params& p) // public void LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos, - BOOL enabled, std::string& suffix) + BOOL enabled, const std::string& suffix) { //llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl; @@ -268,7 +268,7 @@ LLScrollListItem* LLNameListCtrl::addElement(const LLSD& element, EAddPosition p LLScrollListItem* LLNameListCtrl::addNameItemRow( const LLNameListCtrl::NameItem& name_item, EAddPosition pos, - std::string& suffix) + const std::string& suffix) { LLUUID id = name_item.value().asUUID(); LLNameListItem* item = NULL; |