From b9b4a4d9347053a3834ca2928063136948f09d1d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 13 Aug 2008 19:37:05 +0000 Subject: QAR-782 Merge featurettes batch #2 merge featurettes-6-merge-2 -> release dataserver-is-deprecated --- indra/newview/llfloaterfriends.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterfriends.h') diff --git a/indra/newview/llfloaterfriends.h b/indra/newview/llfloaterfriends.h index d934faa616..c8cdce49a7 100644 --- a/indra/newview/llfloaterfriends.h +++ b/indra/newview/llfloaterfriends.h @@ -80,7 +80,7 @@ public: // Just request friendship, no dialog. static void requestFriendship(const LLUUID& target_id, - const std::string& target_name); + const std::string& target_name, const std::string& message); private: @@ -119,7 +119,7 @@ private: // callback methods static void onSelectName(LLUICtrl* ctrl, void* user_data); - static void callbackAddFriend(S32 option, void* user_data); + static void callbackAddFriend(S32 option, const std::string& text, void* user_data); static void onPickAvatar(const std::vector& names, const std::vector& ids, void* user_data); static void onMaximumSelect(void* user_data); -- cgit v1.2.3