From 521b5fb5831469d0927687a392e8c6a6653a9170 Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 2 Mar 2010 15:14:13 -0800 Subject: Fixed merge conflict --- indra/newview/llpanelgroupinvite.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llpanelgroupinvite.h') diff --git a/indra/newview/llpanelgroupinvite.h b/indra/newview/llpanelgroupinvite.h index b095dd2395..df865c9a63 100644 --- a/indra/newview/llpanelgroupinvite.h +++ b/indra/newview/llpanelgroupinvite.h @@ -46,7 +46,7 @@ public: /** * this callback is being used to add a user whose fullname isn't been loaded before invoking of addUsers(). */ - void addUserCallback(const LLUUID& id, const std::string& first_name, const std::string& last_name); + void addUserCallback(const LLUUID& id, const std::string& full_name); void clear(); void update(); -- cgit v1.2.3