diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llnamelistctrl.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llnamelistctrl.h')
| -rw-r--r-- | indra/newview/llnamelistctrl.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h index c49a163ba8..ebac31469e 100644 --- a/indra/newview/llnamelistctrl.h +++ b/indra/newview/llnamelistctrl.h @@ -41,14 +41,14 @@ class LLNameListCtrl : public LLScrollListCtrl { public: - LLNameListCtrl(const LLString& name, + LLNameListCtrl(const std::string& name, const LLRect& rect, LLUICtrlCallback callback, void* userdata, BOOL allow_multiple_selection, BOOL draw_border = TRUE, S32 name_column_index = 0, - const LLString& tooltip = LLString::null); + const std::string& tooltip = LLStringUtil::null); virtual ~LLNameListCtrl(); virtual LLXMLNodePtr getXML(bool save_children = true) const; @@ -57,7 +57,7 @@ public: // Add a user to the list by name. It will be added, the name // requested from the cache, and updated as necessary. BOOL addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM, - BOOL enabled = TRUE, LLString& suffix = LLString::null); + BOOL enabled = TRUE, std::string& suffix = LLStringUtil::null); BOOL addNameItem(LLScrollListItem* item, EAddPosition pos = ADD_BOTTOM); virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL); @@ -71,16 +71,15 @@ public: void removeNameItem(const LLUUID& agent_id); - void refresh(const LLUUID& id, const char* first, const char* last, - BOOL is_group); + void refresh(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group); - static void refreshAll(const LLUUID& id, const char* firstname, - const char* lastname, BOOL is_group); + static void refreshAll(const LLUUID& id, const std::string& firstname, + const std::string& lastname, BOOL is_group); virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, - LLString& tooltip_msg); + std::string& tooltip_msg); void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; } |