diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-17 20:06:49 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-08-17 20:06:49 -0400 |
commit | 3d7ae2b2f289ea0cbb8f430d1674782dc18af403 (patch) | |
tree | 61924416fe7e6fdbc74790ea52299d5fbb3315f2 /indra/newview/llnamelistctrl.h | |
parent | 2a57da233423ca3531bfcec2e138023afead4c3f (diff) | |
parent | 1be63209331d509396bd7ee79302d511fe83d72e (diff) |
merge
Diffstat (limited to 'indra/newview/llnamelistctrl.h')
-rwxr-xr-x | indra/newview/llnamelistctrl.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h index 2c40eeaaca..515962df7d 100755 --- a/indra/newview/llnamelistctrl.h +++ b/indra/newview/llnamelistctrl.h @@ -129,11 +129,12 @@ public: // Add a user to the list by name. It will be added, the name // requested from the cache, and updated as necessary. LLScrollListItem* addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM, - BOOL enabled = TRUE, const std::string& suffix = LLStringUtil::null); + BOOL enabled = TRUE, const std::string& suffix = LLStringUtil::null, const std::string& prefix = LLStringUtil::null); LLScrollListItem* addNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM); /*virtual*/ LLScrollListItem* addElement(const LLSD& element, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL); - LLScrollListItem* addNameItemRow(const NameItem& value, EAddPosition pos = ADD_BOTTOM, const std::string& suffix = LLStringUtil::null); + LLScrollListItem* addNameItemRow(const NameItem& value, EAddPosition pos = ADD_BOTTOM, const std::string& suffix = LLStringUtil::null, + const std::string& prefix = LLStringUtil::null); // Add a user to the list by name. It will be added, the name // requested from the cache, and updated as necessary. |