From a4000c3744e42fcbb638e742f3b63fa31a0dee15 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 8 May 2009 07:43:08 +0000 Subject: merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7 --- indra/newview/llfloaterfriends.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'indra/newview/llfloaterfriends.h') diff --git a/indra/newview/llfloaterfriends.h b/indra/newview/llfloaterfriends.h index a5c94ee485..51fe5f6d89 100644 --- a/indra/newview/llfloaterfriends.h +++ b/indra/newview/llfloaterfriends.h @@ -83,6 +83,9 @@ public: static void requestFriendship(const LLUUID& target_id, const std::string& target_name, const std::string& message); + // *HACK Made public to remove friends from LLAvatarIconCtrl context menu + static bool handleRemove(const LLSD& notification, const LLSD& response); + private: enum FRIENDS_COLUMN_ORDER @@ -115,15 +118,15 @@ private: void confirmModifyRights(rights_map_t& ids, EGrantRevoke command); void sendRightsGrant(rights_map_t& ids); - // return LLUUID::null if nothing is selected - LLDynamicArray getSelectedIDs(); + // return empty vector if nothing is selected + std::vector getSelectedIDs(); // callback methods static void onSelectName(LLUICtrl* ctrl, void* user_data); static bool callbackAddFriend(const LLSD& notification, const LLSD& response); static bool callbackAddFriendWithMessage(const LLSD& notification, const LLSD& response); static void onPickAvatar(const std::vector& names, const std::vector& ids, void* user_data); - static void onMaximumSelect(void* user_data); + static void onMaximumSelect(); static void onClickIM(void* user_data); static void onClickProfile(void* user_data); @@ -135,7 +138,6 @@ private: static void onClickModifyStatus(LLUICtrl* ctrl, void* user_data); - static bool handleRemove(const LLSD& notification, const LLSD& response); bool modifyRightsConfirmation(const LLSD& notification, const LLSD& response, rights_map_t* rights); private: -- cgit v1.2.3